From nobody Fri Dec 19 19:18:03 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1548692379620601.6815162646411; Mon, 28 Jan 2019 08:19:39 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E2F58AC604; Mon, 28 Jan 2019 16:19:35 +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 A4E7C10D7066; Mon, 28 Jan 2019 16:19:35 +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 4F9883F609; Mon, 28 Jan 2019 16:19:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x0SGJT97018177 for ; Mon, 28 Jan 2019 11:19:29 -0500 Received: by smtp.corp.redhat.com (Postfix) id 258C381635; Mon, 28 Jan 2019 16:19:29 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9E44F7C83A for ; Mon, 28 Jan 2019 16:19:28 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Mon, 28 Jan 2019 17:18:49 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 20/32] tests: qemuxml2argv: Modernize virtio-scsi iothread tests 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 28 Jan 2019 16:19:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Use DO_TEST_CAPS_LATEST to obtain actual results. Signed-off-by: Peter Krempa --- ...threads-virtio-scsi-ccw.s390x-latest.args} | 20 ++++++++++------ ...hreads-virtio-scsi-pci.x86_64-latest.args} | 23 +++++++++++-------- tests/qemuxml2argvtest.c | 8 ++----- 3 files changed, 29 insertions(+), 22 deletions(-) rename tests/qemuxml2argvdata/{iothreads-virtio-scsi-ccw.args =3D> iothrea= ds-virtio-scsi-ccw.s390x-latest.args} (58%) rename tests/qemuxml2argvdata/{iothreads-virtio-scsi-pci.args =3D> iothrea= ds-virtio-scsi-pci.x86_64-latest.args} (57%) diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.args b/tests/= qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args similarity index 58% rename from tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.args rename to tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args index 08d38942f6..1c5be88a47 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args @@ -5,10 +5,13 @@ USER=3Dtest \ LOGNAME=3Dtest \ QEMU_AUDIO_DRV=3Dnone \ /usr/bin/qemu-system-s390x \ --name QEMUGuest1 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -machine s390-ccw,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ +-realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -object iothread,id=3Diothread1 \ -object iothread,id=3Diothread2 \ @@ -16,16 +19,19 @@ QEMU_AUDIO_DRV=3Dnone \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ -server,nowait \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ +-boot strict=3Don \ -device virtio-scsi-ccw,iothread=3Diothread2,id=3Dscsi0,devno=3Dfe.0.0001 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,iothread=3Diothread1,devno=3Dfe.0.0000,\ +-device virtio-blk-ccw,iothread=3Diothread1,scsi=3Doff,devno=3Dfe.0.0000,\ drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,bootindex=3D1 \ -drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-scs= i0-0-2-0 \ --device scsi-disk,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D0,\ -drive=3Ddrive-scsi0-0-2-0,id=3Dscsi0-0-2-0 \ --device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.000a +-device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D0,drive=3Ddriv= e-scsi0-0-2-0,\ +id=3Dscsi0-0-2-0 \ +-device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.000a \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.args b/tests/= qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args similarity index 57% rename from tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.args rename to tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.ar= gs index ee346516cb..4513edcdd0 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args @@ -5,10 +5,13 @@ USER=3Dtest \ LOGNAME=3Dtest \ QEMU_AUDIO_DRV=3Dnone \ /usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ +-realtime mlock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -object iothread,id=3Diothread1 \ -object iothread,id=3Diothread2 \ @@ -16,22 +19,24 @@ QEMU_AUDIO_DRV=3Dnone \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ -server,nowait \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -device virtio-scsi-pci,iothread=3Diothread2,id=3Dscsi0,bus=3Dpci.0,addr= =3D0xb \ --usb \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0,\ -bootindex=3D1 \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -drive file=3D/var/lib/libvirt/images/iothrtest1.img,format=3Draw,if=3Dnon= e,\ id=3Ddrive-virtio-disk1 \ --device virtio-blk-pci,iothread=3Diothread1,bus=3Dpci.0,addr=3D0x4,\ +-device virtio-blk-pci,iothread=3Diothread1,scsi=3Doff,bus=3Dpci.0,addr=3D= 0x4,\ drive=3Ddrive-virtio-disk1,id=3Dvirtio-disk1 \ -drive file=3D/var/lib/libvirt/images/iothrtest2.img,format=3Draw,if=3Dnon= e,\ id=3Ddrive-scsi0-0-0-3 \ --device scsi-disk,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D3,\ -drive=3Ddrive-scsi0-0-0-3,id=3Dscsi0-0-0-3 +-device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D3,drive=3Ddriv= e-scsi0-0-0-3,\ +id=3Dscsi0-0-0-3 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fd889d8128..6a87b46b33 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1691,12 +1691,8 @@ mymain(void) DO_TEST("iothreads-disk", QEMU_CAPS_OBJECT_IOTHREAD); DO_TEST("iothreads-disk-virtio-ccw", QEMU_CAPS_OBJECT_IOTHREAD, QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST("iothreads-virtio-scsi-pci", QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_OBJECT_IOTHREAD, - QEMU_CAPS_VIRTIO_SCSI_IOTHREAD); - DO_TEST("iothreads-virtio-scsi-ccw", QEMU_CAPS_OBJECT_IOTHREAD, - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI_IOTHREAD, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + DO_TEST_CAPS_LATEST("iothreads-virtio-scsi-pci"); + DO_TEST_CAPS_ARCH_LATEST("iothreads-virtio-scsi-ccw", "s390x"); DO_TEST("cpu-topology1", NONE); DO_TEST("cpu-topology2", NONE); --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list