From nobody Fri Dec 19 20:37:44 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 1548692362224720.9104546310213; Mon, 28 Jan 2019 08:19:22 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 29417DC917; Mon, 28 Jan 2019 16:19:19 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AECB86179D; Mon, 28 Jan 2019 16:19:18 +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 5480D18033CB; Mon, 28 Jan 2019 16:19:18 +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 x0SGJB0W018013 for ; Mon, 28 Jan 2019 11:19:11 -0500 Received: by smtp.corp.redhat.com (Postfix) id EC29517CCB; Mon, 28 Jan 2019 16:19:11 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 73F22611D0 for ; Mon, 28 Jan 2019 16:19:11 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Mon, 28 Jan 2019 17:18:36 +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 07/32] tests: qemuxml: Merge 'cmd_per_lun' variant of 'virtio-scsi' test into the common file 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.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 28 Jan 2019 16:19:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" We don't need separate files for this test. Also modernize it in the process. Signed-off-by: Peter Krempa --- .../controller-virtio-scsi.x86_64-latest.args | 6 ++- .../controller-virtio-scsi.xml | 8 ++++ .../disk-virtio-scsi-cmd_per_lun.args | 28 -------------- .../disk-virtio-scsi-cmd_per_lun.xml | 31 ---------------- tests/qemuxml2argvtest.c | 2 - .../controller-virtio-scsi.xml | 12 +++++- .../disk-virtio-scsi-cmd_per_lun.xml | 37 ------------------- tests/qemuxml2xmltest.c | 2 - 8 files changed, 24 insertions(+), 102 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.x= ml diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args index 7552f09019..954553e6d7 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args @@ -26,13 +26,17 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ -device virtio-scsi-pci,id=3Dscsi1,num_queues=3D8,bus=3Dpci.0,addr=3D0x3 \ +-device virtio-scsi-pci,id=3Dscsi2,cmd_per_lun=3D50,bus=3Dpci.0,addr=3D0x4= \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-scs= i0-0-0-0 \ -device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Ddriv= e-scsi0-0-0-0,\ id=3Dscsi0-0-0-0,bootindex=3D1 \ -drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-scs= i1-0-0-0 \ -device scsi-hd,bus=3Dscsi1.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Ddriv= e-scsi1-0-0-0,\ id=3Dscsi1-0-0-0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-drive file=3D/dev/HostVG/QEMUGuest3,format=3Draw,if=3Dnone,id=3Ddrive-scs= i2-0-0-0 \ +-device scsi-hd,bus=3Dscsi2.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Ddriv= e-scsi2-0-0-0,\ +id=3Dscsi2-0-0-0 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.xml b/tests/qemu= xml2argvdata/controller-virtio-scsi.xml index ec27166386..64d34b0fb2 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.xml +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.xml @@ -24,11 +24,19 @@
+ + + +
+ + + + diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.args b/tes= ts/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.args deleted file mode 100644 index d8318b4c29..0000000000 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.args +++ /dev/null @@ -1,28 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/home/test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --smp 8,sockets=3D8,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-QEMUGuest1/moni= tor.sock,\ -server,nowait \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --device virtio-scsi-pci,id=3Dscsi0,cmd_per_lun=3D50,bus=3Dpci.0,addr=3D0x3= \ --usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-scs= i0-0-0-0 \ --device scsi-disk,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,\ -drive=3Ddrive-scsi0-0-0-0,id=3Dscsi0-0-0-0,bootindex=3D1 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.xml b/test= s/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.xml deleted file mode 100644 index 7c44beaabe..0000000000 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.xml +++ /dev/null @@ -1,31 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 8 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - -
- - - - - - - - - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c70dcddafd..78e3dded8f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1181,8 +1181,6 @@ mymain(void) QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-scsi-vscsi", NONE); - DO_TEST("disk-virtio-scsi-cmd_per_lun", - QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-max_sectors", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-ioeventfd", diff --git a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml b/tests/qe= muxml2xmloutdata/controller-virtio-scsi.xml index 14498222de..7db0d0c114 100644 --- a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml +++ b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml @@ -26,6 +26,12 @@
+ + + + +
+
@@ -36,11 +42,15 @@
+ + +
+ -
+
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml b/te= sts/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml deleted file mode 100644 index f50a668625..0000000000 --- a/tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml +++ /dev/null @@ -1,37 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 8 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - -
- - - -
- - - - - -
- - - diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 22e9bc1f27..44d9b3e7f9 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -369,8 +369,6 @@ mymain(void) DO_TEST("disk-scsi-vscsi", NONE); DO_TEST("disk-virtio-scsi-reservations", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_PR_MANAGER_HELPER); - DO_TEST("disk-virtio-scsi-cmd_per_lun", - QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-max_sectors", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-ioeventfd", --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list