From nobody Mon Sep 16 19:38:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1693923972; cv=none; d=zohomail.com; s=zohoarc; b=DpvXseUDq63TCD5wSyn45fFfp+DilSLJTPjpBHhzyvPurVjq8mJF7UK/y2BXdv6S0RVlUubaUmbhi+NY/YIlgawdTgDfpOsn116jCayd5bIztvyWpXtOs2djHQgkdVLCrQ0jZ34T7z4iY805i4NXu/n879XWf3PXxSGor3TPRzw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923972; 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=LUi87mC7fi+4k5+vHNQhJnOs+KH1nVupz8RhHugZlmM=; b=c6HGnaorY4gfny8knzv8yckFvkDcYDHPr0GDBQwy7OIsm7NjKrdv2Z+Sd9kyu1POz33qvDSdIkDv+f5j/p7Xz4p9L+2CfkL8FW9QxWwWXqfZHwT7qPYBiH+2DhOe6cxbAUCdWNLlwUSxwLDwJXGBrLJ/Qb1nEJU5qI4mRGyQzgY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1693923972330311.5861328075906; Tue, 5 Sep 2023 07:26:12 -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-32-taoUm8TmNAegQx5IKlOPqA-1; Tue, 05 Sep 2023 10:26:01 -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 BB990946314; Tue, 5 Sep 2023 14:24:53 +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 A1AC52026D4B; Tue, 5 Sep 2023 14:24:53 +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 87F3C1946597; Tue, 5 Sep 2023 14:24:53 +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 4568819465A2 for ; Tue, 5 Sep 2023 14:24:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 345821121318; Tue, 5 Sep 2023 14:24:52 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id B233D1121314 for ; Tue, 5 Sep 2023 14:24:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923971; 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=LUi87mC7fi+4k5+vHNQhJnOs+KH1nVupz8RhHugZlmM=; b=aw/HuZg3haOPTYewihUG5somEC6aKiTmr/fq7s0eQyV9rZBGVGbspXShnLJj0gfqbTAKud Q7eTG25Dcf+tgV2qwmNbhHWoLr7F+zu4SEaa7Ymf5uLin07506Gj8Plgxe6oQbS+ZJESBu aJhfhqO5u6IsGS4GVIW6YXFiSQNEGlk= X-MC-Unique: taoUm8TmNAegQx5IKlOPqA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 26/51] qemuxml2argvtest: Consolidate tests for usb controllers Date: Tue, 5 Sep 2023 16:23:53 +0200 Message-ID: <8bc272c5f7e686bbd1983a383326c8cb64b75fb2.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: 1693923973389100005 Content-Type: text/plain; charset="utf-8" Move all controller related tests together and consolidate naming of the test cases. Signed-off-by: Peter Krempa --- ...gs =3D> usb-controller-ich9-autoassign.args} | 0 ...xml =3D> usb-controller-ich9-autoassign.xml} | 0 ...rgs =3D> usb-controller-ich9-companion.args} | 0 ....xml =3D> usb-controller-ich9-companion.xml} | 0 ...rgs =3D> usb-controller-ich9-ehci-addr.args} | 0 ....xml =3D> usb-controller-ich9-ehci-addr.xml} | 0 ...r =3D> usb-controller-ich9-no-companion.err} | 0 ...l =3D> usb-controller-ich9-no-companion.xml} | 0 ...troller.args =3D> usb-controller-piix3.args} | 0 ...ontroller.xml =3D> usb-controller-piix3.xml} | 0 tests/qemuxml2argvtest.c | 89 ++++++++++--------- ...ntroller-ich9-ehci-addr.x86_64-latest.xml} | 0 ...=3D> usb-controller-piix3.x86_64-latest.xml} | 0 tests/qemuxml2xmltest.c | 4 +- 14 files changed, 48 insertions(+), 45 deletions(-) rename tests/qemuxml2argvdata/{usb-ich9-autoassign.args =3D> usb-controlle= r-ich9-autoassign.args} (100%) rename tests/qemuxml2argvdata/{usb-ich9-autoassign.xml =3D> usb-controller= -ich9-autoassign.xml} (100%) rename tests/qemuxml2argvdata/{usb-ich9-companion.args =3D> usb-controller= -ich9-companion.args} (100%) rename tests/qemuxml2argvdata/{usb-ich9-companion.xml =3D> usb-controller-= ich9-companion.xml} (100%) rename tests/qemuxml2argvdata/{usb-ich9-ehci-addr.args =3D> usb-controller= -ich9-ehci-addr.args} (100%) rename tests/qemuxml2argvdata/{usb-ich9-ehci-addr.xml =3D> usb-controller-= ich9-ehci-addr.xml} (100%) rename tests/qemuxml2argvdata/{usb-ich9-no-companion.err =3D> usb-controll= er-ich9-no-companion.err} (100%) rename tests/qemuxml2argvdata/{usb-ich9-no-companion.xml =3D> usb-controll= er-ich9-no-companion.xml} (100%) rename tests/qemuxml2argvdata/{usb-piix3-controller.args =3D> usb-controll= er-piix3.args} (100%) rename tests/qemuxml2argvdata/{usb-piix3-controller.xml =3D> usb-controlle= r-piix3.xml} (100%) rename tests/qemuxml2xmloutdata/{usb-ich9-ehci-addr.x86_64-latest.xml =3D>= usb-controller-ich9-ehci-addr.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{usb-piix3-controller.x86_64-latest.xml = =3D> usb-controller-piix3.x86_64-latest.xml} (100%) diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args b/tests/qemuxm= l2argvdata/usb-controller-ich9-autoassign.args similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-autoassign.args rename to tests/qemuxml2argvdata/usb-controller-ich9-autoassign.args diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.xml b/tests/qemuxml= 2argvdata/usb-controller-ich9-autoassign.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-autoassign.xml rename to tests/qemuxml2argvdata/usb-controller-ich9-autoassign.xml diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args b/tests/qemuxml= 2argvdata/usb-controller-ich9-companion.args similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-companion.args rename to tests/qemuxml2argvdata/usb-controller-ich9-companion.args diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.xml b/tests/qemuxml2= argvdata/usb-controller-ich9-companion.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-companion.xml rename to tests/qemuxml2argvdata/usb-controller-ich9-companion.xml diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args b/tests/qemuxml= 2argvdata/usb-controller-ich9-ehci-addr.args similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-ehci-addr.args rename to tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.args diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml b/tests/qemuxml2= argvdata/usb-controller-ich9-ehci-addr.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml rename to tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.xml diff --git a/tests/qemuxml2argvdata/usb-ich9-no-companion.err b/tests/qemux= ml2argvdata/usb-controller-ich9-no-companion.err similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-no-companion.err rename to tests/qemuxml2argvdata/usb-controller-ich9-no-companion.err diff --git a/tests/qemuxml2argvdata/usb-ich9-no-companion.xml b/tests/qemux= ml2argvdata/usb-controller-ich9-no-companion.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-no-companion.xml rename to tests/qemuxml2argvdata/usb-controller-ich9-no-companion.xml diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args b/tests/qemux= ml2argvdata/usb-controller-piix3.args similarity index 100% rename from tests/qemuxml2argvdata/usb-piix3-controller.args rename to tests/qemuxml2argvdata/usb-controller-piix3.args diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.xml b/tests/qemuxm= l2argvdata/usb-controller-piix3.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-piix3-controller.xml rename to tests/qemuxml2argvdata/usb-controller-piix3.xml diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 00cde55b5a..6c10af0ec2 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1500,19 +1500,59 @@ mymain(void) DO_TEST_PARSE_ERROR("chardev-reconnect-generated-path", QEMU_CAPS_CHARDEV_RECONNECT); + DO_TEST_NOCAPS("usb-none"); + DO_TEST_NOCAPS("usb-controller"); - DO_TEST("usb-piix3-controller", + DO_TEST("usb-controller-piix3", QEMU_CAPS_PIIX3_USB_UHCI); - DO_TEST("usb-ich9-ehci-addr", + DO_TEST("usb-controller-ich9-ehci-addr", QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST_NOCAPS("input-usbmouse-addr"); - DO_TEST("usb-ich9-companion", + DO_TEST("usb-controller-ich9-companion", QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST_PARSE_ERROR("usb-ich9-no-companion", + DO_TEST_PARSE_ERROR("usb-controller-ich9-no-companion", QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST("usb-ich9-autoassign", + DO_TEST("usb-controller-ich9-autoassign", QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_HUB); + DO_TEST("usb1-usb2", + QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_USB_HUB, + QEMU_CAPS_ICH9_USB_EHCI1); + + DO_TEST("usb-controller-default-q35", + QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_NEC_USB_XHCI); + DO_TEST_FAILURE("usb-controller-default-unavailable-q35", + QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_NEC_USB_XHCI); + 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_NOCAPS("input-usbmouse-addr"); DO_TEST("usb-hub", QEMU_CAPS_USB_HUB); DO_TEST("usb-hub-autoadd", @@ -1558,47 +1598,10 @@ mymain(void) QEMU_CAPS_USB_REDIR_FILTER, QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST_CAPS_LATEST("usb-redir-unix"); - DO_TEST("usb1-usb2", - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_USB_HUB, - QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST_NOCAPS("usb-none"); DO_TEST_PARSE_ERROR_NOCAPS("usb-none-other"); DO_TEST_PARSE_ERROR("usb-none-hub", QEMU_CAPS_USB_HUB); DO_TEST_PARSE_ERROR_NOCAPS("usb-none-usbtablet"); - DO_TEST("usb-controller-default-q35", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI); - DO_TEST_FAILURE("usb-controller-default-unavailable-q35", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_NEC_USB_XHCI); - 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_NOCAPS("smbios"); DO_TEST_PARSE_ERROR_NOCAPS("smbios-date"); diff --git a/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.x86_64-latest.xml = b/tests/qemuxml2xmloutdata/usb-controller-ich9-ehci-addr.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.x86_64-latest.xml rename to tests/qemuxml2xmloutdata/usb-controller-ich9-ehci-addr.x86_64-lat= est.xml diff --git a/tests/qemuxml2xmloutdata/usb-piix3-controller.x86_64-latest.xm= l b/tests/qemuxml2xmloutdata/usb-controller-piix3.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/usb-piix3-controller.x86_64-latest.xml rename to tests/qemuxml2xmloutdata/usb-controller-piix3.x86_64-latest.xml diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 87bd6389a6..a958daf56d 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -483,7 +483,8 @@ mymain(void) DO_TEST_CAPS_LATEST("usb-none"); DO_TEST_CAPS_LATEST("usb-controller"); - DO_TEST_CAPS_LATEST("usb-piix3-controller"); + DO_TEST_CAPS_LATEST("usb-controller-piix3"); + DO_TEST_CAPS_LATEST("usb-controller-ich9-ehci-addr"); DO_TEST_CAPS_LATEST("usb-controller-default-q35"); DO_TEST_CAPS_LATEST("usb-controller-explicit-q35"); DO_TEST_CAPS_ARCH_LATEST("ppc64-usb-controller", "ppc64"); @@ -573,7 +574,6 @@ mymain(void) DO_TEST_CAPS_LATEST("numad-auto-vcpu-no-numatune"); DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-no-cpuset-and-placement"); DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-cpuset"); - DO_TEST_CAPS_LATEST("usb-ich9-ehci-addr"); DO_TEST_CAPS_LATEST("disk-copy_on_read"); DO_TEST_CAPS_LATEST("tpm-passthrough"); DO_TEST_CAPS_LATEST("tpm-passthrough-crb"); --=20 2.41.0