From nobody Mon Sep 16 19:41:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693924043; cv=none; d=zohomail.com; s=zohoarc; b=ng1V0IC30aCq7C9EK1kZXQJYUJBjJIh/qgVU4Q35iM1vk3GnB+5hb6L2IkbnrlqowZiWGQ0mxWEND6ocmJkhzUeufkXXKvQrwEFJg0HplUfSBxXi3sLxdCdmh6fTc8efKD8RR9hNeC+fv04n0NFiHt3vFhO6HY7pZnh+CuhZ5Nc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693924043; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=c/IHV1AouZOwXPJs2RcGmPITVMRBZlOt8lSbmBV55ME=; b=WcuEwSQgmOTyTARczjJhPoohebrCloQEQ+s8iMJ8yvPK1Iqdu3/M4ofH6XGAeFoMM/NIei7P04u6tGpo4VaUMcKZ6tTPnbidw8TdZ2gBj5pLpBpdRFxAa3JBOQgNQS+x8LYpnImsVSoywBGMR6FAQ5pWc0c0chx2OKuTDVFcaBk= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1693924043920747.3120057313105; Tue, 5 Sep 2023 07:27:23 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-213-cO6QqXZ6O2aq1hYYN1bAeA-1; Tue, 05 Sep 2023 10:26:00 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AB9E7927A0C; Tue, 5 Sep 2023 14:24:55 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 93A4C46F523; Tue, 5 Sep 2023 14:24:55 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 745FE19465B3; Tue, 5 Sep 2023 14:24:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DDFDF1946589 for ; Tue, 5 Sep 2023 14:24:53 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B188E1121314; Tue, 5 Sep 2023 14:24:53 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id CEB441121319 for ; Tue, 5 Sep 2023 14:24:52 +0000 (UTC) X-MC-Unique: cO6QqXZ6O2aq1hYYN1bAeA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 27/51] qemuxml2argvtest: Add tests for auto-added USB controllers Date: Tue, 5 Sep 2023 16:23:54 +0200 Message-ID: <567a98ad1088976f25bb9373d1d498cdb868eebc.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1693924045896100003 Content-Type: text/plain; charset="utf-8" There are per-machine type variations on which usb controller will be picked on an x86_64 machine. Add test cases where a USB controller is completely missing to cover all 3 cases ('isapc', 'pc', 'q35') when an USB controller is not explicitly requested by the user. Signed-off-by: Peter Krempa --- ...troller-implicit-i440fx.x86_64-latest.args | 32 ++++++++++++++ .../usb-controller-implicit-i440fx.xml | 15 +++++++ ...ntroller-implicit-isapc.x86_64-latest.args | 32 ++++++++++++++ .../usb-controller-implicit-isapc.xml | 15 +++++++ ...controller-implicit-q35.x86_64-latest.args | 36 ++++++++++++++++ .../usb-controller-implicit-q35.xml | 15 +++++++ tests/qemuxml2argvtest.c | 3 ++ ...ntroller-implicit-i440fx.x86_64-latest.xml | 29 +++++++++++++ ...ontroller-implicit-isapc.x86_64-latest.xml | 25 +++++++++++ ...-controller-implicit-q35.x86_64-latest.xml | 43 +++++++++++++++++++ tests/qemuxml2xmltest.c | 3 ++ 11 files changed, 248 insertions(+) create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-i440fx.x= 86_64-latest.args create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-i440fx.x= ml create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-isapc.x8= 6_64-latest.args create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-isapc.xml create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-q35.x86_= 64-latest.args create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-q35.xml create mode 100644 tests/qemuxml2xmloutdata/usb-controller-implicit-i440fx= .x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/usb-controller-implicit-isapc.= x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/usb-controller-implicit-q35.x8= 6_64-latest.xml diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-i440fx.x86_64-l= atest.args b/tests/qemuxml2argvdata/usb-controller-implicit-i440fx.x86_64-l= atest.args new file mode 100644 index 0000000000..e4be4266bb --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-implicit-i440fx.x86_64-latest.a= rgs @@ -0,0 +1,32 @@ +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"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-i440fx.xml b/te= sts/qemuxml2argvdata/usb-controller-implicit-i440fx.xml new file mode 100644 index 0000000000..fc48ea3cde --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-implicit-i440fx.xml @@ -0,0 +1,15 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + /usr/bin/qemu-system-x86_64 + + + diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-isapc.x86_64-la= test.args b/tests/qemuxml2argvdata/usb-controller-implicit-isapc.x86_64-lat= est.args new file mode 100644 index 0000000000..62dc26ee8b --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-implicit-isapc.x86_64-latest.ar= gs @@ -0,0 +1,32 @@ +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 isapc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acp= i=3Doff \ +-accel tcg \ +-cpu 486 \ +-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 \ +-usb \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-isapc.xml b/tes= ts/qemuxml2argvdata/usb-controller-implicit-isapc.xml new file mode 100644 index 0000000000..21be5b8cdf --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-implicit-isapc.xml @@ -0,0 +1,15 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + /usr/bin/qemu-system-x86_64 + + + diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-q35.x86_64-late= st.args b/tests/qemuxml2argvdata/usb-controller-implicit-q35.x86_64-latest.= args new file mode 100644 index 0000000000..9a660060a9 --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-implicit-q35.x86_64-latest.args @@ -0,0 +1,36 @@ +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 q35,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":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-global ICH9-LPC.noreboot=3Doff \ +-watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-q35.xml b/tests= /qemuxml2argvdata/usb-controller-implicit-q35.xml new file mode 100644 index 0000000000..ddeeadca97 --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-implicit-q35.xml @@ -0,0 +1,15 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + /usr/bin/qemu-system-x86_64 + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6c10af0ec2..45df4f4bae 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1500,6 +1500,9 @@ mymain(void) DO_TEST_PARSE_ERROR("chardev-reconnect-generated-path", QEMU_CAPS_CHARDEV_RECONNECT); + DO_TEST_CAPS_LATEST("usb-controller-implicit-isapc"); + DO_TEST_CAPS_LATEST("usb-controller-implicit-i440fx"); + DO_TEST_CAPS_LATEST("usb-controller-implicit-q35"); DO_TEST_NOCAPS("usb-none"); DO_TEST_NOCAPS("usb-controller"); diff --git a/tests/qemuxml2xmloutdata/usb-controller-implicit-i440fx.x86_64= -latest.xml b/tests/qemuxml2xmloutdata/usb-controller-implicit-i440fx.x86_6= 4-latest.xml new file mode 100644 index 0000000000..89631180ac --- /dev/null +++ b/tests/qemuxml2xmloutdata/usb-controller-implicit-i440fx.x86_64-latest= .xml @@ -0,0 +1,29 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + qemu64 + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + +
+ + + + +