From nobody Sun Feb 8 10:30:00 2026 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 1549295289368862.4467489525761; Mon, 4 Feb 2019 07:48:09 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AB63E89AF2; Mon, 4 Feb 2019 15:48:06 +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 14DB88AC21; Mon, 4 Feb 2019 15:48:06 +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 8EABA18033AA; Mon, 4 Feb 2019 15:48:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x14FlML0008971 for ; Mon, 4 Feb 2019 10:47:22 -0500 Received: by smtp.corp.redhat.com (Postfix) id 19BFB5BBD2; Mon, 4 Feb 2019 15:47:22 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 919E888F98 for ; Mon, 4 Feb 2019 15:47:21 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Mon, 4 Feb 2019 16:46:50 +0100 Message-Id: <9efefa0d7ff051eb5bd4a33dade04f2b4ae913db.1549295166.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 17/32] tests: qemu: Merge 'disk-scsi-mptsas1068' test into 'disk-scsi' 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 04 Feb 2019 15:48:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" As we support multiple scsi controllers there's no need to have a special test for this controller. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- .../disk-scsi-mptsas1068.args | 31 ------------- .../qemuxml2argvdata/disk-scsi-mptsas1068.xml | 36 --------------- .../disk-scsi.x86_64-latest.args | 6 ++- tests/qemuxml2argvdata/disk-scsi.xml | 7 +++ tests/qemuxml2argvtest.c | 3 -- .../disk-scsi-mptsas1068.xml | 46 ------------------- tests/qemuxml2xmloutdata/disk-scsi.xml | 12 ++++- tests/qemuxml2xmltest.c | 6 +-- 8 files changed, 25 insertions(+), 122 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-scsi-mptsas1068.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-mptsas1068.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml diff --git a/tests/qemuxml2argvdata/disk-scsi-mptsas1068.args b/tests/qemux= ml2argvdata/disk-scsi-mptsas1068.args deleted file mode 100644 index 0ceddb4d46..0000000000 --- a/tests/qemuxml2argvdata/disk-scsi-mptsas1068.args +++ /dev/null @@ -1,31 +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 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-QEMUGuest1/moni= tor.sock,\ -server,nowait \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --device mptsas1068,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ --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 \ --drive file=3D/tmp/scsidisk.img,format=3Draw,if=3Dnone,id=3Ddrive-scsi0-0-= 4-0 \ --device scsi-disk,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D0,\ -drive=3Ddrive-scsi0-0-4-0,id=3Dscsi0-0-4-0,wwn=3D0x5000c50015ea71ac \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 diff --git a/tests/qemuxml2argvdata/disk-scsi-mptsas1068.xml b/tests/qemuxm= l2argvdata/disk-scsi-mptsas1068.xml deleted file mode 100644 index 496f2343de..0000000000 --- a/tests/qemuxml2argvdata/disk-scsi-mptsas1068.xml +++ /dev/null @@ -1,36 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - -
- - - - -
- 5000c50015ea71ac - - - - - - - - - - diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args b/tests/qe= muxml2argvdata/disk-scsi.x86_64-latest.args index 65ff7979eb..1b22e18a18 100644 --- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args @@ -26,6 +26,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -device lsi,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ -device megasas,id=3Dscsi1,bus=3Dpci.0,addr=3D0x3 \ +-device mptsas1068,id=3Dscsi2,bus=3Dpci.0,addr=3D0x4 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -drive file=3D/tmp/scsidisk.img,format=3Draw,if=3Dnone,id=3Ddrive-scsi0-0-= 0 \ @@ -33,7 +34,10 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -drive file=3D/tmp/scsidisk2.img,format=3Draw,if=3Dnone,id=3Ddrive-scsi1-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/tmp/scsidisk3.img,format=3Draw,if=3Dnone,id=3Ddrive-scsi2-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,wwn=3D0x5000c50015ea71ac \ +-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/disk-scsi.xml b/tests/qemuxml2argvdata/= disk-scsi.xml index 3318dc277c..6049ea2069 100644 --- a/tests/qemuxml2argvdata/disk-scsi.xml +++ b/tests/qemuxml2argvdata/disk-scsi.xml @@ -29,10 +29,17 @@
+ + + +
+ 5000c50015ea71ac + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a3c93ceb0d..0c4b97615b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1130,9 +1130,6 @@ mymain(void) QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-scsi-vscsi", NONE); DO_TEST_CAPS_LATEST("controller-virtio-scsi"); - DO_TEST("disk-scsi-mptsas1068", - QEMU_CAPS_SCSI_MPTSAS1068, - QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-sata-device", QEMU_CAPS_ICH9_AHCI); DO_TEST("disk-aio", NONE); diff --git a/tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml b/tests/qemu= xml2xmloutdata/disk-scsi-mptsas1068.xml deleted file mode 100644 index e4f4b9e3b1..0000000000 --- a/tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml +++ /dev/null @@ -1,46 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - 5000c50015ea71ac -
- - -
- - -
- - -
- - - - - -
- - - diff --git a/tests/qemuxml2xmloutdata/disk-scsi.xml b/tests/qemuxml2xmloutd= ata/disk-scsi.xml index 315f1cbf14..17602b9543 100644 --- a/tests/qemuxml2xmloutdata/disk-scsi.xml +++ b/tests/qemuxml2xmloutdata/disk-scsi.xml @@ -32,6 +32,13 @@
+ + + + + 5000c50015ea71ac +
+
@@ -44,11 +51,14 @@
+ +
+ -
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index a501575066..ee3a40bd2c 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -364,7 +364,8 @@ mymain(void) DO_TEST("disk-network-sheepdog", NONE); DO_TEST("disk-network-vxhs", NONE); DO_TEST("disk-network-tlsx509", NONE); - DO_TEST("disk-scsi", QEMU_CAPS_SCSI_LSI, QEMU_CAPS_SCSI_MEGASAS); + DO_TEST("disk-scsi", QEMU_CAPS_SCSI_LSI, QEMU_CAPS_SCSI_MEGASAS, + QEMU_CAPS_SCSI_MPTSAS1068, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-scsi-vscsi", NONE); DO_TEST("disk-virtio-scsi-reservations", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_PR_MANAGER_HELPER); @@ -372,9 +373,6 @@ mymain(void) DO_TEST("disk-virtio-s390-zpci", QEMU_CAPS_DEVICE_ZPCI, QEMU_CAPS_CCW); - DO_TEST("disk-scsi-mptsas1068", - QEMU_CAPS_SCSI_MPTSAS1068, - QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-mirror-old", NONE); DO_TEST("disk-mirror", NONE); DO_TEST_FULL("disk-active-commit", WHEN_ACTIVE, GIC_NONE, NONE); --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list