From nobody Sun Dec 14 06:18:59 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1750709162; cv=none; d=zohomail.com; s=zohoarc; b=Exfa3mlfNURC0fuCj6heZYPPkYBIhPYYmNsvuFR7gRZgVhhq8DpMoS4rtbC12viN64i9T1xpNzjDXq9mO2icrhm9XF14sRjLTny6p/oJdGwNlP5NPppR+DmLyOGnICcehP5qNBB5rrtSqbVtzQx0yq8MLODQ3PPGv/sUMSzJgpk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750709162; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=9X1j+IJ99c5qFvIFQVxdggrfoof1JX68PjWnE5Yaz7w=; b=A8AxH7IU0n7I4oFNztrSLB/2DdzMnkzaBZfj4ZROy04LSUHtJ1sIviSo55LUzuZx/NVQZB7OVffWb8hnC4QQrZUd6+KMOaQ5/TFTaPbAvZgu48ial0skbl+Z+nYtqmNRxEjcTvAz9I+HjfnQiE+TFtS4QJa/gfYiU5aouD+Twf4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1750709162524415.2419293627944; Mon, 23 Jun 2025 13:06:02 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6B86F11C8; Mon, 23 Jun 2025 16:06:01 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id EE8BA12CE; Mon, 23 Jun 2025 16:00:04 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 12CFFC06; Mon, 23 Jun 2025 15:59:56 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 350D61239 for ; Mon, 23 Jun 2025 15:59:33 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-81-O50U7ZEjPbapPURmey8bEw-1; Mon, 23 Jun 2025 15:59:31 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 63DCE180028F for ; Mon, 23 Jun 2025 19:59:30 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.5]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9D8B819560A3 for ; Mon, 23 Jun 2025 19:59:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750708772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rhrYbLEsExbE41ELGaPZVPqx3ML2zy6m898vtOcRXiE=; b=DzAOL7MqbFmjadWSIbDl0+/dI2DP5rkvTAKAP4acGP6Yn1I/NSR136eSMH309KLSU+/s5o Gaf9G9ZtJo6H1A0JDf/NrkIeUXKS5FX7O/RWscGFtdzDfORgIfupi3jdYl6XYGfHUw57ck FlOVvntdSG+CdtSE+yV528MYh5yAwbg= X-MC-Unique: O50U7ZEjPbapPURmey8bEw-1 X-Mimecast-MFC-AGG-ID: O50U7ZEjPbapPURmey8bEw_1750708770 To: devel@lists.libvirt.org Subject: [PATCH v2 07/13] qemuxmlconftest: Invoke "disk-usb-device" case also without QEMU_CAPS_DEVICE_USB_BOT and with ABI_UPDATE Date: Mon, 23 Jun 2025 21:59:12 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: VMLMXQ45hmQ3Hh97Wk20kY51L8t6r1R4ReM8MYdil-0_1750708770 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UDDANKPI5MSVUVVXKOLTX55NL4ZC5DFW X-Message-ID-Hash: UDDANKPI5MSVUVVXKOLTX55NL4ZC5DFW X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1750709164491116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The QEMU_CAPS_DEVICE_USB_BOT device can be compiled out but realistically it makes no sense to do it thus also makes no sense to have another variant of input data for it. Add another invocation of "disk-usb-device" clearing QEMU_CAPS_DEVICE_USB_B= OT to show the fallback code paths. Also add "ABI_UPDATE" version for the two cases above as the ABI of usb-bot cdrom is not migration-compatible and we'll be wanting to update to the fixed configuration. Signed-off-by: Peter Krempa Reviewed-by: Jiri Denemark --- ...est.QEMU_CAPS_DEVICE_USB_BOT-disabled.args | 59 +++++++++ ...test.QEMU_CAPS_DEVICE_USB_BOT-disabled.xml | 107 +++++++++++++++ ...ate.QEMU_CAPS_DEVICE_USB_BOT-disabled.args | 59 +++++++++ ...date.QEMU_CAPS_DEVICE_USB_BOT-disabled.xml | 125 ++++++++++++++++++ ...k-usb-device.x86_64-latest.abi-update.args | 59 +++++++++ ...sk-usb-device.x86_64-latest.abi-update.xml | 125 ++++++++++++++++++ tests/qemuxmlconftest.c | 12 ++ 7 files changed, 546 insertions(+) create mode 100644 tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.QEM= U_CAPS_DEVICE_USB_BOT-disabled.args create mode 100644 tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.QEM= U_CAPS_DEVICE_USB_BOT-disabled.xml create mode 100644 tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi= -update.QEMU_CAPS_DEVICE_USB_BOT-disabled.args create mode 100644 tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi= -update.QEMU_CAPS_DEVICE_USB_BOT-disabled.xml create mode 100644 tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi= -update.args create mode 100644 tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi= -update.xml diff --git a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.QEMU_CAPS_= DEVICE_USB_BOT-disabled.args b/tests/qemuxmlconfdata/disk-usb-device.x86_64= -latest.QEMU_CAPS_DEVICE_USB_BOT-disabled.args new file mode 100644 index 0000000000..079dfe5d99 --- /dev/null +++ b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.QEMU_CAPS_DEVICE_= USB_BOT-disabled.args @@ -0,0 +1,59 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ +-accel tcg \ +-cpu qemu64 \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"2"}' \ +-blockdev '{"driver":"file","filename":"/tmp/img1","node-name":"libvirt-12= -storage","read-only":false}' \ +-device '{"driver":"usb-storage","bus":"usb.0","port":"1.1","drive":"libvi= rt-12-storage","id":"usb-disk0","bootindex":1,"removable":false}' \ +-blockdev '{"driver":"file","filename":"/tmp/img2","node-name":"libvirt-11= -storage","read-only":true}' \ +-device '{"driver":"usb-storage","bus":"usb.0","port":"1.2","drive":"libvi= rt-11-storage","id":"usb-disk1","removable":false}' \ +-blockdev '{"driver":"file","filename":"/tmp/img3","node-name":"libvirt-10= -storage","read-only":false}' \ +-device '{"driver":"usb-storage","bus":"usb.0","port":"1.3","drive":"libvi= rt-10-storage","id":"usb-disk2","removable":false,"serial":"testserial1"}' \ +-blockdev '{"driver":"file","filename":"/tmp/img4","node-name":"libvirt-9-= storage","read-only":true}' \ +-device '{"driver":"usb-storage","bus":"usb.0","port":"1.4","drive":"libvi= rt-9-storage","id":"usb-disk3","removable":false,"serial":"testserial2"}' \ +-blockdev '{"driver":"file","filename":"/tmp/img5","node-name":"libvirt-8-= storage","read-only":false}' \ +-device '{"driver":"usb-storage","bus":"usb.0","port":"1.5","drive":"libvi= rt-8-storage","id":"ua-test1","removable":false}' \ +-blockdev '{"driver":"file","filename":"/tmp/img6","node-name":"libvirt-7-= storage","read-only":true}' \ +-device '{"driver":"usb-storage","bus":"usb.0","port":"1.6","drive":"libvi= rt-7-storage","id":"ua-test2","removable":false}' \ +-blockdev '{"driver":"file","filename":"/tmp/img7","node-name":"libvirt-6-= storage","read-only":false}' \ +-device '{"driver":"usb-storage","bus":"usb.0","port":"1.7","drive":"libvi= rt-6-storage","id":"ua-test3","removable":false,"serial":"testserial3"}' \ +-blockdev '{"driver":"file","filename":"/tmp/img8","node-name":"libvirt-5-= storage","read-only":true}' \ +-device '{"driver":"usb-storage","bus":"usb.0","port":"1.8","drive":"libvi= rt-5-storage","id":"ua-test4","removable":false,"serial":"testserial4"}' \ +-blockdev '{"driver":"file","filename":"/tmp/img9","node-name":"libvirt-4-= storage","read-only":false}' \ +-device '{"driver":"usb-storage","bus":"usb.0","port":"2.1","drive":"libvi= rt-4-storage","id":"usb-disk8","removable":true}' \ +-blockdev '{"driver":"file","filename":"/tmp/imga","node-name":"libvirt-3-= storage","read-only":false}' \ +-device '{"driver":"usb-storage","bus":"usb.0","port":"2.2","drive":"libvi= rt-3-storage","id":"usb-disk9","removable":true,"serial":"testserial5"}' \ +-blockdev '{"driver":"file","filename":"/tmp/imgb","node-name":"libvirt-2-= storage","read-only":false}' \ +-device '{"driver":"usb-storage","bus":"usb.0","port":"2.3","drive":"libvi= rt-2-storage","id":"ua-test5","removable":true}' \ +-blockdev '{"driver":"file","filename":"/tmp/imgc","node-name":"libvirt-1-= storage","read-only":false}' \ +-device '{"driver":"usb-storage","bus":"usb.0","port":"2.4","drive":"libvi= rt-1-storage","id":"ua-test6","removable":true,"serial":"testserial6"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.QEMU_CAPS_= DEVICE_USB_BOT-disabled.xml b/tests/qemuxmlconfdata/disk-usb-device.x86_64-= latest.QEMU_CAPS_DEVICE_USB_BOT-disabled.xml new file mode 100644 index 0000000000..8b78f77e63 --- /dev/null +++ b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.QEMU_CAPS_DEVICE_= USB_BOT-disabled.xml @@ -0,0 +1,107 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + qemu64 + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + + + + + + + + + + + + + + testserial1 + + + + + + + testserial2 + + + + + + + + + + + + + + + + + + + testserial3 + + + + + + + + testserial4 + + + + + + + + + + + + testserial5 + + + + + + + + + + + + testserial6 + + + +
+ + + + +