From nobody Thu May 9 02:57:01 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1707499572148331.51641175641237; Fri, 9 Feb 2024 09:26:12 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 0D65A1A4D; Fri, 9 Feb 2024 12:26:11 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D62451A2E; Fri, 9 Feb 2024 12:20:20 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 79F7F1A17; Fri, 9 Feb 2024 12:19:58 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 6BEA719BA for ; Fri, 9 Feb 2024 12:19:57 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-638-LQUaRS6zOQ2bS0P4OtTglQ-1; Fri, 09 Feb 2024 12:19:55 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id DFBED185A789 for ; Fri, 9 Feb 2024 17:19:53 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.224.223]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 751712026D06 for ; Fri, 9 Feb 2024 17:19:53 +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=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: LQUaRS6zOQ2bS0P4OtTglQ-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 1/5] tests: Rename s390-usb-* Date: Fri, 9 Feb 2024 18:19:46 +0100 Message-ID: <20240209171950.349442-2-abologna@redhat.com> In-Reply-To: <20240209171950.349442-1-abologna@redhat.com> References: <20240209171950.349442-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: SA6ILTVZ5IIW3ZHV26E3QQAHL4737PBX X-Message-ID-Hash: SA6ILTVZ5IIW3ZHV26E3QQAHL4737PBX X-MailFrom: abologna@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: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1707499574358100001 These tests currently cover the scenarios in which the guest can end up with no USB controller, one of which is specific to s390x. We are going to add more USB on s390x scenarios, so a different naming convention is needed. Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- ...r.s390x-latest.args =3D> s390-usb-address.s390x-latest.args} | 0 ...ler.s390x-latest.xml =3D> s390-usb-address.s390x-latest.xml} | 0 ...90-allow-bogus-usb-controller.xml =3D> s390-usb-address.xml} | 0 ...none.s390x-latest.args =3D> s390-usb-none.s390x-latest.args} | 0 ...b-none.s390x-latest.xml =3D> s390-usb-none.s390x-latest.xml} | 0 .../{s390-allow-bogus-usb-none.xml =3D> s390-usb-none.xml} | 0 tests/qemuxmlconftest.c | 4 ++-- 7 files changed, 2 insertions(+), 2 deletions(-) rename tests/qemuxmlconfdata/{s390-allow-bogus-usb-controller.s390x-latest= .args =3D> s390-usb-address.s390x-latest.args} (100%) rename tests/qemuxmlconfdata/{s390-allow-bogus-usb-controller.s390x-latest= .xml =3D> s390-usb-address.s390x-latest.xml} (100%) rename tests/qemuxmlconfdata/{s390-allow-bogus-usb-controller.xml =3D> s39= 0-usb-address.xml} (100%) rename tests/qemuxmlconfdata/{s390-allow-bogus-usb-none.s390x-latest.args = =3D> s390-usb-none.s390x-latest.args} (100%) rename tests/qemuxmlconfdata/{s390-allow-bogus-usb-none.s390x-latest.xml = =3D> s390-usb-none.s390x-latest.xml} (100%) rename tests/qemuxmlconfdata/{s390-allow-bogus-usb-none.xml =3D> s390-usb-= none.xml} (100%) diff --git a/tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.s390x-la= test.args b/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args similarity index 100% rename from tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.s390x-lat= est.args rename to tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args diff --git a/tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.s390x-la= test.xml b/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.xml similarity index 100% rename from tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.s390x-lat= est.xml rename to tests/qemuxmlconfdata/s390-usb-address.s390x-latest.xml diff --git a/tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.xml b/te= sts/qemuxmlconfdata/s390-usb-address.xml similarity index 100% rename from tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.xml rename to tests/qemuxmlconfdata/s390-usb-address.xml diff --git a/tests/qemuxmlconfdata/s390-allow-bogus-usb-none.s390x-latest.a= rgs b/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.args similarity index 100% rename from tests/qemuxmlconfdata/s390-allow-bogus-usb-none.s390x-latest.ar= gs rename to tests/qemuxmlconfdata/s390-usb-none.s390x-latest.args diff --git a/tests/qemuxmlconfdata/s390-allow-bogus-usb-none.s390x-latest.x= ml b/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.xml similarity index 100% rename from tests/qemuxmlconfdata/s390-allow-bogus-usb-none.s390x-latest.xml rename to tests/qemuxmlconfdata/s390-usb-none.s390x-latest.xml diff --git a/tests/qemuxmlconfdata/s390-allow-bogus-usb-none.xml b/tests/qe= muxmlconfdata/s390-usb-none.xml similarity index 100% rename from tests/qemuxmlconfdata/s390-allow-bogus-usb-none.xml rename to tests/qemuxmlconfdata/s390-usb-none.xml diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 0a27be77a8..4034d7f938 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2319,8 +2319,8 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-rng-egd-crash"); DO_TEST_CAPS_ARCH_LATEST("virtio-rng-ccw", "s390x"); =20 - DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-none", "s390x"); - DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-controller", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-usb-none", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-usb-address", "s390x"); =20 DO_TEST_CAPS_ARCH_LATEST("s390-panic-no-address", "s390x"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("s390-panic-address", "s390x"); --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Thu May 9 02:57:01 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1707499453084395.7381542732451; Fri, 9 Feb 2024 09:24:13 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 0D6631B09; Fri, 9 Feb 2024 12:24:12 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 5D8271AEC; Fri, 9 Feb 2024 12:20:12 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id A9BE41A0D; Fri, 9 Feb 2024 12:19:57 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 B739C1A12 for ; Fri, 9 Feb 2024 12:19:56 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-660-3q8N2yGZPgqbMqT2LP02zg-1; Fri, 09 Feb 2024 12:19:54 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 98F4629AC027 for ; Fri, 9 Feb 2024 17:19:54 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.224.223]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2E4882026D06 for ; Fri, 9 Feb 2024 17:19:54 +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=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: 3q8N2yGZPgqbMqT2LP02zg-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 2/5] tests: Minimize s390-usb-* Date: Fri, 9 Feb 2024 18:19:47 +0100 Message-ID: <20240209171950.349442-3-abologna@redhat.com> In-Reply-To: <20240209171950.349442-1-abologna@redhat.com> References: <20240209171950.349442-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: RXSTY7TG6QSVOE4KKIT3WWCIH4D3HCNU X-Message-ID-Hash: RXSTY7TG6QSVOE4KKIT3WWCIH4D3HCNU X-MailFrom: abologna@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: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1707499454168100001 Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- .../s390-usb-address.s390x-latest.args | 9 -------- .../s390-usb-address.s390x-latest.xml | 22 ++----------------- tests/qemuxmlconfdata/s390-usb-address.xml | 21 ++---------------- .../s390-usb-none.s390x-latest.args | 9 -------- .../s390-usb-none.s390x-latest.xml | 22 ++----------------- tests/qemuxmlconfdata/s390-usb-none.xml | 21 ++---------------- 6 files changed, 8 insertions(+), 96 deletions(-) diff --git a/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args b/tes= ts/qemuxmlconfdata/s390-usb-address.s390x-latest.args index 1e7eaacad0..485b121a08 100644 --- a/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args @@ -26,15 +26,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.= config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"virtio-serial-ccw","id":"virtio-serial0","devno":"fe.0= .0001"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ --chardev pty,id=3Dcharconsole0 \ --device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0002= "}' \ --object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/hwrng"}'= \ --device '{"driver":"virtio-rng-ccw","rng":"objrng0","id":"rng0","devno":"f= e.0.0003"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.xml b/test= s/qemuxmlconfdata/s390-usb-address.s390x-latest.xml index 392f03fbc6..595d0b1a1e 100644 --- a/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.xml +++ b/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.xml @@ -6,6 +6,7 @@ 1 hvm + qemu @@ -16,33 +17,14 @@ destroy /usr/bin/qemu-system-s390x - - - - - -
-
- -
- - - -