From nobody Fri Dec 19 19:20:22 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 1548692382680879.7295417297412; Mon, 28 Jan 2019 08:19:42 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 65539793ED; Mon, 28 Jan 2019 16:19:40 +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 0BD8677DC1; Mon, 28 Jan 2019 16:19:40 +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 87FCF18033A5; Mon, 28 Jan 2019 16:19:39 +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 x0SGJGrB018069 for ; Mon, 28 Jan 2019 11:19:16 -0500 Received: by smtp.corp.redhat.com (Postfix) id D54E82E040; Mon, 28 Jan 2019 16:19:16 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5BFB8614C2 for ; Mon, 28 Jan 2019 16:19:16 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Mon, 28 Jan 2019 17:18:42 +0100 Message-Id: <435cf1f25053bd255452f209e957ebee3683ef8a.1548692131.git.pkrempa@redhat.com> 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 13/32] tests: qemuxml2argv: Move cases from 'disk-shared-locking' into 'disk-shared' 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 28 Jan 2019 16:19:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The tests are for the same feature. Move all the cases to 'disk-shared' case as it's already using DO_TEST_CAPS_LATEST Signed-off-by: Peter Krempa --- .../qemuxml2argvdata/disk-shared-locking.args | 34 --------------- .../qemuxml2argvdata/disk-shared-locking.xml | 42 ------------------- .../disk-shared.x86_64-2.12.0.args | 9 +++- .../disk-shared.x86_64-latest.args | 9 +++- tests/qemuxml2argvdata/disk-shared.xml | 14 +++++++ tests/qemuxml2argvtest.c | 2 - 6 files changed, 30 insertions(+), 80 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-shared-locking.args delete mode 100644 tests/qemuxml2argvdata/disk-shared-locking.xml diff --git a/tests/qemuxml2argvdata/disk-shared-locking.args b/tests/qemuxm= l2argvdata/disk-shared-locking.args deleted file mode 100644 index 9ced336ec4..0000000000 --- a/tests/qemuxml2argvdata/disk-shared-locking.args +++ /dev/null @@ -1,34 +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 virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ --usb \ --drive file=3D/dev/ide,format=3Draw,if=3Dnone,id=3Ddrive-ide0-0-0,cache=3D= none \ --device ide-drive,bus=3Dide.0,unit=3D0,share-rw=3Don,drive=3Ddrive-ide0-0-= 0,\ -id=3Dide0-0-0,bootindex=3D1 \ --drive file=3D/dev/scsi,format=3Draw,if=3Dnone,id=3Ddrive-scsi0-0-0-0,cach= e=3Dnone \ --device scsi-disk,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,share-rw= =3Don,\ -drive=3Ddrive-scsi0-0-0-0,id=3Dscsi0-0-0-0 \ --drive file=3D/dev/virtio,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0,c= ache=3Dnone \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,share-rw=3Don,drive=3Ddrive-= virtio-disk0,\ -id=3Dvirtio-disk0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 diff --git a/tests/qemuxml2argvdata/disk-shared-locking.xml b/tests/qemuxml= 2argvdata/disk-shared-locking.xml deleted file mode 100644 index dd48857a30..0000000000 --- a/tests/qemuxml2argvdata/disk-shared-locking.xml +++ /dev/null @@ -1,42 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - - -
- - - - - - -
- - - - - - - - - - - - - diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args b/tests/= qemuxml2argvdata/disk-shared.x86_64-2.12.0.args index 96d8063abb..15c3b75df1 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args @@ -24,6 +24,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -no-acpi \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0,\ cache=3Dnone \ -device ide-hd,bus=3Dide.0,unit=3D0,share-rw=3Don,drive=3Ddrive-ide0-0-0,i= d=3Dide0-0-0,\ @@ -31,7 +32,13 @@ bootindex=3D1,write-cache=3Don,serial=3DXYZXYZXYZYXXYZYZ= YXYZY \ -drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-1-0,\ readonly=3Don \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-drive file=3D/dev/scsi,format=3Draw,if=3Dnone,id=3Ddrive-scsi0-0-0-0,cach= e=3Dnone \ +-device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,share-rw=3Do= n,\ +drive=3Ddrive-scsi0-0-0-0,id=3Dscsi0-0-0-0,write-cache=3Don \ +-drive file=3D/dev/virtio,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0,c= ache=3Dnone \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,share-rw=3Don,\ +drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,write-cache=3Don \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-shared.x86_64-latest.args index 15f8c6b3d7..4913d1ed20 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args @@ -24,6 +24,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -no-acpi \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0,\ cache=3Dnone \ -device ide-hd,bus=3Dide.0,unit=3D0,share-rw=3Don,drive=3Ddrive-ide0-0-0,i= d=3Dide0-0-0,\ @@ -31,7 +32,13 @@ bootindex=3D1,write-cache=3Don,serial=3DXYZXYZXYZYXXYZYZ= YXYZY \ -drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-1-0,\ readonly=3Don \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-drive file=3D/dev/scsi,format=3Draw,if=3Dnone,id=3Ddrive-scsi0-0-0-0,cach= e=3Dnone \ +-device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,share-rw=3Do= n,\ +drive=3Ddrive-scsi0-0-0-0,id=3Dscsi0-0-0-0,write-cache=3Don \ +-drive file=3D/dev/virtio,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0,c= ache=3Dnone \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,share-rw=3Don,\ +drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,write-cache=3Don \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-shared.xml b/tests/qemuxml2argvdat= a/disk-shared.xml index 677c2b0b7d..ec351ee1ae 100644 --- a/tests/qemuxml2argvdata/disk-shared.xml +++ b/tests/qemuxml2argvdata/disk-shared.xml @@ -29,8 +29,22 @@
+ + + + + +
+ + + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d1d3cfaca4..df48e341fb 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1060,8 +1060,6 @@ mymain(void) DO_TEST_CAPS_VER("disk-shared", "2.12.0"); DO_TEST_CAPS_LATEST("disk-shared"); DO_TEST_PARSE_ERROR("disk-shared-qcow", NONE); - DO_TEST("disk-shared-locking", - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DISK_SHARE_RW); DO_TEST("disk-error-policy", NONE); DO_TEST_CAPS_VER("disk-error-policy", "2.12.0"); DO_TEST_CAPS_LATEST("disk-error-policy"); --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list