From nobody Mon Feb 9 12:12:06 2026 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=1623423092; cv=none; d=zohomail.com; s=zohoarc; b=Rx4ZURUwfDZpJ4oJYZblMvAl4vlPW7H6mbYx59tEAa0QBMLkJsu2/L93QH8kPDKSSsoSzInEgmO8lxIhZebmHukwoz3ZgVpPyaaQeSRxN2CutyIDJfECSl0V4oO3mfU1IwdeXX0AGGZOdzMjaFWQ+iE5jEhlF9o8fev5kwEy0oI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623423092; 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=0CkxCefMj7+PcvFswJBb/XimvDDhZrHK9jm1/FkXgRU=; b=W06qaN20qK7SsIzSlYmQEPQ7omwrNqbMMKjvaEw5NxEBP6Hrvnz4G8cPBY8L2EEFWg7mGYs1a1V6EslYXeUJ9YSl1JuaM8xsqnich47xYT3rk2IZ7gAH9QpaWFo4cTI0MD0jtzsJ5+fIUqIWemUbCpwB9rIKxuYHpmGuJ7wfMuA= 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 1623423092696450.6410675916495; Fri, 11 Jun 2021 07:51:32 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-198-35MAYxivN2CjCNfs41Pxhg-1; Fri, 11 Jun 2021 10:49:45 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8F1358D7C40; Fri, 11 Jun 2021 14:49:32 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 651EB19C59; Fri, 11 Jun 2021 14:49:32 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 324C746F59; Fri, 11 Jun 2021 14:49:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15BEnMMF007662 for ; Fri, 11 Jun 2021 10:49:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9738360FC2; Fri, 11 Jun 2021 14:49:22 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id F0D6560C05 for ; Fri, 11 Jun 2021 14:49:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623423091; 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=0CkxCefMj7+PcvFswJBb/XimvDDhZrHK9jm1/FkXgRU=; b=gkXVQmvvKHPNKvX7tTnuOGhgkAmVDKnenlWSjZ4JbP1oAOTcuM2ogU/8Fk6CJnH99j3XoX ZhaKRCd5qXMjWbQSjhc+nLDWRCE9xkCCi2SbDnRxc5PRbP+zMTcJrmGoMpye0Kganvcaem UrZcwjda73TQ/30wwAMn0PrR1yAj/ro= X-MC-Unique: 35MAYxivN2CjCNfs41Pxhg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 07/22] tests: qemuxml2argv: Modernize 's390-allow-bogus-usb-none' test Date: Fri, 11 Jun 2021 16:48:58 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The 's390-virtio' machine was removed from qemu in the 2.6 release. Use the more modern s390-ccw-virtio machine type and use VIR_TEST_CAPS_ARCH_LATEST to invoke it. Signed-off-by: Peter Krempa --- .../s390-allow-bogus-usb-none.args | 31 --------------- ...390-allow-bogus-usb-none.s390x-latest.args | 39 +++++++++++++++++++ .../s390-allow-bogus-usb-none.xml | 2 +- tests/qemuxml2argvtest.c | 5 +-- 4 files changed, 41 insertions(+), 36 deletions(-) delete mode 100644 tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args create mode 100644 tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-= latest.args diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args b/tests/= qemuxml2argvdata/s390-allow-bogus-usb-none.args deleted file mode 100644 index fd698eaa46..0000000000 --- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args +++ /dev/null @@ -1,31 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-test/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-test/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-s390x \ --name test \ --S \ --machine s390-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=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,path=3D/tmp/lib/domain--1-test/monitor.so= ck,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --device virtio-serial-s390,id=3Dvirtio-serial0 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-s390,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,booti= ndex=3D1 \ --chardev pty,id=3Dcharconsole0 \ --device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/hwrng \ --device virtio-rng-s390,rng=3Dobjrng0,id=3Drng0 diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.= args b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args new file mode 100644 index 0000000000..527141d70a --- /dev/null +++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args @@ -0,0 +1,39 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-test/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-test/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=3Dtest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test/master-key.aes"}' \ +-machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memor= y-backend=3Ds390.ram \ +-cpu qemu \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.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 virtio-serial-ccw,id=3Dvirtio-serial0,devno=3Dfe.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 virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ +-chardev pty,id=3Dcharconsole0 \ +-device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0002 \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/hwrng"}'= \ +-device virtio-rng-ccw,rng=3Dobjrng0,id=3Drng0,devno=3Dfe.0.0003 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.xml b/tests/q= emuxml2argvdata/s390-allow-bogus-usb-none.xml index 8429939563..c0b2da6569 100644 --- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.xml +++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.xml @@ -4,7 +4,7 @@ 219100 219100 - hvm + hvm destroy diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index daf702cab6..d4b6cb680c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2540,10 +2540,7 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST("s390-allow-bogus-usb-none", - QEMU_CAPS_VIRTIO_S390, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-none", "s390x"); DO_TEST("s390-allow-bogus-usb-controller", QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_VIRTIO_RNG, --=20 2.31.1