From nobody Mon Feb 9 07:02:59 2026 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; dkim=pass; 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=1693923958; cv=none; d=zohomail.com; s=zohoarc; b=AbRyiWldA/RKabDOdNg+6gvz7HRCM9q+v6qckXmUmWcsLGom4ZFo6ykA4eH4H7HzG3tfBfnvvknfzv+eSk7F9F3xmT2+OWfH6wWNV8+jLIvhIKgVx2pDPyzatOaTAszrFtMrDHruo0AEkQdefcdpxZCTKLVqRCF7DkpVXOztfdA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923958; 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=nAb6lHFT2SWpzqIkTIb5LMQUdjemygKgI+ZFCRJWwpA=; b=KzCqd5cG/mfsQFKkwJ+82TMCSTletxoIkqOSyG11R9KDlCnYgmO2AC46pzQ6hhrowNLqLx6FD4BfJ++4n0BmpS01Ku6CmZQjNmPgwHtl0PQRXDdr78fxXPyNFTGllQNvBgmGbLiGpp76WUYS94mMa0xPS9lV51mcf05V4iRzcxk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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 1693923958693187.75771413371604; Tue, 5 Sep 2023 07:25:58 -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-467-GREyPZvPPDumXzt5qTUGDw-1; Tue, 05 Sep 2023 10:25:50 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 49FD6182EF9E; Tue, 5 Sep 2023 14:24:57 +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 333D22026D68; Tue, 5 Sep 2023 14:24:57 +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 041A01946595; Tue, 5 Sep 2023 14:24:57 +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 AC68919465B3 for ; Tue, 5 Sep 2023 14:24:55 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8F4341121318; Tue, 5 Sep 2023 14:24:55 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17EBA1121314 for ; Tue, 5 Sep 2023 14:24:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923957; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=nAb6lHFT2SWpzqIkTIb5LMQUdjemygKgI+ZFCRJWwpA=; b=Y5JedTuELlSwSc9KOkiB0hTgs7pEc8em4Rt5FPXYevJtMIhjPMwcb4hNenh5DCkxj3Ca1z JTdXeAwP9dGKa0G5cvM1EFLbj83VvTpQXdGomeUjgig3fsNt0mZmBO/FUfG0TwdpQEPHhc ggrkcaMuf/HFE3mEpU3cWYT2ZjG/0cc= X-MC-Unique: GREyPZvPPDumXzt5qTUGDw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 29/51] qemuxml2argvtest: Consolidate testing of 'xhci' controllers Date: Tue, 5 Sep 2023 16:23:56 +0200 Message-ID: <06a934e636062450e7163e56929339ae57b0c00e.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.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693923960382100015 Content-Type: text/plain; charset="utf-8" Rename the 'usb-controller-explicit-(unavailable-)q35' test case to 'usb-controller-nec-xhci'. Since this also covers what 'usb-controller-xhci' was testing the latter is removed. Other 'usb-xhci' test cases which were using the NEC controller are also renamed to contain the name. In case of 'usb-controller-qemu-xhci' the negative test case is deleted as we don't need two cases for missing explicitly specified controller and the positive case is modernized to use real capabilities. Signed-off-by: Peter Krempa --- ...sb-controller-explicit-unavailable-q35.xml | 1 - ...ntroller-nec-xhci-limit.x86_64-latest.err} | 0 ....xml =3D> usb-controller-nec-xhci-limit.xml} | 0 ...er-nec-xhci-unavailable.x86_64-latest.err} | 0 .../usb-controller-nec-xhci-unavailable.xml | 1 + ...sb-controller-nec-xhci.x86_64-latest.args} | 0 ...it-q35.xml =3D> usb-controller-nec-xhci.xml} | 0 ...er-nex-xhci-autoassign.x86_64-latest.args} | 0 ...=3D> usb-controller-nex-xhci-autoassign.xml} | 0 ...troller-qemu-xhci-limit.x86_64-latest.err} | 0 .../usb-controller-qemu-xhci-unavailable.err | 1 - .../usb-controller-qemu-xhci-unavailable.xml | 1 - ...b-controller-qemu-xhci.x86_64-latest.args} | 0 .../qemuxml2argvdata/usb-controller-xhci.args | 32 ----------------- .../qemuxml2argvdata/usb-controller-xhci.xml | 16 --------- tests/qemuxml2argvtest.c | 34 ++++++------------- ...usb-controller-nec-xhci.x86_64-latest.xml} | 0 tests/qemuxml2xmltest.c | 2 +- 18 files changed, 13 insertions(+), 75 deletions(-) delete mode 120000 tests/qemuxml2argvdata/usb-controller-explicit-unavaila= ble-q35.xml rename tests/qemuxml2argvdata/{usb-controller-xhci-limit.err =3D> usb-cont= roller-nec-xhci-limit.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-controller-xhci-limit.xml =3D> usb-cont= roller-nec-xhci-limit.xml} (100%) rename tests/qemuxml2argvdata/{usb-controller-explicit-unavailable-q35.err= =3D> usb-controller-nec-xhci-unavailable.x86_64-latest.err} (100%) create mode 120000 tests/qemuxml2argvdata/usb-controller-nec-xhci-unavaila= ble.xml rename tests/qemuxml2argvdata/{usb-controller-explicit-q35.args =3D> usb-c= ontroller-nec-xhci.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{usb-controller-explicit-q35.xml =3D> usb-co= ntroller-nec-xhci.xml} (100%) rename tests/qemuxml2argvdata/{usb-xhci-autoassign.args =3D> usb-controlle= r-nex-xhci-autoassign.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{usb-xhci-autoassign.xml =3D> usb-controller= -nex-xhci-autoassign.xml} (100%) rename tests/qemuxml2argvdata/{usb-controller-qemu-xhci-limit.err =3D> usb= -controller-qemu-xhci-limit.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavail= able.err delete mode 120000 tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavail= able.xml rename tests/qemuxml2argvdata/{usb-controller-qemu-xhci.args =3D> usb-cont= roller-qemu-xhci.x86_64-latest.args} (100%) delete mode 100644 tests/qemuxml2argvdata/usb-controller-xhci.args delete mode 100644 tests/qemuxml2argvdata/usb-controller-xhci.xml rename tests/qemuxml2xmloutdata/{usb-controller-explicit-q35.x86_64-latest= .xml =3D> usb-controller-nec-xhci.x86_64-latest.xml} (100%) diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35= .xml b/tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35.xml deleted file mode 120000 index bc747bb653..0000000000 --- a/tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35.xml +++ /dev/null @@ -1 +0,0 @@ -usb-controller-explicit-q35.xml \ No newline at end of file diff --git a/tests/qemuxml2argvdata/usb-controller-xhci-limit.err b/tests/q= emuxml2argvdata/usb-controller-nec-xhci-limit.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-xhci-limit.err rename to tests/qemuxml2argvdata/usb-controller-nec-xhci-limit.x86_64-lates= t.err diff --git a/tests/qemuxml2argvdata/usb-controller-xhci-limit.xml b/tests/q= emuxml2argvdata/usb-controller-nec-xhci-limit.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-xhci-limit.xml rename to tests/qemuxml2argvdata/usb-controller-nec-xhci-limit.xml diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35= .err b/tests/qemuxml2argvdata/usb-controller-nec-xhci-unavailable.x86_64-la= test.err similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35.= err rename to tests/qemuxml2argvdata/usb-controller-nec-xhci-unavailable.x86_64= -latest.err diff --git a/tests/qemuxml2argvdata/usb-controller-nec-xhci-unavailable.xml= b/tests/qemuxml2argvdata/usb-controller-nec-xhci-unavailable.xml new file mode 120000 index 0000000000..faad458454 --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-nec-xhci-unavailable.xml @@ -0,0 +1 @@ +usb-controller-nec-xhci.xml \ No newline at end of file diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args b/test= s/qemuxml2argvdata/usb-controller-nec-xhci.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-explicit-q35.args rename to tests/qemuxml2argvdata/usb-controller-nec-xhci.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.xml b/tests= /qemuxml2argvdata/usb-controller-nec-xhci.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-explicit-q35.xml rename to tests/qemuxml2argvdata/usb-controller-nec-xhci.xml diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args b/tests/qemuxm= l2argvdata/usb-controller-nex-xhci-autoassign.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-xhci-autoassign.args rename to tests/qemuxml2argvdata/usb-controller-nex-xhci-autoassign.x86_64-= latest.args diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.xml b/tests/qemuxml= 2argvdata/usb-controller-nex-xhci-autoassign.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-xhci-autoassign.xml rename to tests/qemuxml2argvdata/usb-controller-nex-xhci-autoassign.xml diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci-limit.err b/te= sts/qemuxml2argvdata/usb-controller-qemu-xhci-limit.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-qemu-xhci-limit.err rename to tests/qemuxml2argvdata/usb-controller-qemu-xhci-limit.x86_64-late= st.err diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.er= r b/tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.err deleted file mode 100644 index aec91f7559..0000000000 --- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: USB controller model 'qemu-xhci' not supported = in this QEMU binary diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.xm= l b/tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.xml deleted file mode 120000 index f00efadeb9..0000000000 --- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.xml +++ /dev/null @@ -1 +0,0 @@ -usb-controller-qemu-xhci.xml \ No newline at end of file diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args b/tests/q= emuxml2argvdata/usb-controller-qemu-xhci.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-qemu-xhci.args rename to tests/qemuxml2argvdata/usb-controller-qemu-xhci.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args b/tests/qemuxm= l2argvdata/usb-controller-xhci.args deleted file mode 100644 index f3eac45c57..0000000000 --- a/tests/qemuxml2argvdata/usb-controller-xhci.args +++ /dev/null @@ -1,32 +0,0 @@ -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":"nec-usb-xhci","p2":8,"p3":8,"id":"usb","bus":"pci.0","= addr":"0x2"}' \ --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-xhci.xml b/tests/qemuxml= 2argvdata/usb-controller-xhci.xml deleted file mode 100644 index 5ee73c9bcf..0000000000 --- a/tests/qemuxml2argvdata/usb-controller-xhci.xml +++ /dev/null @@ -1,16 +0,0 @@ - - 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 6d7c60ba9d..98d07aee66 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1537,29 +1537,17 @@ mymain(void) QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST("usb-controller-explicit-q35", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI); - DO_TEST_FAILURE("usb-controller-explicit-unavailable-q35", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_PIIX3_USB_UHCI); - DO_TEST("usb-controller-xhci", - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI); - DO_TEST("usb-xhci-autoassign", - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI, - QEMU_CAPS_USB_HUB); - DO_TEST_PARSE_ERROR("usb-controller-xhci-limit", - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI); - DO_TEST("usb-controller-qemu-xhci", QEMU_CAPS_DEVICE_QEMU_XHCI); - DO_TEST_FAILURE_NOCAPS("usb-controller-qemu-xhci-unavailable"); - DO_TEST_PARSE_ERROR("usb-controller-qemu-xhci-limit", - QEMU_CAPS_DEVICE_QEMU_XHCI); + DO_TEST_CAPS_LATEST("usb-controller-nec-xhci"); + DO_TEST_FULL("usb-controller-nec-xhci-unavailable", ".x86_64-latest", + ARG_CAPS_ARCH, "x86_64", + ARG_CAPS_VER, "latest", + ARG_FLAGS, FLAG_EXPECT_FAILURE, + ARG_QEMU_CAPS_DEL, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_LAST, + ARG_END); + DO_TEST_CAPS_LATEST("usb-controller-nex-xhci-autoassign"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-controller-nec-xhci-limit"); + DO_TEST_CAPS_LATEST("usb-controller-qemu-xhci"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-controller-qemu-xhci-limit"); DO_TEST_NOCAPS("input-usbmouse-addr"); DO_TEST("usb-hub", diff --git a/tests/qemuxml2xmloutdata/usb-controller-explicit-q35.x86_64-la= test.xml b/tests/qemuxml2xmloutdata/usb-controller-nec-xhci.x86_64-latest.x= ml similarity index 100% rename from tests/qemuxml2xmloutdata/usb-controller-explicit-q35.x86_64-lat= est.xml rename to tests/qemuxml2xmloutdata/usb-controller-nec-xhci.x86_64-latest.xml diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index d65fb1f200..3b8eab6346 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -489,7 +489,7 @@ mymain(void) DO_TEST_CAPS_LATEST("usb-controller-default-q35"); DO_TEST_CAPS_LATEST("usb-controller-piix3"); DO_TEST_CAPS_LATEST("usb-controller-ich9-ehci-addr"); - DO_TEST_CAPS_LATEST("usb-controller-explicit-q35"); + DO_TEST_CAPS_LATEST("usb-controller-nec-xhci"); DO_TEST_CAPS_ARCH_LATEST_FULL("usb-controller-default-unavailable-i440= fx", "x86_64", ARG_QEMU_CAPS_DEL, QEMU_CAPS_PIIX3_USB_U= HCI, QEMU_CAPS_LAST); DO_TEST_CAPS_ARCH_LATEST("ppc64-usb-controller", "ppc64"); --=20 2.41.0