From nobody Tue Apr 30 07:17:02 2024 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 1532015489017353.2894545780788; Thu, 19 Jul 2018 08:51:29 -0700 (PDT) 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 0357930820D4; Thu, 19 Jul 2018 15:51:26 +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 3009F60BE5; Thu, 19 Jul 2018 15:51:25 +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 8FFEF18037ED; Thu, 19 Jul 2018 15:51:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpKUR028551 for ; Thu, 19 Jul 2018 11:51:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id C57D61C5A6; Thu, 19 Jul 2018 15:51:20 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2973F1C5B0 for ; Thu, 19 Jul 2018 15:51:20 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:50:53 +0200 Message-Id: <966421c31c6036d92b5736a0cd9f0eb178138f01.1532015294.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 01/24] tests: qemu: Drop 'drive' from disk 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: , MIME-Version: 1.0 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.47]); Thu, 19 Jul 2018 15:51:27 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- ...ress-conflict.xml =3D> disk-address-conflict.xml} | 0 ...-drive-boot-cdrom.args =3D> disk-boot-cdrom.args} | 0 ...sk-drive-boot-cdrom.xml =3D> disk-boot-cdrom.xml} | 0 ...sk-drive-boot-disk.args =3D> disk-boot-disk.args} | 0 ...disk-drive-boot-disk.xml =3D> disk-boot-disk.xml} | 0 ...-directsync.args =3D> disk-cache-directsync.args} | 0 ...he-directsync.xml =3D> disk-cache-directsync.xml} | 0 ...ve-cache-unsafe.args =3D> disk-cache-unsafe.args} | 0 ...rive-cache-unsafe.xml =3D> disk-cache-unsafe.xml} | 0 ...-cache-v2-none.args =3D> disk-cache-v2-none.args} | 0 ...ve-cache-v2-none.xml =3D> disk-cache-v2-none.xml} | 0 ...rive-cache-v2-wb.args =3D> disk-cache-v2-wb.args} | 0 ...-drive-cache-v2-wb.xml =3D> disk-cache-v2-wb.xml} | 0 ...rive-cache-v2-wt.args =3D> disk-cache-v2-wt.args} | 0 ...-drive-cache-v2-wt.xml =3D> disk-cache-v2-wt.xml} | 0 ...rive-copy-on-read.xml =3D> disk-copy-on-read.xml} | 0 ...-detect-zeroes.args =3D> disk-detect-zeroes.args} | 0 ...ve-detect-zeroes.xml =3D> disk-detect-zeroes.xml} | 0 .../{disk-drive-discard.args =3D> disk-discard.args} | 0 .../{disk-drive-discard.xml =3D> disk-discard.xml} | 0 ...ve-error-policy.args =3D> disk-error-policy.args} | 0 ...t.args =3D> disk-error-policy.x86_64-latest.args} | 0 ...rive-error-policy.xml =3D> disk-error-policy.xml} | 0 .../{disk-drive-fmt-cow.xml =3D> disk-fmt-cow.xml} | 0 .../{disk-drive-fmt-dir.xml =3D> disk-fmt-dir.xml} | 0 .../{disk-drive-fmt-iso.xml =3D> disk-fmt-iso.xml} | 0 ...disk-drive-fmt-qcow.args =3D> disk-fmt-qcow.args} | 0 .../{disk-drive-fmt-qcow.xml =3D> disk-fmt-qcow.xml} | 0 ...sk-ide-drive-split.args =3D> disk-ide-split.args} | 0 ...disk-ide-drive-split.xml =3D> disk-ide-split.xml} | 0 ...work-gluster.args =3D> disk-network-gluster.args} | 0 ...etwork-gluster.xml =3D> disk-network-gluster.xml} | 0 ...disk-network-iscsi-auth-secrettype-invalid.xml} | 0 ...> disk-network-iscsi-auth-wrong-secrettype.xml} | 0 ...scsi-auth.args =3D> disk-network-iscsi-auth.args} | 0 ...-iscsi-auth.xml =3D> disk-network-iscsi-auth.xml} | 0 ...-iscsi-lun.args =3D> disk-network-iscsi-lun.args} | 0 ...rk-iscsi-lun.xml =3D> disk-network-iscsi-lun.xml} | 0 ...-network-iscsi.args =3D> disk-network-iscsi.args} | 0 ...ve-network-iscsi.xml =3D> disk-network-iscsi.xml} | 0 ...bd-export.args =3D> disk-network-nbd-export.args} | 0 ...-nbd-export.xml =3D> disk-network-nbd-export.xml} | 0 ...port.args =3D> disk-network-nbd-ipv6-export.args} | 0 ...export.xml =3D> disk-network-nbd-ipv6-export.xml} | 0 ...rk-nbd-ipv6.args =3D> disk-network-nbd-ipv6.args} | 0 ...work-nbd-ipv6.xml =3D> disk-network-nbd-ipv6.xml} | 0 ...rk-nbd-unix.args =3D> disk-network-nbd-unix.args} | 0 ...work-nbd-unix.xml =3D> disk-network-nbd-unix.xml} | 0 ...rive-network-nbd.args =3D> disk-network-nbd.args} | 0 ...-drive-network-nbd.xml =3D> disk-network-nbd.xml} | 0 ...uth-AES.args =3D> disk-network-rbd-auth-AES.args} | 0 ...-auth-AES.xml =3D> disk-network-rbd-auth-AES.xml} | 0 ...rk-rbd-auth.args =3D> disk-network-rbd-auth.args} | 0 ...work-rbd-auth.xml =3D> disk-network-rbd-auth.xml} | 0 ...eph-env.args =3D> disk-network-rbd-ceph-env.args} | 0 ...-ceph-env.xml =3D> disk-network-rbd-ceph-env.xml} | 0 ...rk-rbd-ipv6.args =3D> disk-network-rbd-ipv6.args} | 0 ...work-rbd-ipv6.xml =3D> disk-network-rbd-ipv6.xml} | 0 ...-no-colon.xml =3D> disk-network-rbd-no-colon.xml} | 0 ...rive-network-rbd.args =3D> disk-network-rbd.args} | 0 ...-drive-network-rbd.xml =3D> disk-network-rbd.xml} | 0 ...rk-sheepdog.args =3D> disk-network-sheepdog.args} | 0 ...work-sheepdog.xml =3D> disk-network-sheepdog.xml} | 0 ...-both.xml =3D> disk-network-source-auth-both.xml} | 0 ...rce-auth.args =3D> disk-network-source-auth.args} | 0 ...ource-auth.xml =3D> disk-network-source-auth.xml} | 0 ...work-tlsx509.args =3D> disk-network-tlsx509.args} | 0 ...etwork-tlsx509.xml =3D> disk-network-tlsx509.xml} | 0 ...ve-network-vxhs.args =3D> disk-network-vxhs.args} | 0 ...rive-network-vxhs.xml =3D> disk-network-vxhs.xml} | 0 .../{disk-drive-no-boot.args =3D> disk-no-boot.args} | 0 .../{disk-drive-no-boot.xml =3D> disk-no-boot.xml} | 0 ...-readonly-disk.args =3D> disk-readonly-disk.args} | 0 ...ve-readonly-disk.xml =3D> disk-readonly-disk.xml} | 0 ...no-device.args =3D> disk-readonly-no-device.args} | 0 ...y-no-device.xml =3D> disk-readonly-no-device.xml} | 0 ...hared-locking.args =3D> disk-shared-locking.args} | 0 ...-shared-locking.xml =3D> disk-shared-locking.xml} | 0 ...-drive-shared-qcow.xml =3D> disk-shared-qcow.xml} | 0 .../{disk-drive-shared.args =3D> disk-shared.args} | 0 .../{disk-drive-shared.xml =3D> disk-shared.xml} | 0 ...o-drive-queues.args =3D> disk-virtio-queues.args} | 0 ...tio-drive-queues.xml =3D> disk-virtio-queues.xml} | 0 ...6.0.args =3D> disk-write-cache.x86_64-2.6.0.args} | 0 ...7.0.args =3D> disk-write-cache.x86_64-2.7.0.args} | 0 ...st.args =3D> disk-write-cache.x86_64-latest.args} | 0 ...-drive-write-cache.xml =3D> disk-write-cache.xml} | 0 tests/qemuxml2argvtest.c | 96 +++++++++++-------= ---- ...sk-drive-boot-cdrom.xml =3D> disk-boot-cdrom.xml} | 0 ...disk-drive-boot-disk.xml =3D> disk-boot-disk.xml} | 0 ...he-directsync.xml =3D> disk-cache-directsync.xml} | 0 ...rive-cache-unsafe.xml =3D> disk-cache-unsafe.xml} | 0 ...ve-cache-v2-none.xml =3D> disk-cache-v2-none.xml} | 0 ...-drive-cache-v2-wb.xml =3D> disk-cache-v2-wb.xml} | 0 ...-drive-cache-v2-wt.xml =3D> disk-cache-v2-wt.xml} | 0 ...rive-copy-on-read.xml =3D> disk-copy-on-read.xml} | 0 tests/qemuxml2xmloutdata/disk-detect-zeroes.xml | 1 + .../{disk-drive-discard.xml =3D> disk-discard.xml} | 0 .../disk-drive-detect-zeroes.xml | 1 - ...rive-error-policy.xml =3D> disk-error-policy.xml} | 0 .../{disk-drive-fat.xml =3D> disk-fat.xml} | 0 .../{disk-drive-fmt-qcow.xml =3D> disk-fmt-qcow.xml} | 0 ...etwork-gluster.xml =3D> disk-network-gluster.xml} | 0 ...-iscsi-auth.xml =3D> disk-network-iscsi-auth.xml} | 0 ...ve-network-iscsi.xml =3D> disk-network-iscsi.xml} | 0 ...-nbd-export.xml =3D> disk-network-nbd-export.xml} | 0 ...export.xml =3D> disk-network-nbd-ipv6-export.xml} | 0 ...work-nbd-ipv6.xml =3D> disk-network-nbd-ipv6.xml} | 0 ...work-nbd-unix.xml =3D> disk-network-nbd-unix.xml} | 0 ...-drive-network-nbd.xml =3D> disk-network-nbd.xml} | 0 ...work-rbd-auth.xml =3D> disk-network-rbd-auth.xml} | 0 ...-ceph-env.xml =3D> disk-network-rbd-ceph-env.xml} | 0 ...work-rbd-ipv6.xml =3D> disk-network-rbd-ipv6.xml} | 0 ...-drive-network-rbd.xml =3D> disk-network-rbd.xml} | 0 ...work-sheepdog.xml =3D> disk-network-sheepdog.xml} | 0 ...ource-auth.xml =3D> disk-network-source-auth.xml} | 0 ...etwork-tlsx509.xml =3D> disk-network-tlsx509.xml} | 0 ...rive-network-vxhs.xml =3D> disk-network-vxhs.xml} | 0 ...tio-drive-queues.xml =3D> disk-virtio-queues.xml} | 0 tests/qemuxml2xmltest.c | 58 ++++++------- 120 files changed, 78 insertions(+), 78 deletions(-) rename tests/qemuxml2argvdata/{disk-drive-address-conflict.xml =3D> disk-a= ddress-conflict.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-boot-cdrom.args =3D> disk-boot-c= drom.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-boot-cdrom.xml =3D> disk-boot-cd= rom.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-boot-disk.args =3D> disk-boot-di= sk.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-boot-disk.xml =3D> disk-boot-dis= k.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-directsync.args =3D> disk-= cache-directsync.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-directsync.xml =3D> disk-c= ache-directsync.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-unsafe.args =3D> disk-cach= e-unsafe.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-unsafe.xml =3D> disk-cache= -unsafe.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-v2-none.args =3D> disk-cac= he-v2-none.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-v2-none.xml =3D> disk-cach= e-v2-none.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-v2-wb.args =3D> disk-cache= -v2-wb.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-v2-wb.xml =3D> disk-cache-= v2-wb.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-v2-wt.args =3D> disk-cache= -v2-wt.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-v2-wt.xml =3D> disk-cache-= v2-wt.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-copy-on-read.xml =3D> disk-copy-= on-read.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-detect-zeroes.args =3D> disk-det= ect-zeroes.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-detect-zeroes.xml =3D> disk-dete= ct-zeroes.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-discard.args =3D> disk-discard.a= rgs} (100%) rename tests/qemuxml2argvdata/{disk-drive-discard.xml =3D> disk-discard.xm= l} (100%) rename tests/qemuxml2argvdata/{disk-drive-error-policy.args =3D> disk-erro= r-policy.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-error-policy.x86_64-latest.args = =3D> disk-error-policy.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-error-policy.xml =3D> disk-error= -policy.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-cow.xml =3D> disk-fmt-cow.xm= l} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-dir.xml =3D> disk-fmt-dir.xm= l} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-iso.xml =3D> disk-fmt-iso.xm= l} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-qcow.args =3D> disk-fmt-qcow= .args} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-qcow.xml =3D> disk-fmt-qcow.= xml} (100%) rename tests/qemuxml2argvdata/{disk-ide-drive-split.args =3D> disk-ide-spl= it.args} (100%) rename tests/qemuxml2argvdata/{disk-ide-drive-split.xml =3D> disk-ide-spli= t.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-gluster.args =3D> disk-n= etwork-gluster.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-gluster.xml =3D> disk-ne= twork-gluster.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth-secrettype-in= valid.xml =3D> disk-network-iscsi-auth-secrettype-invalid.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth-wrong-secrett= ype.xml =3D> disk-network-iscsi-auth-wrong-secrettype.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth.args =3D> dis= k-network-iscsi-auth.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth.xml =3D> disk= -network-iscsi-auth.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-lun.args =3D> disk= -network-iscsi-lun.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-lun.xml =3D> disk-= network-iscsi-lun.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi.args =3D> disk-net= work-iscsi.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi.xml =3D> disk-netw= ork-iscsi.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-export.args =3D> dis= k-network-nbd-export.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-export.xml =3D> disk= -network-nbd-export.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-ipv6-export.args =3D= > disk-network-nbd-ipv6-export.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-ipv6-export.xml =3D>= disk-network-nbd-ipv6-export.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-ipv6.args =3D> disk-= network-nbd-ipv6.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-ipv6.xml =3D> disk-n= etwork-nbd-ipv6.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-unix.args =3D> disk-= network-nbd-unix.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-unix.xml =3D> disk-n= etwork-nbd-unix.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd.args =3D> disk-netwo= rk-nbd.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd.xml =3D> disk-networ= k-nbd.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-auth-AES.args =3D> d= isk-network-rbd-auth-AES.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-auth-AES.xml =3D> di= sk-network-rbd-auth-AES.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-auth.args =3D> disk-= network-rbd-auth.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-auth.xml =3D> disk-n= etwork-rbd-auth.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-ceph-env.args =3D> d= isk-network-rbd-ceph-env.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-ceph-env.xml =3D> di= sk-network-rbd-ceph-env.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-ipv6.args =3D> disk-= network-rbd-ipv6.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-ipv6.xml =3D> disk-n= etwork-rbd-ipv6.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-no-colon.xml =3D> di= sk-network-rbd-no-colon.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd.args =3D> disk-netwo= rk-rbd.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd.xml =3D> disk-networ= k-rbd.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-sheepdog.args =3D> disk-= network-sheepdog.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-sheepdog.xml =3D> disk-n= etwork-sheepdog.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-source-auth-both.xml =3D= > disk-network-source-auth-both.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-source-auth.args =3D> di= sk-network-source-auth.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-source-auth.xml =3D> dis= k-network-source-auth.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-tlsx509.args =3D> disk-n= etwork-tlsx509.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-tlsx509.xml =3D> disk-ne= twork-tlsx509.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-vxhs.args =3D> disk-netw= ork-vxhs.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-vxhs.xml =3D> disk-netwo= rk-vxhs.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-no-boot.args =3D> disk-no-boot.a= rgs} (100%) rename tests/qemuxml2argvdata/{disk-drive-no-boot.xml =3D> disk-no-boot.xm= l} (100%) rename tests/qemuxml2argvdata/{disk-drive-readonly-disk.args =3D> disk-rea= donly-disk.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-readonly-disk.xml =3D> disk-read= only-disk.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-readonly-no-device.args =3D> dis= k-readonly-no-device.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-readonly-no-device.xml =3D> disk= -readonly-no-device.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared-locking.args =3D> disk-sh= ared-locking.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared-locking.xml =3D> disk-sha= red-locking.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared-qcow.xml =3D> disk-shared= -qcow.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared.args =3D> disk-shared.arg= s} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared.xml =3D> disk-shared.xml}= (100%) rename tests/qemuxml2argvdata/{disk-virtio-drive-queues.args =3D> disk-vir= tio-queues.args} (100%) rename tests/qemuxml2argvdata/{disk-virtio-drive-queues.xml =3D> disk-virt= io-queues.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-write-cache.x86_64-2.6.0.args = =3D> disk-write-cache.x86_64-2.6.0.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-write-cache.x86_64-2.7.0.args = =3D> disk-write-cache.x86_64-2.7.0.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-write-cache.x86_64-latest.args = =3D> disk-write-cache.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-write-cache.xml =3D> disk-write-= cache.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-boot-cdrom.xml =3D> disk-boot-= cdrom.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-boot-disk.xml =3D> disk-boot-d= isk.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-cache-directsync.xml =3D> disk= -cache-directsync.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-cache-unsafe.xml =3D> disk-cac= he-unsafe.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-cache-v2-none.xml =3D> disk-ca= che-v2-none.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-cache-v2-wb.xml =3D> disk-cach= e-v2-wb.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-cache-v2-wt.xml =3D> disk-cach= e-v2-wt.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-copy-on-read.xml =3D> disk-cop= y-on-read.xml} (100%) create mode 120000 tests/qemuxml2xmloutdata/disk-detect-zeroes.xml rename tests/qemuxml2xmloutdata/{disk-drive-discard.xml =3D> disk-discard.= xml} (100%) delete mode 120000 tests/qemuxml2xmloutdata/disk-drive-detect-zeroes.xml rename tests/qemuxml2xmloutdata/{disk-drive-error-policy.xml =3D> disk-err= or-policy.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-fat.xml =3D> disk-fat.xml} (10= 0%) rename tests/qemuxml2xmloutdata/{disk-drive-fmt-qcow.xml =3D> disk-fmt-qco= w.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-gluster.xml =3D> disk-= network-gluster.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-iscsi-auth.xml =3D> di= sk-network-iscsi-auth.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-iscsi.xml =3D> disk-ne= twork-iscsi.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-nbd-export.xml =3D> di= sk-network-nbd-export.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-nbd-ipv6-export.xml = =3D> disk-network-nbd-ipv6-export.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-nbd-ipv6.xml =3D> disk= -network-nbd-ipv6.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-nbd-unix.xml =3D> disk= -network-nbd-unix.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-nbd.xml =3D> disk-netw= ork-nbd.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-rbd-auth.xml =3D> disk= -network-rbd-auth.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-rbd-ceph-env.xml =3D> = disk-network-rbd-ceph-env.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-rbd-ipv6.xml =3D> disk= -network-rbd-ipv6.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-rbd.xml =3D> disk-netw= ork-rbd.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-sheepdog.xml =3D> disk= -network-sheepdog.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-source-auth.xml =3D> d= isk-network-source-auth.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-tlsx509.xml =3D> disk-= network-tlsx509.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-vxhs.xml =3D> disk-net= work-vxhs.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-virtio-drive-queues.xml =3D> disk-vi= rtio-queues.xml} (100%) diff --git a/tests/qemuxml2argvdata/disk-drive-address-conflict.xml b/tests= /qemuxml2argvdata/disk-address-conflict.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-address-conflict.xml rename to tests/qemuxml2argvdata/disk-address-conflict.xml diff --git a/tests/qemuxml2argvdata/disk-drive-boot-cdrom.args b/tests/qemu= xml2argvdata/disk-boot-cdrom.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-boot-cdrom.args rename to tests/qemuxml2argvdata/disk-boot-cdrom.args diff --git a/tests/qemuxml2argvdata/disk-drive-boot-cdrom.xml b/tests/qemux= ml2argvdata/disk-boot-cdrom.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-boot-cdrom.xml rename to tests/qemuxml2argvdata/disk-boot-cdrom.xml diff --git a/tests/qemuxml2argvdata/disk-drive-boot-disk.args b/tests/qemux= ml2argvdata/disk-boot-disk.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-boot-disk.args rename to tests/qemuxml2argvdata/disk-boot-disk.args diff --git a/tests/qemuxml2argvdata/disk-drive-boot-disk.xml b/tests/qemuxm= l2argvdata/disk-boot-disk.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-boot-disk.xml rename to tests/qemuxml2argvdata/disk-boot-disk.xml diff --git a/tests/qemuxml2argvdata/disk-drive-cache-directsync.args b/test= s/qemuxml2argvdata/disk-cache-directsync.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-cache-directsync.args rename to tests/qemuxml2argvdata/disk-cache-directsync.args diff --git a/tests/qemuxml2argvdata/disk-drive-cache-directsync.xml b/tests= /qemuxml2argvdata/disk-cache-directsync.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-cache-directsync.xml rename to tests/qemuxml2argvdata/disk-cache-directsync.xml diff --git a/tests/qemuxml2argvdata/disk-drive-cache-unsafe.args b/tests/qe= muxml2argvdata/disk-cache-unsafe.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-cache-unsafe.args rename to tests/qemuxml2argvdata/disk-cache-unsafe.args diff --git a/tests/qemuxml2argvdata/disk-drive-cache-unsafe.xml b/tests/qem= uxml2argvdata/disk-cache-unsafe.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-cache-unsafe.xml rename to tests/qemuxml2argvdata/disk-cache-unsafe.xml diff --git a/tests/qemuxml2argvdata/disk-drive-cache-v2-none.args b/tests/q= emuxml2argvdata/disk-cache-v2-none.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-cache-v2-none.args rename to tests/qemuxml2argvdata/disk-cache-v2-none.args diff --git a/tests/qemuxml2argvdata/disk-drive-cache-v2-none.xml b/tests/qe= muxml2argvdata/disk-cache-v2-none.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-cache-v2-none.xml rename to tests/qemuxml2argvdata/disk-cache-v2-none.xml diff --git a/tests/qemuxml2argvdata/disk-drive-cache-v2-wb.args b/tests/qem= uxml2argvdata/disk-cache-v2-wb.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-cache-v2-wb.args rename to tests/qemuxml2argvdata/disk-cache-v2-wb.args diff --git a/tests/qemuxml2argvdata/disk-drive-cache-v2-wb.xml b/tests/qemu= xml2argvdata/disk-cache-v2-wb.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-cache-v2-wb.xml rename to tests/qemuxml2argvdata/disk-cache-v2-wb.xml diff --git a/tests/qemuxml2argvdata/disk-drive-cache-v2-wt.args b/tests/qem= uxml2argvdata/disk-cache-v2-wt.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-cache-v2-wt.args rename to tests/qemuxml2argvdata/disk-cache-v2-wt.args diff --git a/tests/qemuxml2argvdata/disk-drive-cache-v2-wt.xml b/tests/qemu= xml2argvdata/disk-cache-v2-wt.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-cache-v2-wt.xml rename to tests/qemuxml2argvdata/disk-cache-v2-wt.xml diff --git a/tests/qemuxml2argvdata/disk-drive-copy-on-read.xml b/tests/qem= uxml2argvdata/disk-copy-on-read.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-copy-on-read.xml rename to tests/qemuxml2argvdata/disk-copy-on-read.xml diff --git a/tests/qemuxml2argvdata/disk-drive-detect-zeroes.args b/tests/q= emuxml2argvdata/disk-detect-zeroes.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-detect-zeroes.args rename to tests/qemuxml2argvdata/disk-detect-zeroes.args diff --git a/tests/qemuxml2argvdata/disk-drive-detect-zeroes.xml b/tests/qe= muxml2argvdata/disk-detect-zeroes.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-detect-zeroes.xml rename to tests/qemuxml2argvdata/disk-detect-zeroes.xml diff --git a/tests/qemuxml2argvdata/disk-drive-discard.args b/tests/qemuxml= 2argvdata/disk-discard.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-discard.args rename to tests/qemuxml2argvdata/disk-discard.args diff --git a/tests/qemuxml2argvdata/disk-drive-discard.xml b/tests/qemuxml2= argvdata/disk-discard.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-discard.xml rename to tests/qemuxml2argvdata/disk-discard.xml diff --git a/tests/qemuxml2argvdata/disk-drive-error-policy.args b/tests/qe= muxml2argvdata/disk-error-policy.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-error-policy.args rename to tests/qemuxml2argvdata/disk-error-policy.args diff --git a/tests/qemuxml2argvdata/disk-drive-error-policy.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-error-policy.x86_64-latest.ar= gs rename to tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-drive-error-policy.xml b/tests/qem= uxml2argvdata/disk-error-policy.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-error-policy.xml rename to tests/qemuxml2argvdata/disk-error-policy.xml diff --git a/tests/qemuxml2argvdata/disk-drive-fmt-cow.xml b/tests/qemuxml2= argvdata/disk-fmt-cow.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-fmt-cow.xml rename to tests/qemuxml2argvdata/disk-fmt-cow.xml diff --git a/tests/qemuxml2argvdata/disk-drive-fmt-dir.xml b/tests/qemuxml2= argvdata/disk-fmt-dir.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-fmt-dir.xml rename to tests/qemuxml2argvdata/disk-fmt-dir.xml diff --git a/tests/qemuxml2argvdata/disk-drive-fmt-iso.xml b/tests/qemuxml2= argvdata/disk-fmt-iso.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-fmt-iso.xml rename to tests/qemuxml2argvdata/disk-fmt-iso.xml diff --git a/tests/qemuxml2argvdata/disk-drive-fmt-qcow.args b/tests/qemuxm= l2argvdata/disk-fmt-qcow.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-fmt-qcow.args rename to tests/qemuxml2argvdata/disk-fmt-qcow.args diff --git a/tests/qemuxml2argvdata/disk-drive-fmt-qcow.xml b/tests/qemuxml= 2argvdata/disk-fmt-qcow.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-fmt-qcow.xml rename to tests/qemuxml2argvdata/disk-fmt-qcow.xml diff --git a/tests/qemuxml2argvdata/disk-ide-drive-split.args b/tests/qemux= ml2argvdata/disk-ide-split.args similarity index 100% rename from tests/qemuxml2argvdata/disk-ide-drive-split.args rename to tests/qemuxml2argvdata/disk-ide-split.args diff --git a/tests/qemuxml2argvdata/disk-ide-drive-split.xml b/tests/qemuxm= l2argvdata/disk-ide-split.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-ide-drive-split.xml rename to tests/qemuxml2argvdata/disk-ide-split.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-gluster.args b/tests= /qemuxml2argvdata/disk-network-gluster.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-gluster.args rename to tests/qemuxml2argvdata/disk-network-gluster.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-gluster.xml b/tests/= qemuxml2argvdata/disk-network-gluster.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-gluster.xml rename to tests/qemuxml2argvdata/disk-network-gluster.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-iscsi-auth-secrettyp= e-invalid.xml b/tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-i= nvalid.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-iscsi-auth-secrettype= -invalid.xml rename to tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid= .xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-iscsi-auth-wrong-sec= rettype.xml b/tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secretty= pe.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-iscsi-auth-wrong-secr= ettype.xml rename to tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.x= ml diff --git a/tests/qemuxml2argvdata/disk-drive-network-iscsi-auth.args b/te= sts/qemuxml2argvdata/disk-network-iscsi-auth.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-iscsi-auth.args rename to tests/qemuxml2argvdata/disk-network-iscsi-auth.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-iscsi-auth.xml b/tes= ts/qemuxml2argvdata/disk-network-iscsi-auth.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-iscsi-auth.xml rename to tests/qemuxml2argvdata/disk-network-iscsi-auth.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-iscsi-lun.args b/tes= ts/qemuxml2argvdata/disk-network-iscsi-lun.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-iscsi-lun.args rename to tests/qemuxml2argvdata/disk-network-iscsi-lun.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-iscsi-lun.xml b/test= s/qemuxml2argvdata/disk-network-iscsi-lun.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-iscsi-lun.xml rename to tests/qemuxml2argvdata/disk-network-iscsi-lun.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-iscsi.args b/tests/q= emuxml2argvdata/disk-network-iscsi.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-iscsi.args rename to tests/qemuxml2argvdata/disk-network-iscsi.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-iscsi.xml b/tests/qe= muxml2argvdata/disk-network-iscsi.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-iscsi.xml rename to tests/qemuxml2argvdata/disk-network-iscsi.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-nbd-export.args b/te= sts/qemuxml2argvdata/disk-network-nbd-export.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-nbd-export.args rename to tests/qemuxml2argvdata/disk-network-nbd-export.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-nbd-export.xml b/tes= ts/qemuxml2argvdata/disk-network-nbd-export.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-nbd-export.xml rename to tests/qemuxml2argvdata/disk-network-nbd-export.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6-export.args= b/tests/qemuxml2argvdata/disk-network-nbd-ipv6-export.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6-export.args rename to tests/qemuxml2argvdata/disk-network-nbd-ipv6-export.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6-export.xml = b/tests/qemuxml2argvdata/disk-network-nbd-ipv6-export.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6-export.xml rename to tests/qemuxml2argvdata/disk-network-nbd-ipv6-export.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6.args b/test= s/qemuxml2argvdata/disk-network-nbd-ipv6.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6.args rename to tests/qemuxml2argvdata/disk-network-nbd-ipv6.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6.xml b/tests= /qemuxml2argvdata/disk-network-nbd-ipv6.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6.xml rename to tests/qemuxml2argvdata/disk-network-nbd-ipv6.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-nbd-unix.args b/test= s/qemuxml2argvdata/disk-network-nbd-unix.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-nbd-unix.args rename to tests/qemuxml2argvdata/disk-network-nbd-unix.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-nbd-unix.xml b/tests= /qemuxml2argvdata/disk-network-nbd-unix.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-nbd-unix.xml rename to tests/qemuxml2argvdata/disk-network-nbd-unix.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-nbd.args b/tests/qem= uxml2argvdata/disk-network-nbd.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-nbd.args rename to tests/qemuxml2argvdata/disk-network-nbd.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-nbd.xml b/tests/qemu= xml2argvdata/disk-network-nbd.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-nbd.xml rename to tests/qemuxml2argvdata/disk-network-nbd.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd-auth-AES.args b/= tests/qemuxml2argvdata/disk-network-rbd-auth-AES.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd-auth-AES.args rename to tests/qemuxml2argvdata/disk-network-rbd-auth-AES.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd-auth-AES.xml b/t= ests/qemuxml2argvdata/disk-network-rbd-auth-AES.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd-auth-AES.xml rename to tests/qemuxml2argvdata/disk-network-rbd-auth-AES.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd-auth.args b/test= s/qemuxml2argvdata/disk-network-rbd-auth.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd-auth.args rename to tests/qemuxml2argvdata/disk-network-rbd-auth.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd-auth.xml b/tests= /qemuxml2argvdata/disk-network-rbd-auth.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd-auth.xml rename to tests/qemuxml2argvdata/disk-network-rbd-auth.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd-ceph-env.args b/= tests/qemuxml2argvdata/disk-network-rbd-ceph-env.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd-ceph-env.args rename to tests/qemuxml2argvdata/disk-network-rbd-ceph-env.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd-ceph-env.xml b/t= ests/qemuxml2argvdata/disk-network-rbd-ceph-env.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd-ceph-env.xml rename to tests/qemuxml2argvdata/disk-network-rbd-ceph-env.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd-ipv6.args b/test= s/qemuxml2argvdata/disk-network-rbd-ipv6.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd-ipv6.args rename to tests/qemuxml2argvdata/disk-network-rbd-ipv6.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd-ipv6.xml b/tests= /qemuxml2argvdata/disk-network-rbd-ipv6.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd-ipv6.xml rename to tests/qemuxml2argvdata/disk-network-rbd-ipv6.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd-no-colon.xml b/t= ests/qemuxml2argvdata/disk-network-rbd-no-colon.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd-no-colon.xml rename to tests/qemuxml2argvdata/disk-network-rbd-no-colon.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd.args b/tests/qem= uxml2argvdata/disk-network-rbd.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd.args rename to tests/qemuxml2argvdata/disk-network-rbd.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd.xml b/tests/qemu= xml2argvdata/disk-network-rbd.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd.xml rename to tests/qemuxml2argvdata/disk-network-rbd.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-sheepdog.args b/test= s/qemuxml2argvdata/disk-network-sheepdog.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-sheepdog.args rename to tests/qemuxml2argvdata/disk-network-sheepdog.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-sheepdog.xml b/tests= /qemuxml2argvdata/disk-network-sheepdog.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-sheepdog.xml rename to tests/qemuxml2argvdata/disk-network-sheepdog.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-source-auth-both.xml= b/tests/qemuxml2argvdata/disk-network-source-auth-both.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-source-auth-both.xml rename to tests/qemuxml2argvdata/disk-network-source-auth-both.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-source-auth.args b/t= ests/qemuxml2argvdata/disk-network-source-auth.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-source-auth.args rename to tests/qemuxml2argvdata/disk-network-source-auth.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-source-auth.xml b/te= sts/qemuxml2argvdata/disk-network-source-auth.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-source-auth.xml rename to tests/qemuxml2argvdata/disk-network-source-auth.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args b/tests= /qemuxml2argvdata/disk-network-tlsx509.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-tlsx509.args rename to tests/qemuxml2argvdata/disk-network-tlsx509.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-tlsx509.xml b/tests/= qemuxml2argvdata/disk-network-tlsx509.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-tlsx509.xml rename to tests/qemuxml2argvdata/disk-network-tlsx509.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-vxhs.args b/tests/qe= muxml2argvdata/disk-network-vxhs.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-vxhs.args rename to tests/qemuxml2argvdata/disk-network-vxhs.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-vxhs.xml b/tests/qem= uxml2argvdata/disk-network-vxhs.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-vxhs.xml rename to tests/qemuxml2argvdata/disk-network-vxhs.xml diff --git a/tests/qemuxml2argvdata/disk-drive-no-boot.args b/tests/qemuxml= 2argvdata/disk-no-boot.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-no-boot.args rename to tests/qemuxml2argvdata/disk-no-boot.args diff --git a/tests/qemuxml2argvdata/disk-drive-no-boot.xml b/tests/qemuxml2= argvdata/disk-no-boot.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-no-boot.xml rename to tests/qemuxml2argvdata/disk-no-boot.xml diff --git a/tests/qemuxml2argvdata/disk-drive-readonly-disk.args b/tests/q= emuxml2argvdata/disk-readonly-disk.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-readonly-disk.args rename to tests/qemuxml2argvdata/disk-readonly-disk.args diff --git a/tests/qemuxml2argvdata/disk-drive-readonly-disk.xml b/tests/qe= muxml2argvdata/disk-readonly-disk.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-readonly-disk.xml rename to tests/qemuxml2argvdata/disk-readonly-disk.xml diff --git a/tests/qemuxml2argvdata/disk-drive-readonly-no-device.args b/te= sts/qemuxml2argvdata/disk-readonly-no-device.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-readonly-no-device.args rename to tests/qemuxml2argvdata/disk-readonly-no-device.args diff --git a/tests/qemuxml2argvdata/disk-drive-readonly-no-device.xml b/tes= ts/qemuxml2argvdata/disk-readonly-no-device.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-readonly-no-device.xml rename to tests/qemuxml2argvdata/disk-readonly-no-device.xml diff --git a/tests/qemuxml2argvdata/disk-drive-shared-locking.args b/tests/= qemuxml2argvdata/disk-shared-locking.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-shared-locking.args rename to tests/qemuxml2argvdata/disk-shared-locking.args diff --git a/tests/qemuxml2argvdata/disk-drive-shared-locking.xml b/tests/q= emuxml2argvdata/disk-shared-locking.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-shared-locking.xml rename to tests/qemuxml2argvdata/disk-shared-locking.xml diff --git a/tests/qemuxml2argvdata/disk-drive-shared-qcow.xml b/tests/qemu= xml2argvdata/disk-shared-qcow.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-shared-qcow.xml rename to tests/qemuxml2argvdata/disk-shared-qcow.xml diff --git a/tests/qemuxml2argvdata/disk-drive-shared.args b/tests/qemuxml2= argvdata/disk-shared.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-shared.args rename to tests/qemuxml2argvdata/disk-shared.args diff --git a/tests/qemuxml2argvdata/disk-drive-shared.xml b/tests/qemuxml2a= rgvdata/disk-shared.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-shared.xml rename to tests/qemuxml2argvdata/disk-shared.xml diff --git a/tests/qemuxml2argvdata/disk-virtio-drive-queues.args b/tests/q= emuxml2argvdata/disk-virtio-queues.args similarity index 100% rename from tests/qemuxml2argvdata/disk-virtio-drive-queues.args rename to tests/qemuxml2argvdata/disk-virtio-queues.args diff --git a/tests/qemuxml2argvdata/disk-virtio-drive-queues.xml b/tests/qe= muxml2argvdata/disk-virtio-queues.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-virtio-drive-queues.xml rename to tests/qemuxml2argvdata/disk-virtio-queues.xml diff --git a/tests/qemuxml2argvdata/disk-drive-write-cache.x86_64-2.6.0.arg= s b/tests/qemuxml2argvdata/disk-write-cache.x86_64-2.6.0.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-write-cache.x86_64-2.6.0.args rename to tests/qemuxml2argvdata/disk-write-cache.x86_64-2.6.0.args diff --git a/tests/qemuxml2argvdata/disk-drive-write-cache.x86_64-2.7.0.arg= s b/tests/qemuxml2argvdata/disk-write-cache.x86_64-2.7.0.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-write-cache.x86_64-2.7.0.args rename to tests/qemuxml2argvdata/disk-write-cache.x86_64-2.7.0.args diff --git a/tests/qemuxml2argvdata/disk-drive-write-cache.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/disk-write-cache.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-write-cache.x86_64-latest.args rename to tests/qemuxml2argvdata/disk-write-cache.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-drive-write-cache.xml b/tests/qemu= xml2argvdata/disk-write-cache.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-write-cache.xml rename to tests/qemuxml2argvdata/disk-write-cache.xml diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 52540a6d0b..2708a58d60 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1016,65 +1016,65 @@ mymain(void) QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST("disk-order", QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_VIRTIO_BLK_SCSI); - DO_TEST("disk-virtio-drive-queues", + DO_TEST("disk-virtio-queues", QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES); - DO_TEST("disk-drive-boot-disk", + DO_TEST("disk-boot-disk", QEMU_CAPS_DRIVE_BOOT); - DO_TEST("disk-drive-boot-cdrom", + DO_TEST("disk-boot-cdrom", QEMU_CAPS_DRIVE_BOOT); DO_TEST("floppy-drive-fat", QEMU_CAPS_DRIVE_BOOT); - DO_TEST("disk-drive-readonly-disk", NONE); - DO_TEST("disk-drive-readonly-no-device", NONE); - DO_TEST("disk-drive-fmt-qcow", + DO_TEST("disk-readonly-disk", NONE); + DO_TEST("disk-readonly-no-device", NONE); + DO_TEST("disk-fmt-qcow", QEMU_CAPS_DRIVE_BOOT); - DO_TEST_PARSE_ERROR("disk-drive-fmt-cow", QEMU_CAPS_DRIVE_BOOT); - DO_TEST_PARSE_ERROR("disk-drive-fmt-dir", QEMU_CAPS_DRIVE_BOOT); - DO_TEST_PARSE_ERROR("disk-drive-fmt-iso", QEMU_CAPS_DRIVE_BOOT); - DO_TEST("disk-drive-shared", NONE); - DO_TEST_PARSE_ERROR("disk-drive-shared-qcow", NONE); - DO_TEST("disk-drive-shared-locking", + DO_TEST_PARSE_ERROR("disk-fmt-cow", QEMU_CAPS_DRIVE_BOOT); + DO_TEST_PARSE_ERROR("disk-fmt-dir", QEMU_CAPS_DRIVE_BOOT); + DO_TEST_PARSE_ERROR("disk-fmt-iso", QEMU_CAPS_DRIVE_BOOT); + DO_TEST("disk-shared", NONE); + 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-drive-error-policy", NONE); - DO_TEST_CAPS_LATEST("disk-drive-error-policy"); - DO_TEST("disk-drive-cache-v2-wt", NONE); - DO_TEST("disk-drive-cache-v2-wb", NONE); - DO_TEST("disk-drive-cache-v2-none", NONE); - DO_TEST("disk-drive-cache-directsync", NONE); - DO_TEST("disk-drive-cache-unsafe", NONE); - DO_TEST_CAPS_VER("disk-drive-write-cache", "2.6.0"); - DO_TEST_CAPS_VER("disk-drive-write-cache", "2.7.0"); - DO_TEST_CAPS_LATEST("disk-drive-write-cache"); - DO_TEST("disk-drive-network-nbd", NONE); - DO_TEST("disk-drive-network-nbd-export", NONE); - DO_TEST("disk-drive-network-nbd-ipv6", NONE); - DO_TEST("disk-drive-network-nbd-ipv6-export", NONE); - DO_TEST("disk-drive-network-nbd-unix", NONE); - DO_TEST("disk-drive-network-iscsi", NONE); - DO_TEST("disk-drive-network-iscsi-auth", NONE); - DO_TEST_PARSE_ERROR("disk-drive-network-iscsi-auth-secrettype-invalid"= , NONE); - DO_TEST_PARSE_ERROR("disk-drive-network-iscsi-auth-wrong-secrettype", = NONE); - DO_TEST_PARSE_ERROR("disk-drive-network-source-auth-both", NONE); - DO_TEST("disk-drive-network-iscsi-lun", + DO_TEST("disk-error-policy", NONE); + DO_TEST_CAPS_LATEST("disk-error-policy"); + DO_TEST("disk-cache-v2-wt", NONE); + DO_TEST("disk-cache-v2-wb", NONE); + DO_TEST("disk-cache-v2-none", NONE); + DO_TEST("disk-cache-directsync", NONE); + DO_TEST("disk-cache-unsafe", NONE); + DO_TEST_CAPS_VER("disk-write-cache", "2.6.0"); + DO_TEST_CAPS_VER("disk-write-cache", "2.7.0"); + DO_TEST_CAPS_LATEST("disk-write-cache"); + DO_TEST("disk-network-nbd", NONE); + DO_TEST("disk-network-nbd-export", NONE); + DO_TEST("disk-network-nbd-ipv6", NONE); + DO_TEST("disk-network-nbd-ipv6-export", NONE); + DO_TEST("disk-network-nbd-unix", NONE); + DO_TEST("disk-network-iscsi", NONE); + DO_TEST("disk-network-iscsi-auth", NONE); + DO_TEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-invalid", NONE= ); + DO_TEST_PARSE_ERROR("disk-network-iscsi-auth-wrong-secrettype", NONE); + DO_TEST_PARSE_ERROR("disk-network-source-auth-both", NONE); + DO_TEST("disk-network-iscsi-lun", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_BLOCK); - DO_TEST("disk-drive-network-gluster", + DO_TEST("disk-network-gluster", QEMU_CAPS_GLUSTER_DEBUG_LEVEL); - DO_TEST("disk-drive-network-rbd", NONE); - DO_TEST("disk-drive-network-sheepdog", NONE); - DO_TEST("disk-drive-network-rbd-auth", NONE); - DO_TEST("disk-drive-network-source-auth", NONE); - DO_TEST("disk-drive-network-rbd-auth-AES", + DO_TEST("disk-network-rbd", NONE); + DO_TEST("disk-network-sheepdog", NONE); + DO_TEST("disk-network-rbd-auth", NONE); + DO_TEST("disk-network-source-auth", NONE); + DO_TEST("disk-network-rbd-auth-AES", QEMU_CAPS_OBJECT_SECRET, QEMU_CAPS_VIRTIO_SCSI); - DO_TEST("disk-drive-network-rbd-ipv6", NONE); - DO_TEST_FAILURE("disk-drive-network-rbd-no-colon", NONE); - DO_TEST("disk-drive-network-vxhs", QEMU_CAPS_VXHS); + DO_TEST("disk-network-rbd-ipv6", NONE); + DO_TEST_FAILURE("disk-network-rbd-no-colon", NONE); + DO_TEST("disk-network-vxhs", QEMU_CAPS_VXHS); driver.config->vxhsTLS =3D 1; - DO_TEST("disk-drive-network-tlsx509", QEMU_CAPS_VXHS, + DO_TEST("disk-network-tlsx509", QEMU_CAPS_VXHS, QEMU_CAPS_OBJECT_TLS_CREDS_X509, QEMU_CAPS_NBD_TLS); driver.config->vxhsTLS =3D 0; VIR_FREE(driver.config->vxhsTLSx509certdir); - DO_TEST("disk-drive-no-boot", + DO_TEST("disk-no-boot", QEMU_CAPS_BOOTINDEX); DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid", QEMU_CAPS_VIRTIO_SCSI); @@ -1129,16 +1129,16 @@ mymain(void) DO_TEST("disk-copy_on_read", QEMU_CAPS_VIRTIO_TX_ALG, QEMU_CAPS_VIRTIO_BLK_SCSI); - DO_TEST("disk-drive-discard", + DO_TEST("disk-discard", QEMU_CAPS_DRIVE_DISCARD); - DO_TEST("disk-drive-detect-zeroes", + DO_TEST("disk-detect-zeroes", QEMU_CAPS_DRIVE_DISCARD, QEMU_CAPS_DRIVE_DETECT_ZEROES); DO_TEST("disk-snapshot", NONE); DO_TEST_PARSE_ERROR("disk-same-targets", QEMU_CAPS_SCSI_LSI, QEMU_CAPS_DEVICE_USB_STORAGE); - DO_TEST_PARSE_ERROR("disk-drive-address-conflict", + DO_TEST_PARSE_ERROR("disk-address-conflict", QEMU_CAPS_ICH9_AHCI); DO_TEST_PARSE_ERROR("disk-hostdev-scsi-address-conflict", QEMU_CAPS_VIRTIO_SCSI, @@ -1927,7 +1927,7 @@ mymain(void) DO_TEST("mach-virt-console-virtio", NONE); DO_TEST_PARSE_ERROR("mach-virt-serial-invalid-machine", NONE); - DO_TEST("disk-ide-drive-split", + DO_TEST("disk-ide-split", QEMU_CAPS_IDE_CD); DO_TEST("disk-ide-wwn", QEMU_CAPS_IDE_CD, diff --git a/tests/qemuxml2xmloutdata/disk-drive-boot-cdrom.xml b/tests/qem= uxml2xmloutdata/disk-boot-cdrom.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-boot-cdrom.xml rename to tests/qemuxml2xmloutdata/disk-boot-cdrom.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-boot-disk.xml b/tests/qemu= xml2xmloutdata/disk-boot-disk.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-boot-disk.xml rename to tests/qemuxml2xmloutdata/disk-boot-disk.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-cache-directsync.xml b/tes= ts/qemuxml2xmloutdata/disk-cache-directsync.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-cache-directsync.xml rename to tests/qemuxml2xmloutdata/disk-cache-directsync.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-cache-unsafe.xml b/tests/q= emuxml2xmloutdata/disk-cache-unsafe.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-cache-unsafe.xml rename to tests/qemuxml2xmloutdata/disk-cache-unsafe.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-cache-v2-none.xml b/tests/= qemuxml2xmloutdata/disk-cache-v2-none.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-cache-v2-none.xml rename to tests/qemuxml2xmloutdata/disk-cache-v2-none.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-cache-v2-wb.xml b/tests/qe= muxml2xmloutdata/disk-cache-v2-wb.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-cache-v2-wb.xml rename to tests/qemuxml2xmloutdata/disk-cache-v2-wb.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-cache-v2-wt.xml b/tests/qe= muxml2xmloutdata/disk-cache-v2-wt.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-cache-v2-wt.xml rename to tests/qemuxml2xmloutdata/disk-cache-v2-wt.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml b/tests/q= emuxml2xmloutdata/disk-copy-on-read.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml rename to tests/qemuxml2xmloutdata/disk-copy-on-read.xml diff --git a/tests/qemuxml2xmloutdata/disk-detect-zeroes.xml b/tests/qemuxm= l2xmloutdata/disk-detect-zeroes.xml new file mode 120000 index 0000000000..17a520c4d4 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-detect-zeroes.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/disk-detect-zeroes.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/disk-drive-discard.xml b/tests/qemuxm= l2xmloutdata/disk-discard.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-discard.xml rename to tests/qemuxml2xmloutdata/disk-discard.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-detect-zeroes.xml b/tests/= qemuxml2xmloutdata/disk-drive-detect-zeroes.xml deleted file mode 120000 index 54af6627d6..0000000000 --- a/tests/qemuxml2xmloutdata/disk-drive-detect-zeroes.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/disk-drive-detect-zeroes.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/disk-drive-error-policy.xml b/tests/q= emuxml2xmloutdata/disk-error-policy.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-error-policy.xml rename to tests/qemuxml2xmloutdata/disk-error-policy.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-fat.xml b/tests/qemuxml2xm= loutdata/disk-fat.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-fat.xml rename to tests/qemuxml2xmloutdata/disk-fat.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-fmt-qcow.xml b/tests/qemux= ml2xmloutdata/disk-fmt-qcow.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-fmt-qcow.xml rename to tests/qemuxml2xmloutdata/disk-fmt-qcow.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-gluster.xml b/test= s/qemuxml2xmloutdata/disk-network-gluster.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-gluster.xml rename to tests/qemuxml2xmloutdata/disk-network-gluster.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-iscsi-auth.xml b/t= ests/qemuxml2xmloutdata/disk-network-iscsi-auth.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-iscsi-auth.xml rename to tests/qemuxml2xmloutdata/disk-network-iscsi-auth.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-iscsi.xml b/tests/= qemuxml2xmloutdata/disk-network-iscsi.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-iscsi.xml rename to tests/qemuxml2xmloutdata/disk-network-iscsi.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-nbd-export.xml b/t= ests/qemuxml2xmloutdata/disk-network-nbd-export.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-nbd-export.xml rename to tests/qemuxml2xmloutdata/disk-network-nbd-export.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6-export.xm= l b/tests/qemuxml2xmloutdata/disk-network-nbd-ipv6-export.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6-export.xml rename to tests/qemuxml2xmloutdata/disk-network-nbd-ipv6-export.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6.xml b/tes= ts/qemuxml2xmloutdata/disk-network-nbd-ipv6.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6.xml rename to tests/qemuxml2xmloutdata/disk-network-nbd-ipv6.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-nbd-unix.xml b/tes= ts/qemuxml2xmloutdata/disk-network-nbd-unix.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-nbd-unix.xml rename to tests/qemuxml2xmloutdata/disk-network-nbd-unix.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-nbd.xml b/tests/qe= muxml2xmloutdata/disk-network-nbd.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-nbd.xml rename to tests/qemuxml2xmloutdata/disk-network-nbd.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-rbd-auth.xml b/tes= ts/qemuxml2xmloutdata/disk-network-rbd-auth.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-rbd-auth.xml rename to tests/qemuxml2xmloutdata/disk-network-rbd-auth.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-rbd-ceph-env.xml b= /tests/qemuxml2xmloutdata/disk-network-rbd-ceph-env.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-rbd-ceph-env.xml rename to tests/qemuxml2xmloutdata/disk-network-rbd-ceph-env.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-rbd-ipv6.xml b/tes= ts/qemuxml2xmloutdata/disk-network-rbd-ipv6.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-rbd-ipv6.xml rename to tests/qemuxml2xmloutdata/disk-network-rbd-ipv6.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-rbd.xml b/tests/qe= muxml2xmloutdata/disk-network-rbd.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-rbd.xml rename to tests/qemuxml2xmloutdata/disk-network-rbd.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-sheepdog.xml b/tes= ts/qemuxml2xmloutdata/disk-network-sheepdog.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-sheepdog.xml rename to tests/qemuxml2xmloutdata/disk-network-sheepdog.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-source-auth.xml b/= tests/qemuxml2xmloutdata/disk-network-source-auth.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-source-auth.xml rename to tests/qemuxml2xmloutdata/disk-network-source-auth.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-tlsx509.xml b/test= s/qemuxml2xmloutdata/disk-network-tlsx509.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-tlsx509.xml rename to tests/qemuxml2xmloutdata/disk-network-tlsx509.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-vxhs.xml b/tests/q= emuxml2xmloutdata/disk-network-vxhs.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-vxhs.xml rename to tests/qemuxml2xmloutdata/disk-network-vxhs.xml diff --git a/tests/qemuxml2xmloutdata/disk-virtio-drive-queues.xml b/tests/= qemuxml2xmloutdata/disk-virtio-queues.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-virtio-drive-queues.xml rename to tests/qemuxml2xmloutdata/disk-virtio-queues.xml diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 5e4adc99ed..0373117f06 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -353,33 +353,33 @@ mymain(void) DO_TEST("disk-usb-device", NONE); DO_TEST("disk-virtio", NONE); DO_TEST("floppy-drive-fat", NONE); - DO_TEST("disk-virtio-drive-queues", QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES); - DO_TEST("disk-drive-boot-disk", NONE); - DO_TEST("disk-drive-boot-cdrom", NONE); - DO_TEST("disk-drive-error-policy", NONE); - DO_TEST("disk-drive-fmt-qcow", NONE); - DO_TEST("disk-drive-copy-on-read", NONE); - DO_TEST("disk-drive-cache-v2-wt", NONE); - DO_TEST("disk-drive-cache-v2-wb", NONE); - DO_TEST("disk-drive-cache-v2-none", NONE); - DO_TEST("disk-drive-cache-directsync", NONE); - DO_TEST("disk-drive-cache-unsafe", NONE); - DO_TEST("disk-drive-network-nbd", NONE); - DO_TEST("disk-drive-network-nbd-export", NONE); - DO_TEST("disk-drive-network-nbd-ipv6", NONE); - DO_TEST("disk-drive-network-nbd-ipv6-export", NONE); - DO_TEST("disk-drive-network-nbd-unix", NONE); - DO_TEST("disk-drive-network-iscsi", NONE); - DO_TEST("disk-drive-network-iscsi-auth", NONE); - DO_TEST("disk-drive-network-gluster", NONE); - DO_TEST("disk-drive-network-rbd", NONE); - DO_TEST("disk-drive-network-rbd-auth", NONE); - DO_TEST("disk-drive-network-rbd-ipv6", NONE); - DO_TEST("disk-drive-network-rbd-ceph-env", NONE); - DO_TEST("disk-drive-network-source-auth", NONE); - DO_TEST("disk-drive-network-sheepdog", NONE); - DO_TEST("disk-drive-network-vxhs", NONE); - DO_TEST("disk-drive-network-tlsx509", NONE); + DO_TEST("disk-virtio-queues", QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES); + DO_TEST("disk-boot-disk", NONE); + DO_TEST("disk-boot-cdrom", NONE); + DO_TEST("disk-error-policy", NONE); + DO_TEST("disk-fmt-qcow", NONE); + DO_TEST("disk-copy-on-read", NONE); + DO_TEST("disk-cache-v2-wt", NONE); + DO_TEST("disk-cache-v2-wb", NONE); + DO_TEST("disk-cache-v2-none", NONE); + DO_TEST("disk-cache-directsync", NONE); + DO_TEST("disk-cache-unsafe", NONE); + DO_TEST("disk-network-nbd", NONE); + DO_TEST("disk-network-nbd-export", NONE); + DO_TEST("disk-network-nbd-ipv6", NONE); + DO_TEST("disk-network-nbd-ipv6-export", NONE); + DO_TEST("disk-network-nbd-unix", NONE); + DO_TEST("disk-network-iscsi", NONE); + DO_TEST("disk-network-iscsi-auth", NONE); + DO_TEST("disk-network-gluster", NONE); + DO_TEST("disk-network-rbd", NONE); + DO_TEST("disk-network-rbd-auth", NONE); + DO_TEST("disk-network-rbd-ipv6", NONE); + DO_TEST("disk-network-rbd-ceph-env", NONE); + DO_TEST("disk-network-source-auth", NONE); + DO_TEST("disk-network-sheepdog", NONE); + DO_TEST("disk-network-vxhs", NONE); + DO_TEST("disk-network-tlsx509", NONE); DO_TEST("disk-scsi-device", QEMU_CAPS_SCSI_LSI); DO_TEST("disk-scsi-vscsi", NONE); @@ -572,8 +572,8 @@ mymain(void) DO_TEST("disk-source-pool", NONE); DO_TEST("disk-source-pool-mode", NONE); - DO_TEST("disk-drive-discard", NONE); - DO_TEST("disk-drive-detect-zeroes", NONE); + DO_TEST("disk-discard", NONE); + DO_TEST("disk-detect-zeroes", NONE); DO_TEST("disk-serial", NONE); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 1532015489044182.8338487783858; Thu, 19 Jul 2018 08:51:29 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4345C81DFF; Thu, 19 Jul 2018 15:51:27 +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 6B297BD214; Thu, 19 Jul 2018 15:51:26 +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 BA90518037F0; Thu, 19 Jul 2018 15:51:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpLLc028568 for ; Thu, 19 Jul 2018 11:51:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6C2751C5A6; Thu, 19 Jul 2018 15:51:21 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0DFBC1C5B0 for ; Thu, 19 Jul 2018 15:51:20 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:50:54 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 02/24] tests: qemuxml2xml: Remove duplicate test disk-copy-on-read.xml 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: , MIME-Version: 1.0 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.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 19 Jul 2018 15:51:28 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We also have disk-copy_on_read.xml which also tests the command line. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- tests/qemuxml2argvdata/disk-copy-on-read.xml | 30 --------------------- tests/qemuxml2xmloutdata/disk-copy-on-read.xml | 36 ----------------------= ---- tests/qemuxml2xmltest.c | 1 - 3 files changed, 67 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-copy-on-read.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-copy-on-read.xml diff --git a/tests/qemuxml2argvdata/disk-copy-on-read.xml b/tests/qemuxml2a= rgvdata/disk-copy-on-read.xml deleted file mode 100644 index 1177b642ad..0000000000 --- a/tests/qemuxml2argvdata/disk-copy-on-read.xml +++ /dev/null @@ -1,30 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - - - - diff --git a/tests/qemuxml2xmloutdata/disk-copy-on-read.xml b/tests/qemuxml= 2xmloutdata/disk-copy-on-read.xml deleted file mode 100644 index 69361a453a..0000000000 --- a/tests/qemuxml2xmloutdata/disk-copy-on-read.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 - - - - -
- - -
- - -
- - - - - -
- - - diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 0373117f06..6fcadab66b 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -358,7 +358,6 @@ mymain(void) DO_TEST("disk-boot-cdrom", NONE); DO_TEST("disk-error-policy", NONE); DO_TEST("disk-fmt-qcow", NONE); - DO_TEST("disk-copy-on-read", NONE); DO_TEST("disk-cache-v2-wt", NONE); DO_TEST("disk-cache-v2-wb", NONE); DO_TEST("disk-cache-v2-none", NONE); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 1532015517132657.5474968815788; Thu, 19 Jul 2018 08:51:57 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 62C764ACBC; Thu, 19 Jul 2018 15:51:53 +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 1B29519480; Thu, 19 Jul 2018 15:51:53 +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 904DB4A46E; Thu, 19 Jul 2018 15:51:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpMKg028573 for ; Thu, 19 Jul 2018 11:51:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 132CD1C5A6; Thu, 19 Jul 2018 15:51:22 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id A93001C5B0 for ; Thu, 19 Jul 2018 15:51:21 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:50:55 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 03/24] tests: qemuxml2argv: Add 'CAPS_LATEST' version of "disk-copy_on_read" 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: , MIME-Version: 1.0 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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 19 Jul 2018 15:51:55 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- .../disk-copy_on_read.x86_64-latest.args | 41 ++++++++++++++++++= ++++ tests/qemuxml2argvtest.c | 1 + 2 files changed, 42 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.= args diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args new file mode 100644 index 0000000000..f2b5dbe050 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args @@ -0,0 +1,41 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3Dtest,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-test/master-key.aes \ +-machine pc-0.13,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 1024 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 468404ad-d49c-40f2-9e14-02294f9c1be3 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server,nowait \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot menu=3Don,strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x6 \ +-drive file=3D/var/lib/libvirt/images/f14.img,format=3Dqcow2,if=3Dnone,\ +id=3Ddrive-virtio-disk0,copy-on-read=3Don \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-vir= tio-disk0,\ +id=3Dvirtio-disk0,bootindex=3D2 \ +-drive file=3D/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,format=3Draw,= if=3Dnone,\ +id=3Ddrive-ide0-1-0,readonly=3Don \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,tx=3Dbh,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:= e5:48:58,\ +bus=3Dpci.0,addr=3D0x2 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 2708a58d60..8f9dd53214 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1129,6 +1129,7 @@ mymain(void) DO_TEST("disk-copy_on_read", QEMU_CAPS_VIRTIO_TX_ALG, QEMU_CAPS_VIRTIO_BLK_SCSI); + DO_TEST_CAPS_LATEST("disk-copy_on_read"); DO_TEST("disk-discard", QEMU_CAPS_DRIVE_DISCARD); DO_TEST("disk-detect-zeroes", --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 1532015511695489.2260513494707; Thu, 19 Jul 2018 08:51:51 -0700 (PDT) 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 5DB18FECD; Thu, 19 Jul 2018 15:51:49 +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 1419960BE5; Thu, 19 Jul 2018 15:51:49 +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 A949F4BB78; Thu, 19 Jul 2018 15:51:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpMaH028589 for ; Thu, 19 Jul 2018 11:51:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id AEBB21C5A6; Thu, 19 Jul 2018 15:51:22 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5044A1C5B8 for ; Thu, 19 Jul 2018 15:51:22 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:50:56 +0200 Message-Id: <01b626480ee3871dbc76afb08b39b8aacdf279b7.1532015294.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 04/24] tests: qemuxml2argv: Remove tests obsoleted by assuming support for '-device' 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: , MIME-Version: 1.0 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.29]); Thu, 19 Jul 2018 15:51:50 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Few disk tests were testing support for pure -drive command line generation for disks now that we assume it for all qemu versions the cases are obsolete. Replacements: disk-readonly-no-device -> disk-readonly-disk disk-floppy-tray-no-device -> disk-floppy-tray disk-cdrom-tray-no-device -> disk-cdrom-tray Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- .../disk-cdrom-tray-no-device-cap.args | 29 ----------------- .../disk-cdrom-tray-no-device-cap.xml | 32 ------------------- .../disk-floppy-tray-no-device-cap.args | 31 ------------------ .../disk-floppy-tray-no-device-cap.xml | 37 ------------------= ---- .../qemuxml2argvdata/disk-readonly-no-device.args | 30 ------------------ tests/qemuxml2argvdata/disk-readonly-no-device.xml | 32 ------------------- tests/qemuxml2argvtest.c | 3 -- 7 files changed, 194 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.ar= gs delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.xml delete mode 100644 tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.a= rgs delete mode 100644 tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.x= ml delete mode 100644 tests/qemuxml2argvdata/disk-readonly-no-device.args delete mode 100644 tests/qemuxml2argvdata/disk-readonly-no-device.xml diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.args b/te= sts/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.args deleted file mode 100644 index b9bdb6443f..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.args +++ /dev/null @@ -1,29 +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 \ --boot c \ --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 \ --drive if=3Dnone,id=3Ddrive-ide0-1-0,media=3Dcdrom,readonly=3Don \ --device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-= 0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.xml b/tes= ts/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.xml deleted file mode 100644 index 77e64448f6..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.xml +++ /dev/null @@ -1,32 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - -
- - - - - -
- - - - - - diff --git a/tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.args b/t= ests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.args deleted file mode 100644 index a3c6881e98..0000000000 --- a/tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.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 \ --boot c \ --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 \ --drive file=3D/dev/fd0,format=3Draw,if=3Dnone,id=3Ddrive-fdc0-0-0 \ --global isa-fdc.driveA=3Ddrive-fdc0-0-0 \ --drive if=3Dnone,id=3Ddrive-fdc0-0-1 \ --global isa-fdc.driveB=3Ddrive-fdc0-0-1 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.xml b/te= sts/qemuxml2argvdata/disk-floppy-tray-no-device-cap.xml deleted file mode 100644 index 4b9bc1b6c9..0000000000 --- a/tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.xml +++ /dev/null @@ -1,37 +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-readonly-no-device.args b/tests/qe= muxml2argvdata/disk-readonly-no-device.args deleted file mode 100644 index 399a929f0b..0000000000 --- a/tests/qemuxml2argvdata/disk-readonly-no-device.args +++ /dev/null @@ -1,30 +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 \ --boot c \ --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 \ --drive file=3D/dev/sr0,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,media=3D= cdrom,\ -readonly=3Don \ --device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-= 0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/disk-readonly-no-device.xml b/tests/qem= uxml2argvdata/disk-readonly-no-device.xml deleted file mode 100644 index 137ab0a923..0000000000 --- a/tests/qemuxml2argvdata/disk-readonly-no-device.xml +++ /dev/null @@ -1,32 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - -
- - - - - -
- - - - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8f9dd53214..4bf826177f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -998,11 +998,9 @@ mymain(void) DO_TEST("disk-cdrom-empty", NONE); DO_TEST("disk-cdrom-tray", QEMU_CAPS_VIRTIO_TX_ALG); - DO_TEST("disk-cdrom-tray-no-device-cap", NONE); DO_TEST("disk-floppy", NONE); DO_TEST_FAILURE("disk-floppy-pseries", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); - DO_TEST("disk-floppy-tray-no-device-cap", NONE); DO_TEST("disk-floppy-tray", NONE); DO_TEST("disk-virtio-s390", QEMU_CAPS_VIRTIO_S390); @@ -1025,7 +1023,6 @@ mymain(void) DO_TEST("floppy-drive-fat", QEMU_CAPS_DRIVE_BOOT); DO_TEST("disk-readonly-disk", NONE); - DO_TEST("disk-readonly-no-device", NONE); DO_TEST("disk-fmt-qcow", QEMU_CAPS_DRIVE_BOOT); DO_TEST_PARSE_ERROR("disk-fmt-cow", QEMU_CAPS_DRIVE_BOOT); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 1532015514786572.9076026124346; Thu, 19 Jul 2018 08:51:54 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6D3FA3082A4D; Thu, 19 Jul 2018 15:51:53 +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 2BF132010CDB; Thu, 19 Jul 2018 15:51:53 +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 851C94A463; Thu, 19 Jul 2018 15:51:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpNeA028599 for ; Thu, 19 Jul 2018 11:51:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 570D51C5A6; Thu, 19 Jul 2018 15:51:23 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id EBBB61C5B0 for ; Thu, 19 Jul 2018 15:51:22 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:50:57 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 05/24] tests: qemuxml2argv: Unify network cdrom source testing 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: , MIME-Version: 1.0 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.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Thu, 19 Jul 2018 15:51:54 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Unify most of the tests into a common test named disk-cdrom-network by adding multiple cdroms. The 'http' test is dropped since there can be only 4 cdroms. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- tests/qemuxml2argvdata/disk-cdrom-network-ftp.args | 27 ---------------- tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml | 36 ------------------= ---- .../qemuxml2argvdata/disk-cdrom-network-ftps.args | 27 ---------------- tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml | 36 ------------------= ---- .../qemuxml2argvdata/disk-cdrom-network-http.args | 27 ---------------- tests/qemuxml2argvdata/disk-cdrom-network-http.xml | 36 ------------------= ---- .../qemuxml2argvdata/disk-cdrom-network-tftp.args | 27 ---------------- tests/qemuxml2argvdata/disk-cdrom-network-tftp.xml | 36 ------------------= ---- ...-network-https.args =3D> disk-cdrom-network.args} | 9 ++++++ ...om-network-https.xml =3D> disk-cdrom-network.xml} | 27 ++++++++++++++++ tests/qemuxml2argvtest.c | 6 +--- 11 files changed, 37 insertions(+), 257 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftp.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftps.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-http.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-http.xml delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-tftp.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-tftp.xml rename tests/qemuxml2argvdata/{disk-cdrom-network-https.args =3D> disk-cdr= om-network.args} (58%) rename tests/qemuxml2argvdata/{disk-cdrom-network-https.xml =3D> disk-cdro= m-network.xml} (52%) diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-ftp.args b/tests/qem= uxml2argvdata/disk-cdrom-network-ftp.args deleted file mode 100644 index e9eab22aaf..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-network-ftp.args +++ /dev/null @@ -1,27 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/home/test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-x86_64 \ --name QEMUGuest1 \ --S \ --machine pc-1.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --m 1024 \ --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 \ --boot d \ --usb \ --drive file=3Dftp://host.name:21/url/path/file.iso,format=3Draw,if=3Dnone,\ -id=3Ddrive-ide0-1-0,media=3Dcdrom,readonly=3Don \ --device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-= 0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml b/tests/qemu= xml2argvdata/disk-cdrom-network-ftp.xml deleted file mode 100644 index b4e3311606..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml +++ /dev/null @@ -1,36 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 1048576 - 1048576 - 1 - - hvm - - - - - - - - - destroy - restart - restart - - /usr/bin/qemu-system-x86_64 - - - - - - - -
- - - - - - - diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-ftps.args b/tests/qe= muxml2argvdata/disk-cdrom-network-ftps.args deleted file mode 100644 index d334f7938f..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-network-ftps.args +++ /dev/null @@ -1,27 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/home/test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-x86_64 \ --name QEMUGuest1 \ --S \ --machine pc-1.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --m 1024 \ --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 \ --boot d \ --usb \ --drive file=3Dftps://host.name:990/url/path/file.iso,format=3Draw,if=3Dnon= e,\ -id=3Ddrive-ide0-1-0,media=3Dcdrom,readonly=3Don \ --device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-= 0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml b/tests/qem= uxml2argvdata/disk-cdrom-network-ftps.xml deleted file mode 100644 index 4e6ca1bad1..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml +++ /dev/null @@ -1,36 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 1048576 - 1048576 - 1 - - hvm - - - - - - - - - destroy - restart - restart - - /usr/bin/qemu-system-x86_64 - - - - - - - -
- - - - - - - diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-http.args b/tests/qe= muxml2argvdata/disk-cdrom-network-http.args deleted file mode 100644 index cca0c6c3be..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-network-http.args +++ /dev/null @@ -1,27 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/home/test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-x86_64 \ --name QEMUGuest1 \ --S \ --machine pc-1.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --m 1024 \ --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 \ --boot d \ --usb \ --drive file=3Dhttp://host.name:80/url/path/file.iso,format=3Draw,if=3Dnone= ,\ -id=3Ddrive-ide0-1-0,media=3Dcdrom,readonly=3Don \ --device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-= 0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-http.xml b/tests/qem= uxml2argvdata/disk-cdrom-network-http.xml deleted file mode 100644 index 0eed65672b..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-network-http.xml +++ /dev/null @@ -1,36 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 1048576 - 1048576 - 1 - - hvm - - - - - - - - - destroy - restart - restart - - /usr/bin/qemu-system-x86_64 - - - - - - - -
- - - - - - - diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-tftp.args b/tests/qe= muxml2argvdata/disk-cdrom-network-tftp.args deleted file mode 100644 index 8882c2c915..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-network-tftp.args +++ /dev/null @@ -1,27 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/home/test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-x86_64 \ --name QEMUGuest1 \ --S \ --machine pc-1.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --m 1024 \ --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 \ --boot d \ --usb \ --drive file=3Dtftp://host.name:69/url/path/file.iso,format=3Draw,if=3Dnone= ,\ -id=3Ddrive-ide0-1-0,media=3Dcdrom,readonly=3Don \ --device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-= 0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-tftp.xml b/tests/qem= uxml2argvdata/disk-cdrom-network-tftp.xml deleted file mode 100644 index 1c3b185b00..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-network-tftp.xml +++ /dev/null @@ -1,36 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 1048576 - 1048576 - 1 - - hvm - - - - - - - - - destroy - restart - restart - - /usr/bin/qemu-system-x86_64 - - - - - - - -
- - - - - - - diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-https.args b/tests/q= emuxml2argvdata/disk-cdrom-network.args similarity index 58% rename from tests/qemuxml2argvdata/disk-cdrom-network-https.args rename to tests/qemuxml2argvdata/disk-cdrom-network.args index b62186270f..6dee39e3fd 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network-https.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.args @@ -21,7 +21,16 @@ server,nowait \ -no-shutdown \ -boot d \ -usb \ +-drive file=3Dftp://host.name:21/url/path/file.iso,format=3Draw,if=3Dnone,\ +id=3Ddrive-ide0-0-0,media=3Dcdrom,readonly=3Don \ +-device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ +-drive file=3Dftps://host.name:990/url/path/file.iso,format=3Draw,if=3Dnon= e,\ +id=3Ddrive-ide0-0-1,media=3Dcdrom,readonly=3Don \ +-device ide-drive,bus=3Dide.0,unit=3D1,drive=3Ddrive-ide0-0-1,id=3Dide0-0-= 1 \ -drive file=3Dhttps://host.name:443/url/path/file.iso,format=3Draw,if=3Dno= ne,\ id=3Ddrive-ide0-1-0,media=3Dcdrom,readonly=3Don \ -device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-= 0 \ +-drive file=3Dtftp://host.name:69/url/path/file.iso,format=3Draw,if=3Dnone= ,\ +id=3Ddrive-ide0-1-1,media=3Dcdrom,readonly=3Don \ +-device ide-drive,bus=3Dide.1,unit=3D1,drive=3Ddrive-ide0-1-1,id=3Dide0-1-= 1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-https.xml b/tests/qe= muxml2argvdata/disk-cdrom-network.xml similarity index 52% rename from tests/qemuxml2argvdata/disk-cdrom-network-https.xml rename to tests/qemuxml2argvdata/disk-cdrom-network.xml index cd92fe44a8..0bdc0e1883 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network-https.xml +++ b/tests/qemuxml2argvdata/disk-cdrom-network.xml @@ -19,6 +19,24 @@ restart /usr/bin/qemu-system-x86_64 + + + + + + + +
+ + + + + + + + +
+ @@ -28,6 +46,15 @@
+ + + + + + + +
+ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 4bf826177f..44b6245747 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -990,11 +990,7 @@ mymain(void) DO_TEST("nosharepages", QEMU_CAPS_MEM_MERGE); DO_TEST("disk-cdrom", NONE); DO_TEST("disk-iscsi", NONE); - DO_TEST("disk-cdrom-network-http", QEMU_CAPS_KVM); - DO_TEST("disk-cdrom-network-https", QEMU_CAPS_KVM); - DO_TEST("disk-cdrom-network-ftp", QEMU_CAPS_KVM); - DO_TEST("disk-cdrom-network-ftps", QEMU_CAPS_KVM); - DO_TEST("disk-cdrom-network-tftp", QEMU_CAPS_KVM); + DO_TEST("disk-cdrom-network", QEMU_CAPS_KVM); DO_TEST("disk-cdrom-empty", NONE); DO_TEST("disk-cdrom-tray", QEMU_CAPS_VIRTIO_TX_ALG); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 1532015523953526.5169478522283; Thu, 19 Jul 2018 08:52:03 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id B5FF23680B; Thu, 19 Jul 2018 15:52:00 +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 6AD8D19485; Thu, 19 Jul 2018 15:52:00 +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 D45323F8F1; Thu, 19 Jul 2018 15:51:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpOHQ028604 for ; Thu, 19 Jul 2018 11:51:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id F23EF1C5A6; Thu, 19 Jul 2018 15:51:23 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 93D411C5B0 for ; Thu, 19 Jul 2018 15:51:23 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:50:58 +0200 Message-Id: <1c58f593f5e4a46867ed331639e0558c640c71d6.1532015294.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 06/24] tests: qemuxml2argv: Unify testing of local cdroms 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: , MIME-Version: 1.0 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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 19 Jul 2018 15:52:03 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Test empty cdroms along with cdroms with medium. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- tests/qemuxml2argvdata/disk-cdrom-empty.args | 28 ------------------- tests/qemuxml2argvdata/disk-cdrom-empty.xml | 36 ------------------------ tests/qemuxml2argvdata/disk-cdrom.args | 4 ++- tests/qemuxml2argvdata/disk-cdrom.xml | 6 ++++ tests/qemuxml2argvtest.c | 1 - tests/qemuxml2xmloutdata/disk-cdrom-empty.xml | 40 -----------------------= ---- tests/qemuxml2xmloutdata/disk-cdrom.xml | 6 ++++ tests/qemuxml2xmltest.c | 1 - 8 files changed, 15 insertions(+), 107 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-empty.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-empty.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-cdrom-empty.xml diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty.args b/tests/qemuxml2a= rgvdata/disk-cdrom-empty.args deleted file mode 100644 index 1cbc76ab86..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-empty.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 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 \ --boot c \ --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 \ --drive if=3Dnone,id=3Ddrive-ide0-1-0,media=3Dcdrom,readonly=3Don \ --device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0 diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty.xml b/tests/qemuxml2ar= gvdata/disk-cdrom-empty.xml deleted file mode 100644 index 7de5a6ebf5..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-empty.xml +++ /dev/null @@ -1,36 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - -
- - - - - - - - - diff --git a/tests/qemuxml2argvdata/disk-cdrom.args b/tests/qemuxml2argvdat= a/disk-cdrom.args index 55a76f6dac..2bef3bd71e 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.args +++ b/tests/qemuxml2argvdata/disk-cdrom.args @@ -26,4 +26,6 @@ server,nowait \ -device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ -drive file=3D/root/boot.iso,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,me= dia=3Dcdrom,\ readonly=3Don \ --device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0 +-device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-= 0 \ +-drive if=3Dnone,id=3Ddrive-ide0-1-1,media=3Dcdrom,readonly=3Don \ +-device ide-drive,bus=3Dide.1,unit=3D1,drive=3Ddrive-ide0-1-1,id=3Dide0-1-1 diff --git a/tests/qemuxml2argvdata/disk-cdrom.xml b/tests/qemuxml2argvdata= /disk-cdrom.xml index 341025c477..be229657f7 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.xml +++ b/tests/qemuxml2argvdata/disk-cdrom.xml @@ -27,6 +27,12 @@
+ + + + +
+ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 44b6245747..0eac624ebf 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -991,7 +991,6 @@ mymain(void) DO_TEST("disk-cdrom", NONE); DO_TEST("disk-iscsi", NONE); DO_TEST("disk-cdrom-network", QEMU_CAPS_KVM); - DO_TEST("disk-cdrom-empty", NONE); DO_TEST("disk-cdrom-tray", QEMU_CAPS_VIRTIO_TX_ALG); DO_TEST("disk-floppy", NONE); diff --git a/tests/qemuxml2xmloutdata/disk-cdrom-empty.xml b/tests/qemuxml2= xmloutdata/disk-cdrom-empty.xml deleted file mode 100644 index 26ce476557..0000000000 --- a/tests/qemuxml2xmloutdata/disk-cdrom-empty.xml +++ /dev/null @@ -1,40 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - -
- - -
- - -
- - - - - - - diff --git a/tests/qemuxml2xmloutdata/disk-cdrom.xml b/tests/qemuxml2xmlout= data/disk-cdrom.xml index 163ce88f19..e96c94097a 100644 --- a/tests/qemuxml2xmloutdata/disk-cdrom.xml +++ b/tests/qemuxml2xmloutdata/disk-cdrom.xml @@ -27,6 +27,12 @@
+ + + + +
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 6fcadab66b..904b86571f 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -347,7 +347,6 @@ mymain(void) DO_TEST("qemu-ns-no-env", NONE); DO_TEST("disk-aio", NONE); DO_TEST("disk-cdrom", NONE); - DO_TEST("disk-cdrom-empty", NONE); DO_TEST("disk-floppy", NONE); DO_TEST("disk-many", NONE); DO_TEST("disk-usb-device", NONE); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 15320155293401003.0990818963095; Thu, 19 Jul 2018 08:52:09 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F023F3078AAE; Thu, 19 Jul 2018 15:52: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 AD36F60172; Thu, 19 Jul 2018 15:52: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 4F6B518037F4; Thu, 19 Jul 2018 15:52:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpO0p028612 for ; Thu, 19 Jul 2018 11:51:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 994221C5A6; Thu, 19 Jul 2018 15:51:24 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3AD791C5B0 for ; Thu, 19 Jul 2018 15:51:24 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:50:59 +0200 Message-Id: <1d2fb325c6cb015ef55cc29f7d0b9be123004a87.1532015294.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 07/24] tests: qemuxml2argv: Add 'CAPS_LATEST' data for disk-cdrom* 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: , MIME-Version: 1.0 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Thu, 19 Jul 2018 15:52:08 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- .../disk-cdrom-network.x86_64-latest.args | 41 ++++++++++++++++++= ++++ .../disk-cdrom-tray.x86_64-latest.args | 39 ++++++++++++++++++= ++ .../qemuxml2argvdata/disk-cdrom.x86_64-latest.args | 35 ++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 4 files changed, 118 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest= .args create mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.ar= gs create mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args new file mode 100644 index 0000000000..0ce8497840 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args @@ -0,0 +1,41 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-x86_64 \ +-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-1.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-m 1024 \ +-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,fd=3D1729,server,nowait \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-drive file=3Dftp://host.name:21/url/path/file.iso,format=3Draw,if=3Dnone,\ +id=3Ddrive-ide0-0-0,readonly=3Don \ +-device ide-cd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-drive file=3Dftps://host.name:990/url/path/file.iso,format=3Draw,if=3Dnon= e,\ +id=3Ddrive-ide0-0-1,readonly=3Don \ +-device ide-cd,bus=3Dide.0,unit=3D1,drive=3Ddrive-ide0-0-1,id=3Dide0-0-1 \ +-drive file=3Dhttps://host.name:443/url/path/file.iso,format=3Draw,if=3Dno= ne,\ +id=3Ddrive-ide0-1-0,readonly=3Don \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0 \ +-drive file=3Dtftp://host.name:69/url/path/file.iso,format=3Draw,if=3Dnone= ,\ +id=3Ddrive-ide0-1-1,readonly=3Don \ +-device ide-cd,bus=3Dide.1,unit=3D1,drive=3Ddrive-ide0-1-1,id=3Dide0-1-1 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args b/te= sts/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args new file mode 100644 index 0000000000..79863e456d --- /dev/null +++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args @@ -0,0 +1,39 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3Dtest,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-test/master-key.aes \ +-machine pc-0.13,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 1024 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 3fa02811-7832-34bd-004d-1ff56a9286ff \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server,nowait \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot menu=3Don,strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-drive file=3D/var/lib/libvirt/images/f14.img,format=3Dqcow2,if=3Dnone,\ +id=3Ddrive-virtio-disk0 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-vir= tio-disk0,\ +id=3Dvirtio-disk0,bootindex=3D2 \ +-drive file=3D/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,format=3Draw,= if=3Dnone,\ +id=3Ddrive-ide0-1-0,readonly=3Don \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-drive if=3Dnone,id=3Ddrive-ide0-1-1,readonly=3Don \ +-device ide-cd,bus=3Dide.1,unit=3D1,drive=3Ddrive-ide0-1-1,id=3Dide0-1-1 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args b/tests/q= emuxml2argvdata/disk-cdrom.x86_64-latest.args new file mode 100644 index 0000000000..4c5a599820 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-i686 \ +-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 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,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 \ +-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/root/boot.iso,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,re= adonly=3Don \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0 \ +-drive if=3Dnone,id=3Ddrive-ide0-1-1,readonly=3Don \ +-device ide-cd,bus=3Dide.1,unit=3D1,drive=3Ddrive-ide0-1-1,id=3Dide0-1-1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0eac624ebf..6a190461e7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -989,10 +989,13 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI); DO_TEST("nosharepages", QEMU_CAPS_MEM_MERGE); DO_TEST("disk-cdrom", NONE); + DO_TEST_CAPS_LATEST("disk-cdrom"); DO_TEST("disk-iscsi", NONE); DO_TEST("disk-cdrom-network", QEMU_CAPS_KVM); + DO_TEST_CAPS_LATEST("disk-cdrom-network"); DO_TEST("disk-cdrom-tray", QEMU_CAPS_VIRTIO_TX_ALG); + DO_TEST_CAPS_LATEST("disk-cdrom-tray"); DO_TEST("disk-floppy", NONE); DO_TEST_FAILURE("disk-floppy-pseries", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 1532015522966114.88482259323928; Thu, 19 Jul 2018 08:52:02 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AEF78821C3; Thu, 19 Jul 2018 15:52:00 +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 5DAE05D750; Thu, 19 Jul 2018 15:52:00 +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 BCE873FA54; Thu, 19 Jul 2018 15:51:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpPDv028620 for ; Thu, 19 Jul 2018 11:51:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 412D41C5A6; Thu, 19 Jul 2018 15:51:25 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id D68761C5B8 for ; Thu, 19 Jul 2018 15:51:24 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:51:00 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 08/24] tests: qemuxml2argv: Add 'CAPS_LATEST' version for 'disk-detect-zeroes' 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: , MIME-Version: 1.0 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 19 Jul 2018 15:52:01 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This test also excercises options of 'discard'. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- .../disk-detect-zeroes.x86_64-latest.args | 37 ++++++++++++++++++= ++++ tests/qemuxml2argvtest.c | 1 + 2 files changed, 38 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest= .args diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args new file mode 100644 index 0000000000..101c0f2e65 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args @@ -0,0 +1,37 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3Dtest,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-test/master-key.aes \ +-machine pc-0.13,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 1024 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 92d7a226-cfae-425b-a6d3-00bbf9ec5c9e \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server,nowait \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot menu=3Don,strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-drive file=3D/var/lib/libvirt/images/f14.img,format=3Dqcow2,if=3Dnone,\ +id=3Ddrive-virtio-disk0,discard=3Dunmap,detect-zeroes=3Dunmap \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-vir= tio-disk0,\ +id=3Dvirtio-disk0,bootindex=3D2 \ +-drive file=3D/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,format=3Draw,= if=3Dnone,\ +id=3Ddrive-ide0-1-0,readonly=3Don,discard=3Dignore,detect-zeroes=3Don \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6a190461e7..518ea63ecf 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1130,6 +1130,7 @@ mymain(void) DO_TEST("disk-detect-zeroes", QEMU_CAPS_DRIVE_DISCARD, QEMU_CAPS_DRIVE_DETECT_ZEROES); + DO_TEST_CAPS_LATEST("disk-detect-zeroes"); DO_TEST("disk-snapshot", NONE); DO_TEST_PARSE_ERROR("disk-same-targets", QEMU_CAPS_SCSI_LSI, --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 1532015529382771.4695380031276; Thu, 19 Jul 2018 08:52:09 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 31057356EE; Thu, 19 Jul 2018 15:52:07 +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 C8D2F608E0; Thu, 19 Jul 2018 15:52: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 6C66518037F9; Thu, 19 Jul 2018 15:52:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpPHO028625 for ; Thu, 19 Jul 2018 11:51:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id DC65F1C5A6; Thu, 19 Jul 2018 15:51:25 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D7E61C5B0 for ; Thu, 19 Jul 2018 15:51:25 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:51:01 +0200 Message-Id: <68aae8a56bfe9aca2a279f3227e951aca93a9dcd.1532015294.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 09/24] tests: qemuxml2argv: Add 'CAPS_LATEST' version of 'disk-aio' test 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: , MIME-Version: 1.0 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 19 Jul 2018 15:52:08 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- tests/qemuxml2argvdata/disk-aio.x86_64-latest.args | 37 ++++++++++++++++++= ++++ tests/qemuxml2argvtest.c | 1 + 2 files changed, 38 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args b/tests/qem= uxml2argvdata/disk-aio.x86_64-latest.args new file mode 100644 index 0000000000..3894ed2502 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args @@ -0,0 +1,37 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-i686 \ +-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 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,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 \ +-drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-0,\ +cache=3Dnone,aio=3Dnative \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1,\ +write-cache=3Don \ +-drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-1-0,\ +readonly=3Don,aio=3Dthreads \ +-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 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 518ea63ecf..09b9e206cc 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1115,6 +1115,7 @@ mymain(void) DO_TEST("disk-sata-device", QEMU_CAPS_ICH9_AHCI); DO_TEST("disk-aio", NONE); + DO_TEST_CAPS_LATEST("disk-aio"); DO_TEST("disk-source-pool", NONE); DO_TEST("disk-source-pool-mode", NONE); DO_TEST("disk-ioeventfd", --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 1532015520123238.9949241444856; Thu, 19 Jul 2018 08:52:00 -0700 (PDT) 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 C9B585C7; Thu, 19 Jul 2018 15:51:57 +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 6F7B55C1A1; Thu, 19 Jul 2018 15:51:57 +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 0178318037F4; Thu, 19 Jul 2018 15:51:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpQMd028635 for ; Thu, 19 Jul 2018 11:51:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 836C71C5A6; Thu, 19 Jul 2018 15:51:26 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2514F1C5B0 for ; Thu, 19 Jul 2018 15:51:26 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:51:02 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 10/24] tests: qemuxml2argv: Rename disk-write-cache test do disk-cache 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: , MIME-Version: 1.0 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.30]); Thu, 19 Jul 2018 15:51:59 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We'll agregate testing of all cache modes in this test later on. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- ...k-write-cache.x86_64-2.6.0.args =3D> disk-cache.x86_64-2.6.0.args} | 0 ...k-write-cache.x86_64-2.7.0.args =3D> disk-cache.x86_64-2.7.0.args} | 0 ...write-cache.x86_64-latest.args =3D> disk-cache.x86_64-latest.args} | 0 tests/qemuxml2argvdata/{disk-write-cache.xml =3D> disk-cache.xml} | 0 tests/qemuxml2argvtest.c | 6 ++= +--- 5 files changed, 3 insertions(+), 3 deletions(-) rename tests/qemuxml2argvdata/{disk-write-cache.x86_64-2.6.0.args =3D> dis= k-cache.x86_64-2.6.0.args} (100%) rename tests/qemuxml2argvdata/{disk-write-cache.x86_64-2.7.0.args =3D> dis= k-cache.x86_64-2.7.0.args} (100%) rename tests/qemuxml2argvdata/{disk-write-cache.x86_64-latest.args =3D> di= sk-cache.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{disk-write-cache.xml =3D> disk-cache.xml} (= 100%) diff --git a/tests/qemuxml2argvdata/disk-write-cache.x86_64-2.6.0.args b/te= sts/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args similarity index 100% rename from tests/qemuxml2argvdata/disk-write-cache.x86_64-2.6.0.args rename to tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args diff --git a/tests/qemuxml2argvdata/disk-write-cache.x86_64-2.7.0.args b/te= sts/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args similarity index 100% rename from tests/qemuxml2argvdata/disk-write-cache.x86_64-2.7.0.args rename to tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args diff --git a/tests/qemuxml2argvdata/disk-write-cache.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-cache.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-write-cache.x86_64-latest.args rename to tests/qemuxml2argvdata/disk-cache.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-write-cache.xml b/tests/qemuxml2ar= gvdata/disk-cache.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-write-cache.xml rename to tests/qemuxml2argvdata/disk-cache.xml diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 09b9e206cc..6f6b5869b3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1037,9 +1037,9 @@ mymain(void) DO_TEST("disk-cache-v2-none", NONE); DO_TEST("disk-cache-directsync", NONE); DO_TEST("disk-cache-unsafe", NONE); - DO_TEST_CAPS_VER("disk-write-cache", "2.6.0"); - DO_TEST_CAPS_VER("disk-write-cache", "2.7.0"); - DO_TEST_CAPS_LATEST("disk-write-cache"); + DO_TEST_CAPS_VER("disk-cache", "2.6.0"); + DO_TEST_CAPS_VER("disk-cache", "2.7.0"); + DO_TEST_CAPS_LATEST("disk-cache"); DO_TEST("disk-network-nbd", NONE); DO_TEST("disk-network-nbd-export", NONE); DO_TEST("disk-network-nbd-ipv6", NONE); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 1532015536144460.2527284408973; Thu, 19 Jul 2018 08:52:16 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B2D3E5BEB8; Thu, 19 Jul 2018 15:52:14 +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 64833C4324; Thu, 19 Jul 2018 15:52:14 +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 E60113F67F; Thu, 19 Jul 2018 15:52:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpR9n028645 for ; Thu, 19 Jul 2018 11:51:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2A78F1C5A6; Thu, 19 Jul 2018 15:51:27 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id C06B61C5B0 for ; Thu, 19 Jul 2018 15:51:26 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:51:03 +0200 Message-Id: <484c3b75bdb1b0d57a52b1773b33ef51550f0afc.1532015294.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 11/24] tests: qemu: Add xml2xml and minimal version of 'disk-cache' test 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: , MIME-Version: 1.0 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.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 19 Jul 2018 15:52:15 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- tests/qemuxml2argvdata/disk-cache.args | 38 +++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/disk-cache.xml | 54 +++++++++++++++++++++++++++++= ++++ tests/qemuxml2xmltest.c | 1 + 4 files changed, 94 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-cache.args create mode 100644 tests/qemuxml2xmloutdata/disk-cache.xml diff --git a/tests/qemuxml2argvdata/disk-cache.args b/tests/qemuxml2argvdat= a/disk-cache.args new file mode 100644 index 0000000000..ee2f79a99f --- /dev/null +++ b/tests/qemuxml2argvdata/disk-cache.args @@ -0,0 +1,38 @@ +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-i440fx-2.6,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 \ +-boot c \ +-device lsi,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ +-usb \ +-drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-0,\ +cache=3Dwriteback \ +-device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ +-drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-s= csi0-0-0,\ +cache=3Dnone \ +-device scsi-disk,bus=3Dscsi0.0,scsi-id=3D0,drive=3Ddrive-scsi0-0-0,id=3Ds= csi0-0-0 \ +-drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-v= irtio-disk0,\ +cache=3Dwritethrough \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-virtio-disk0,\ +id=3Dvirtio-disk0 \ +-drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-u= sb-disk1,\ +cache=3Ddirectsync \ +-device usb-storage,bus=3Dusb.0,port=3D1,drive=3Ddrive-usb-disk1,id=3Dusb-= disk1 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6f6b5869b3..d3c2101abd 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1037,6 +1037,7 @@ mymain(void) DO_TEST("disk-cache-v2-none", NONE); DO_TEST("disk-cache-directsync", NONE); DO_TEST("disk-cache-unsafe", NONE); + DO_TEST("disk-cache", QEMU_CAPS_SCSI_LSI, QEMU_CAPS_DEVICE_USB_STORAGE= ); DO_TEST_CAPS_VER("disk-cache", "2.6.0"); DO_TEST_CAPS_VER("disk-cache", "2.7.0"); DO_TEST_CAPS_LATEST("disk-cache"); diff --git a/tests/qemuxml2xmloutdata/disk-cache.xml b/tests/qemuxml2xmlout= data/disk-cache.xml new file mode 100644 index 0000000000..4c2a196ac0 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-cache.xml @@ -0,0 +1,54 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-i686 + + + + +
+ + + + + +
+ + + + + +
+ + + + + + + +
+ + +
+ + + +
+ + + + + + diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 904b86571f..a3480cd5d1 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -362,6 +362,7 @@ mymain(void) DO_TEST("disk-cache-v2-none", NONE); DO_TEST("disk-cache-directsync", NONE); DO_TEST("disk-cache-unsafe", NONE); + DO_TEST("disk-cache", QEMU_CAPS_SCSI_LSI); DO_TEST("disk-network-nbd", NONE); DO_TEST("disk-network-nbd-export", NONE); DO_TEST("disk-network-nbd-ipv6", NONE); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 1532015542073716.2259769028994; Thu, 19 Jul 2018 08:52:22 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 91C29307D869; Thu, 19 Jul 2018 15:52:20 +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 28C4360851; Thu, 19 Jul 2018 15:52:20 +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 A624A264D3; Thu, 19 Jul 2018 15:52:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpRe5028655 for ; Thu, 19 Jul 2018 11:51:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id C6B411C5A6; Thu, 19 Jul 2018 15:51:27 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 67D411C5B8 for ; Thu, 19 Jul 2018 15:51:27 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:51:04 +0200 Message-Id: <4d918c1942b7f4e8838ef66596d892e4cdcb2170.1532015294.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 12/24] tests: qemu: Unify disk cache testing 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: , MIME-Version: 1.0 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Thu, 19 Jul 2018 15:52:21 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Move the 'unsafe' cache test into 'disk-cache' and remove all the individual cases for one cache mode each. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- tests/qemuxml2argvdata/disk-cache-directsync.args | 30 ---------------- tests/qemuxml2argvdata/disk-cache-directsync.xml | 37 ------------------- tests/qemuxml2argvdata/disk-cache-unsafe.args | 30 ---------------- tests/qemuxml2argvdata/disk-cache-unsafe.xml | 37 ------------------- tests/qemuxml2argvdata/disk-cache-v2-none.args | 30 ---------------- tests/qemuxml2argvdata/disk-cache-v2-none.xml | 37 ------------------- tests/qemuxml2argvdata/disk-cache-v2-wb.args | 30 ---------------- tests/qemuxml2argvdata/disk-cache-v2-wb.xml | 37 ------------------- tests/qemuxml2argvdata/disk-cache-v2-wt.args | 30 ---------------- tests/qemuxml2argvdata/disk-cache-v2-wt.xml | 37 ------------------- tests/qemuxml2argvdata/disk-cache.args | 3 ++ .../qemuxml2argvdata/disk-cache.x86_64-2.6.0.args | 3 ++ .../qemuxml2argvdata/disk-cache.x86_64-2.7.0.args | 4 +++ .../qemuxml2argvdata/disk-cache.x86_64-latest.args | 4 +++ tests/qemuxml2argvdata/disk-cache.xml | 6 ++++ tests/qemuxml2argvtest.c | 5 --- tests/qemuxml2xmloutdata/disk-cache-directsync.xml | 41 ------------------= ---- tests/qemuxml2xmloutdata/disk-cache-unsafe.xml | 41 ------------------= ---- tests/qemuxml2xmloutdata/disk-cache-v2-none.xml | 41 ------------------= ---- tests/qemuxml2xmloutdata/disk-cache-v2-wb.xml | 41 ------------------= ---- tests/qemuxml2xmloutdata/disk-cache-v2-wt.xml | 41 ------------------= ---- tests/qemuxml2xmloutdata/disk-cache.xml | 6 ++++ tests/qemuxml2xmltest.c | 5 --- 23 files changed, 26 insertions(+), 550 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-cache-directsync.args delete mode 100644 tests/qemuxml2argvdata/disk-cache-directsync.xml delete mode 100644 tests/qemuxml2argvdata/disk-cache-unsafe.args delete mode 100644 tests/qemuxml2argvdata/disk-cache-unsafe.xml delete mode 100644 tests/qemuxml2argvdata/disk-cache-v2-none.args delete mode 100644 tests/qemuxml2argvdata/disk-cache-v2-none.xml delete mode 100644 tests/qemuxml2argvdata/disk-cache-v2-wb.args delete mode 100644 tests/qemuxml2argvdata/disk-cache-v2-wb.xml delete mode 100644 tests/qemuxml2argvdata/disk-cache-v2-wt.args delete mode 100644 tests/qemuxml2argvdata/disk-cache-v2-wt.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-cache-directsync.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-cache-unsafe.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-cache-v2-none.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-cache-v2-wb.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-cache-v2-wt.xml diff --git a/tests/qemuxml2argvdata/disk-cache-directsync.args b/tests/qemu= xml2argvdata/disk-cache-directsync.args deleted file mode 100644 index 82b2e1a218..0000000000 --- a/tests/qemuxml2argvdata/disk-cache-directsync.args +++ /dev/null @@ -1,30 +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 \ --boot c \ --usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-0,\ -cache=3Ddirectsync \ --device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ --drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-1-0,\ -media=3Dcdrom,readonly=3Don \ --device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0 diff --git a/tests/qemuxml2argvdata/disk-cache-directsync.xml b/tests/qemux= ml2argvdata/disk-cache-directsync.xml deleted file mode 100644 index e5b2ad3182..0000000000 --- a/tests/qemuxml2argvdata/disk-cache-directsync.xml +++ /dev/null @@ -1,37 +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-cache-unsafe.args b/tests/qemuxml2= argvdata/disk-cache-unsafe.args deleted file mode 100644 index 6759a02416..0000000000 --- a/tests/qemuxml2argvdata/disk-cache-unsafe.args +++ /dev/null @@ -1,30 +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 \ --boot c \ --usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-0,\ -cache=3Dunsafe \ --device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ --drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-1-0,\ -media=3Dcdrom,readonly=3Don \ --device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0 diff --git a/tests/qemuxml2argvdata/disk-cache-unsafe.xml b/tests/qemuxml2a= rgvdata/disk-cache-unsafe.xml deleted file mode 100644 index 61ca1dee2e..0000000000 --- a/tests/qemuxml2argvdata/disk-cache-unsafe.xml +++ /dev/null @@ -1,37 +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-cache-v2-none.args b/tests/qemuxml= 2argvdata/disk-cache-v2-none.args deleted file mode 100644 index 5bde2b165d..0000000000 --- a/tests/qemuxml2argvdata/disk-cache-v2-none.args +++ /dev/null @@ -1,30 +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 \ --boot c \ --usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-0,\ -cache=3Dnone \ --device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ --drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-1-0,\ -media=3Dcdrom,readonly=3Don \ --device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0 diff --git a/tests/qemuxml2argvdata/disk-cache-v2-none.xml b/tests/qemuxml2= argvdata/disk-cache-v2-none.xml deleted file mode 100644 index 4499165923..0000000000 --- a/tests/qemuxml2argvdata/disk-cache-v2-none.xml +++ /dev/null @@ -1,37 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - -
- - - - - - - - - diff --git a/tests/qemuxml2argvdata/disk-cache-v2-wb.args b/tests/qemuxml2a= rgvdata/disk-cache-v2-wb.args deleted file mode 100644 index 15f00b73a9..0000000000 --- a/tests/qemuxml2argvdata/disk-cache-v2-wb.args +++ /dev/null @@ -1,30 +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 \ --boot c \ --usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-0,\ -cache=3Dwriteback \ --device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ --drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-1-0,\ -media=3Dcdrom,readonly=3Don \ --device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0 diff --git a/tests/qemuxml2argvdata/disk-cache-v2-wb.xml b/tests/qemuxml2ar= gvdata/disk-cache-v2-wb.xml deleted file mode 100644 index 6fa9147ef5..0000000000 --- a/tests/qemuxml2argvdata/disk-cache-v2-wb.xml +++ /dev/null @@ -1,37 +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-cache-v2-wt.args b/tests/qemuxml2a= rgvdata/disk-cache-v2-wt.args deleted file mode 100644 index 164c6d7c69..0000000000 --- a/tests/qemuxml2argvdata/disk-cache-v2-wt.args +++ /dev/null @@ -1,30 +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 \ --boot c \ --usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-0,\ -cache=3Dwritethrough \ --device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ --drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-1-0,\ -media=3Dcdrom,readonly=3Don \ --device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0 diff --git a/tests/qemuxml2argvdata/disk-cache-v2-wt.xml b/tests/qemuxml2ar= gvdata/disk-cache-v2-wt.xml deleted file mode 100644 index 082aecc133..0000000000 --- a/tests/qemuxml2argvdata/disk-cache-v2-wt.xml +++ /dev/null @@ -1,37 +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-cache.args b/tests/qemuxml2argvdat= a/disk-cache.args index ee2f79a99f..1a692fc533 100644 --- a/tests/qemuxml2argvdata/disk-cache.args +++ b/tests/qemuxml2argvdata/disk-cache.args @@ -26,6 +26,9 @@ server,nowait \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-0,\ cache=3Dwriteback \ -device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ +-drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-1,\ +cache=3Dunsafe \ +-device ide-drive,bus=3Dide.0,unit=3D1,drive=3Ddrive-ide0-0-1,id=3Dide0-0-= 1 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-s= csi0-0-0,\ cache=3Dnone \ -device scsi-disk,bus=3Dscsi0.0,scsi-id=3D0,drive=3Ddrive-scsi0-0-0,id=3Ds= csi0-0-0 \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args b/tests/qe= muxml2argvdata/disk-cache.x86_64-2.6.0.args index 9af27dbbaf..1c75839c9e 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args @@ -29,6 +29,9 @@ server,nowait \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-0,\ cache=3Dwriteback \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-1,\ +cache=3Dunsafe \ +-device ide-hd,bus=3Dide.0,unit=3D1,drive=3Ddrive-ide0-0-1,id=3Dide0-0-1 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-s= csi0-0-0,\ cache=3Dnone \ -device scsi-hd,bus=3Dscsi0.0,scsi-id=3D0,drive=3Ddrive-scsi0-0-0,id=3Dscs= i0-0-0 \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args b/tests/qe= muxml2argvdata/disk-cache.x86_64-2.7.0.args index 7b67f4369c..9f7d06e72c 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args @@ -30,6 +30,10 @@ server,nowait \ cache=3Dwriteback \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1,\ write-cache=3Don \ +-drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-1,\ +cache=3Dunsafe \ +-device ide-hd,bus=3Dide.0,unit=3D1,drive=3Ddrive-ide0-0-1,id=3Dide0-0-1,\ +write-cache=3Don \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-s= csi0-0-0,\ cache=3Dnone \ -device scsi-hd,bus=3Dscsi0.0,scsi-id=3D0,drive=3Ddrive-scsi0-0-0,id=3Dscs= i0-0-0,\ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args b/tests/q= emuxml2argvdata/disk-cache.x86_64-latest.args index 9e5b611351..9220e6bee9 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args @@ -29,6 +29,10 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ cache=3Dwriteback \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1,\ write-cache=3Don \ +-drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-1,\ +cache=3Dunsafe \ +-device ide-hd,bus=3Dide.0,unit=3D1,drive=3Ddrive-ide0-0-1,id=3Dide0-0-1,\ +write-cache=3Don \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-s= csi0-0-0,\ cache=3Dnone \ -device scsi-hd,bus=3Dscsi0.0,scsi-id=3D0,drive=3Ddrive-scsi0-0-0,id=3Dscs= i0-0-0,\ diff --git a/tests/qemuxml2argvdata/disk-cache.xml b/tests/qemuxml2argvdata= /disk-cache.xml index 6b762909b4..7e7d45459c 100644 --- a/tests/qemuxml2argvdata/disk-cache.xml +++ b/tests/qemuxml2argvdata/disk-cache.xml @@ -20,6 +20,12 @@
+ + + + +
+ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d3c2101abd..03430c2324 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1032,11 +1032,6 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DISK_SHARE_RW); DO_TEST("disk-error-policy", NONE); DO_TEST_CAPS_LATEST("disk-error-policy"); - DO_TEST("disk-cache-v2-wt", NONE); - DO_TEST("disk-cache-v2-wb", NONE); - DO_TEST("disk-cache-v2-none", NONE); - DO_TEST("disk-cache-directsync", NONE); - DO_TEST("disk-cache-unsafe", NONE); DO_TEST("disk-cache", QEMU_CAPS_SCSI_LSI, QEMU_CAPS_DEVICE_USB_STORAGE= ); DO_TEST_CAPS_VER("disk-cache", "2.6.0"); DO_TEST_CAPS_VER("disk-cache", "2.7.0"); diff --git a/tests/qemuxml2xmloutdata/disk-cache-directsync.xml b/tests/qem= uxml2xmloutdata/disk-cache-directsync.xml deleted file mode 100644 index 2f9c64e440..0000000000 --- a/tests/qemuxml2xmloutdata/disk-cache-directsync.xml +++ /dev/null @@ -1,41 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - -
- - -
- - -
- - - - - - - diff --git a/tests/qemuxml2xmloutdata/disk-cache-unsafe.xml b/tests/qemuxml= 2xmloutdata/disk-cache-unsafe.xml deleted file mode 100644 index 2091402d8e..0000000000 --- a/tests/qemuxml2xmloutdata/disk-cache-unsafe.xml +++ /dev/null @@ -1,41 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - -
- - -
- - -
- - - - - - - diff --git a/tests/qemuxml2xmloutdata/disk-cache-v2-none.xml b/tests/qemuxm= l2xmloutdata/disk-cache-v2-none.xml deleted file mode 100644 index efc0f61136..0000000000 --- a/tests/qemuxml2xmloutdata/disk-cache-v2-none.xml +++ /dev/null @@ -1,41 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - -
- - -
- - -
- - - - - - - diff --git a/tests/qemuxml2xmloutdata/disk-cache-v2-wb.xml b/tests/qemuxml2= xmloutdata/disk-cache-v2-wb.xml deleted file mode 100644 index 1fded08c60..0000000000 --- a/tests/qemuxml2xmloutdata/disk-cache-v2-wb.xml +++ /dev/null @@ -1,41 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - -
- - -
- - -
- - - - - - - diff --git a/tests/qemuxml2xmloutdata/disk-cache-v2-wt.xml b/tests/qemuxml2= xmloutdata/disk-cache-v2-wt.xml deleted file mode 100644 index 73c0e73a73..0000000000 --- a/tests/qemuxml2xmloutdata/disk-cache-v2-wt.xml +++ /dev/null @@ -1,41 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - -
- - -
- - -
- - - - - - - diff --git a/tests/qemuxml2xmloutdata/disk-cache.xml b/tests/qemuxml2xmlout= data/disk-cache.xml index 4c2a196ac0..cba4067f0d 100644 --- a/tests/qemuxml2xmloutdata/disk-cache.xml +++ b/tests/qemuxml2xmloutdata/disk-cache.xml @@ -20,6 +20,12 @@
+ + + + +
+ diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index a3480cd5d1..2ba55f3a92 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -357,11 +357,6 @@ mymain(void) DO_TEST("disk-boot-cdrom", NONE); DO_TEST("disk-error-policy", NONE); DO_TEST("disk-fmt-qcow", NONE); - DO_TEST("disk-cache-v2-wt", NONE); - DO_TEST("disk-cache-v2-wb", NONE); - DO_TEST("disk-cache-v2-none", NONE); - DO_TEST("disk-cache-directsync", NONE); - DO_TEST("disk-cache-unsafe", NONE); DO_TEST("disk-cache", QEMU_CAPS_SCSI_LSI); DO_TEST("disk-network-nbd", NONE); DO_TEST("disk-network-nbd-export", NONE); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 1532015528030949.9099142408687; Thu, 19 Jul 2018 08:52:08 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 02746C04AC54; Thu, 19 Jul 2018 15:52:05 +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 8E3382010CDA; Thu, 19 Jul 2018 15:52:04 +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 01B4C18037F0; Thu, 19 Jul 2018 15:52:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpSAo028660 for ; Thu, 19 Jul 2018 11:51:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6E1141C5A6; Thu, 19 Jul 2018 15:51:28 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F6D51C5B0 for ; Thu, 19 Jul 2018 15:51:27 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:51:05 +0200 Message-Id: <519825220e46429003e7d4ee7a1729d273cd25bd.1532015294.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 13/24] tests: qemu: Unify iscsi disk source testing 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: , MIME-Version: 1.0 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.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 19 Jul 2018 15:52:07 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Move various different iSCSI configuration into one test file. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- .../qemuxml2argvdata/disk-network-iscsi-auth.args | 34 ---------------- tests/qemuxml2argvdata/disk-network-iscsi-auth.xml | 43 ------------------= -- tests/qemuxml2argvdata/disk-network-iscsi-lun.args | 29 ------------- tests/qemuxml2argvdata/disk-network-iscsi-lun.xml | 28 ------------- tests/qemuxml2argvdata/disk-network-iscsi.args | 21 ++++++++-- tests/qemuxml2argvdata/disk-network-iscsi.xml | 28 +++++++++++++ tests/qemuxml2argvtest.c | 6 +-- .../qemuxml2xmloutdata/disk-network-iscsi-auth.xml | 47 ------------------= ---- tests/qemuxml2xmloutdata/disk-network-iscsi.xml | 37 ++++++++++++++++- tests/qemuxml2xmltest.c | 3 +- 10 files changed, 83 insertions(+), 193 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi-auth.args delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi-auth.xml delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi-lun.args delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi-lun.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-network-iscsi-auth.xml diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-auth.args b/tests/qe= muxml2argvdata/disk-network-iscsi-auth.args deleted file mode 100644 index 423b6b2a8f..0000000000 --- a/tests/qemuxml2argvdata/disk-network-iscsi-auth.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 \ --boot c \ --usb \ --drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ -6000/iqn.1992-01.com.example%3Astorage/1,format=3Draw,if=3Dnone,\ -id=3Ddrive-virtio-disk0 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-virtio-disk0,\ -id=3Dvirtio-disk0 \ --drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ -6000/iqn.1992-01.com.example%3Astorage/2,format=3Draw,if=3Dnone,\ -id=3Ddrive-virtio-disk1 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-virtio-disk1,\ -id=3Dvirtio-disk1 diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-auth.xml b/tests/qem= uxml2argvdata/disk-network-iscsi-auth.xml deleted file mode 100644 index 63919f1000..0000000000 --- a/tests/qemuxml2argvdata/disk-network-iscsi-auth.xml +++ /dev/null @@ -1,43 +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-network-iscsi-lun.args b/tests/qem= uxml2argvdata/disk-network-iscsi-lun.args deleted file mode 100644 index 96601ae29e..0000000000 --- a/tests/qemuxml2argvdata/disk-network-iscsi-lun.args +++ /dev/null @@ -1,29 +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 \ --boot c \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ --usb \ --drive file=3Discsi://example.org:3260/iqn.1992-01.com.example/0,format=3D= raw,\ -if=3Dnone,id=3Ddrive-scsi0-0-0-0 \ --device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,\ -drive=3Ddrive-scsi0-0-0-0,id=3Dscsi0-0-0-0 diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-lun.xml b/tests/qemu= xml2argvdata/disk-network-iscsi-lun.xml deleted file mode 100644 index 3e8408044b..0000000000 --- a/tests/qemuxml2argvdata/disk-network-iscsi-lun.xml +++ /dev/null @@ -1,28 +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-network-iscsi.args b/tests/qemuxml= 2argvdata/disk-network-iscsi.args index 8cf2810b7f..f68296586d 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.args @@ -21,12 +21,27 @@ server,nowait \ -no-shutdown \ -no-acpi \ -boot c \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ -usb \ -drive file=3Discsi://example.org:6000/iqn.1992-01.com.example/0,format=3D= raw,\ if=3Dnone,id=3Ddrive-virtio-disk0 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-virtio-disk0,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-virtio-disk0,\ id=3Dvirtio-disk0 \ -drive file=3Discsi://example.org:6000/iqn.1992-01.com.example/1,format=3D= raw,\ if=3Dnone,id=3Ddrive-virtio-disk1 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-virtio-disk1,\ -id=3Dvirtio-disk1 +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-virtio-disk1,\ +id=3Dvirtio-disk1 \ +-drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ +6000/iqn.1992-01.com.example%3Astorage/1,format=3Draw,if=3Dnone,\ +id=3Ddrive-virtio-disk2 \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Ddrive-virtio-disk2,\ +id=3Dvirtio-disk2 \ +-drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ +6000/iqn.1992-01.com.example%3Astorage/2,format=3Draw,if=3Dnone,\ +id=3Ddrive-virtio-disk3 \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Ddrive-virtio-disk3,\ +id=3Dvirtio-disk3 \ +-drive file=3Discsi://example.org:3260/iqn.1992-01.com.example/0,format=3D= raw,\ +if=3Dnone,id=3Ddrive-scsi0-0-0-0 \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,\ +drive=3Ddrive-scsi0-0-0-0,id=3Dscsi0-0-0-0 diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.xml b/tests/qemuxml2= argvdata/disk-network-iscsi.xml index be1b4f9d81..fa2a889b54 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.xml +++ b/tests/qemuxml2argvdata/disk-network-iscsi.xml @@ -28,8 +28,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 03430c2324..31e992b989 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1041,14 +1041,10 @@ mymain(void) DO_TEST("disk-network-nbd-ipv6", NONE); DO_TEST("disk-network-nbd-ipv6-export", NONE); DO_TEST("disk-network-nbd-unix", NONE); - DO_TEST("disk-network-iscsi", NONE); - DO_TEST("disk-network-iscsi-auth", NONE); + DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_BL= OCK); DO_TEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-invalid", NONE= ); DO_TEST_PARSE_ERROR("disk-network-iscsi-auth-wrong-secrettype", NONE); DO_TEST_PARSE_ERROR("disk-network-source-auth-both", NONE); - DO_TEST("disk-network-iscsi-lun", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_BLOCK); DO_TEST("disk-network-gluster", QEMU_CAPS_GLUSTER_DEBUG_LEVEL); DO_TEST("disk-network-rbd", NONE); diff --git a/tests/qemuxml2xmloutdata/disk-network-iscsi-auth.xml b/tests/q= emuxml2xmloutdata/disk-network-iscsi-auth.xml deleted file mode 100644 index 543b26e457..0000000000 --- a/tests/qemuxml2xmloutdata/disk-network-iscsi-auth.xml +++ /dev/null @@ -1,47 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - - - - - - -
- - - - - - - - - - -
- - -
- - - - - - - diff --git a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml b/tests/qemuxm= l2xmloutdata/disk-network-iscsi.xml index 694412b5c7..f1348d583e 100644 --- a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml +++ b/tests/qemuxml2xmloutdata/disk-network-iscsi.xml @@ -20,7 +20,7 @@ -
+
@@ -28,12 +28,45 @@ -
+
+ + + + + + + + + + +
+ + + + + + + + + + +
+ + + + + + + +
+ +
+ diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2ba55f3a92..edba1ca99d 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -363,8 +363,7 @@ mymain(void) DO_TEST("disk-network-nbd-ipv6", NONE); DO_TEST("disk-network-nbd-ipv6-export", NONE); DO_TEST("disk-network-nbd-unix", NONE); - DO_TEST("disk-network-iscsi", NONE); - DO_TEST("disk-network-iscsi-auth", NONE); + DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-network-gluster", NONE); DO_TEST("disk-network-rbd", NONE); DO_TEST("disk-network-rbd-auth", NONE); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 153201554908734.77938038865602; Thu, 19 Jul 2018 08:52:29 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B123B300308A; Thu, 19 Jul 2018 15:52:26 +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 73E15308332F; Thu, 19 Jul 2018 15:52:26 +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 1EDCC18037F5; Thu, 19 Jul 2018 15:52:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpTNA028670 for ; Thu, 19 Jul 2018 11:51:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 157961C5A6; Thu, 19 Jul 2018 15:51:29 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB4A81C5B0 for ; Thu, 19 Jul 2018 15:51:28 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:51:06 +0200 Message-Id: <2305974c2bc18e50b0245f33af25eac25457607a.1532015294.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 14/24] tests: qemuxml2argv: Add 'CAPS_LATEST' version of 'disk-network-iscsi' 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: , MIME-Version: 1.0 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.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 19 Jul 2018 15:52:28 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- .../disk-network-iscsi.x86_64-latest.args | 63 ++++++++++++++++++= ++++ tests/qemuxml2argvtest.c | 1 + 2 files changed, 64 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest= .args diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args new file mode 100644 index 0000000000..be9ab18314 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args @@ -0,0 +1,63 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-i686 \ +-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 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,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,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:6000,\ +file.target=3Diqn.1992-01.com.example,file.lun=3D0,file.transport=3Dtcp,fo= rmat=3Draw,\ +if=3Dnone,id=3Ddrive-virtio-disk0 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-vir= tio-disk0,\ +id=3Dvirtio-disk0,bootindex=3D1 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:6000,\ +file.target=3Diqn.1992-01.com.example,file.lun=3D1,file.transport=3Dtcp,fo= rmat=3Draw,\ +if=3Dnone,id=3Ddrive-virtio-disk1 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-vir= tio-disk1,\ +id=3Dvirtio-disk1 \ +-object secret,id=3Dvirtio-disk2-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:6000,\ +file.target=3Diqn.1992-01.com.example:storage,file.lun=3D1,file.transport= =3Dtcp,\ +file.user=3Dmyname,file.password-secret=3Dvirtio-disk2-secret0,format=3Dra= w,if=3Dnone,\ +id=3Ddrive-virtio-disk2 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-vir= tio-disk2,\ +id=3Dvirtio-disk2 \ +-object secret,id=3Dvirtio-disk3-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:6000,\ +file.target=3Diqn.1992-01.com.example:storage,file.lun=3D2,file.transport= =3Dtcp,\ +file.user=3Dmyname,file.password-secret=3Dvirtio-disk3-secret0,format=3Dra= w,if=3Dnone,\ +id=3Ddrive-virtio-disk3 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x6,drive=3Ddrive-vir= tio-disk3,\ +id=3Dvirtio-disk3 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example,file.lun=3D0,file.transport=3Dtcp,fo= rmat=3Draw,\ +if=3Dnone,id=3Ddrive-scsi0-0-0-0 \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,\ +drive=3Ddrive-scsi0-0-0-0,id=3Dscsi0-0-0-0 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 31e992b989..2dfb0da267 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1042,6 +1042,7 @@ mymain(void) DO_TEST("disk-network-nbd-ipv6-export", NONE); DO_TEST("disk-network-nbd-unix", NONE); DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_BL= OCK); + DO_TEST_CAPS_LATEST("disk-network-iscsi"); DO_TEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-invalid", NONE= ); DO_TEST_PARSE_ERROR("disk-network-iscsi-auth-wrong-secrettype", NONE); DO_TEST_PARSE_ERROR("disk-network-source-auth-both", NONE); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 1532015536753144.52824908811328; Thu, 19 Jul 2018 08:52:16 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 00FF33082A4F; Thu, 19 Jul 2018 15:52:15 +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 9648D19485; Thu, 19 Jul 2018 15:52:14 +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 2794C3F601; Thu, 19 Jul 2018 15:52:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpT2f028677 for ; Thu, 19 Jul 2018 11:51:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id B18171C5A6; Thu, 19 Jul 2018 15:51:29 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 52C611C5B0 for ; Thu, 19 Jul 2018 15:51:29 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:51:07 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 15/24] tests: qemu: Unify nbd disk source testing 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: , MIME-Version: 1.0 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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Thu, 19 Jul 2018 15:52:16 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- .../qemuxml2argvdata/disk-network-nbd-export.args | 30 ---------------- tests/qemuxml2argvdata/disk-network-nbd-export.xml | 37 ------------------- .../disk-network-nbd-ipv6-export.args | 29 --------------- .../disk-network-nbd-ipv6-export.xml | 37 ------------------- tests/qemuxml2argvdata/disk-network-nbd-ipv6.args | 29 --------------- tests/qemuxml2argvdata/disk-network-nbd-ipv6.xml | 37 ------------------- tests/qemuxml2argvdata/disk-network-nbd-unix.args | 30 ---------------- tests/qemuxml2argvdata/disk-network-nbd-unix.xml | 37 ------------------- tests/qemuxml2argvdata/disk-network-nbd.args | 18 ++++++++-- tests/qemuxml2argvdata/disk-network-nbd.xml | 34 ++++++++++++++---- tests/qemuxml2argvtest.c | 4 --- .../qemuxml2xmloutdata/disk-network-nbd-export.xml | 42 ------------------= ---- .../disk-network-nbd-ipv6-export.xml | 42 ------------------= ---- tests/qemuxml2xmloutdata/disk-network-nbd-ipv6.xml | 42 ------------------= ---- tests/qemuxml2xmloutdata/disk-network-nbd-unix.xml | 42 ------------------= ---- tests/qemuxml2xmloutdata/disk-network-nbd.xml | 38 ++++++++++++++++--= -- tests/qemuxml2xmltest.c | 4 --- 17 files changed, 75 insertions(+), 457 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd-export.args delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd-export.xml delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd-ipv6-export.args delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd-ipv6-export.xml delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd-ipv6.args delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd-ipv6.xml delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd-unix.args delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd-unix.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-network-nbd-export.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-network-nbd-ipv6-export.x= ml delete mode 100644 tests/qemuxml2xmloutdata/disk-network-nbd-ipv6.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-network-nbd-unix.xml diff --git a/tests/qemuxml2argvdata/disk-network-nbd-export.args b/tests/qe= muxml2argvdata/disk-network-nbd-export.args deleted file mode 100644 index ff220d3f7d..0000000000 --- a/tests/qemuxml2argvdata/disk-network-nbd-export.args +++ /dev/null @@ -1,30 +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 \ --boot c \ --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 \ --drive file=3Dnbd:example.org:6000:exportname=3Dbar,format=3Draw,if=3Dnone= ,\ -id=3Ddrive-virtio-disk0 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-virtio-disk0,\ -id=3Dvirtio-disk0 diff --git a/tests/qemuxml2argvdata/disk-network-nbd-export.xml b/tests/qem= uxml2argvdata/disk-network-nbd-export.xml deleted file mode 100644 index 2acf380c35..0000000000 --- a/tests/qemuxml2argvdata/disk-network-nbd-export.xml +++ /dev/null @@ -1,37 +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-network-nbd-ipv6-export.args b/tes= ts/qemuxml2argvdata/disk-network-nbd-ipv6-export.args deleted file mode 100644 index 8ced242f52..0000000000 --- a/tests/qemuxml2argvdata/disk-network-nbd-ipv6-export.args +++ /dev/null @@ -1,29 +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 \ --boot c \ --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 \ --drive 'file=3Dnbd://[::1]:6000/bar,format=3Draw,if=3Dnone,id=3Ddrive-virt= io-disk0' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-virtio-disk0,\ -id=3Dvirtio-disk0 diff --git a/tests/qemuxml2argvdata/disk-network-nbd-ipv6-export.xml b/test= s/qemuxml2argvdata/disk-network-nbd-ipv6-export.xml deleted file mode 100644 index da50dc5e81..0000000000 --- a/tests/qemuxml2argvdata/disk-network-nbd-ipv6-export.xml +++ /dev/null @@ -1,37 +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-network-nbd-ipv6.args b/tests/qemu= xml2argvdata/disk-network-nbd-ipv6.args deleted file mode 100644 index e3e2677354..0000000000 --- a/tests/qemuxml2argvdata/disk-network-nbd-ipv6.args +++ /dev/null @@ -1,29 +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 \ --boot c \ --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 \ --drive 'file=3Dnbd://[::1]:6000,format=3Draw,if=3Dnone,id=3Ddrive-virtio-d= isk0' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-virtio-disk0,\ -id=3Dvirtio-disk0 diff --git a/tests/qemuxml2argvdata/disk-network-nbd-ipv6.xml b/tests/qemux= ml2argvdata/disk-network-nbd-ipv6.xml deleted file mode 100644 index 4c4dcdd7a6..0000000000 --- a/tests/qemuxml2argvdata/disk-network-nbd-ipv6.xml +++ /dev/null @@ -1,37 +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-network-nbd-unix.args b/tests/qemu= xml2argvdata/disk-network-nbd-unix.args deleted file mode 100644 index 6c485f95fa..0000000000 --- a/tests/qemuxml2argvdata/disk-network-nbd-unix.args +++ /dev/null @@ -1,30 +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 \ --boot c \ --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 \ --drive file=3Dnbd:unix:/var/run/nbdsock:exportname=3Dbar,format=3Draw,if= =3Dnone,\ -id=3Ddrive-virtio-disk0 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-virtio-disk0,\ -id=3Dvirtio-disk0 diff --git a/tests/qemuxml2argvdata/disk-network-nbd-unix.xml b/tests/qemux= ml2argvdata/disk-network-nbd-unix.xml deleted file mode 100644 index 3921f3fab2..0000000000 --- a/tests/qemuxml2argvdata/disk-network-nbd-unix.xml +++ /dev/null @@ -1,37 +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-network-nbd.args b/tests/qemuxml2a= rgvdata/disk-network-nbd.args index caf2bd5c72..8f10e78e0c 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.args @@ -22,8 +22,20 @@ server,nowait \ -no-acpi \ -boot c \ -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 \ -drive file=3Dnbd:example.org:6000,format=3Draw,if=3Dnone,id=3Ddrive-virti= o-disk0 \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-virtio-disk0,\ -id=3Dvirtio-disk0 +id=3Dvirtio-disk0 \ +-drive file=3Dnbd:example.org:6000:exportname=3Dbar,format=3Draw,if=3Dnone= ,\ +id=3Ddrive-virtio-disk1 \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-virtio-disk1,\ +id=3Dvirtio-disk1 \ +-drive 'file=3Dnbd://[::1]:6000,format=3Draw,if=3Dnone,id=3Ddrive-virtio-d= isk2' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-virtio-disk2,\ +id=3Dvirtio-disk2 \ +-drive 'file=3Dnbd://[::1]:6000/bar,format=3Draw,if=3Dnone,id=3Ddrive-virt= io-disk3' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Ddrive-virtio-disk3,\ +id=3Dvirtio-disk3 \ +-drive file=3Dnbd:unix:/var/run/nbdsock:exportname=3Dbar,format=3Draw,if= =3Dnone,\ +id=3Ddrive-virtio-disk4 \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Ddrive-virtio-disk4,\ +id=3Dvirtio-disk4 diff --git a/tests/qemuxml2argvdata/disk-network-nbd.xml b/tests/qemuxml2ar= gvdata/disk-network-nbd.xml index 00f627bc59..2d5762f1b7 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.xml +++ b/tests/qemuxml2argvdata/disk-network-nbd.xml @@ -14,12 +14,6 @@ destroy /usr/bin/qemu-system-i686 - - - - -
- @@ -27,6 +21,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 2dfb0da267..d4d98bfe21 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1037,10 +1037,6 @@ mymain(void) DO_TEST_CAPS_VER("disk-cache", "2.7.0"); DO_TEST_CAPS_LATEST("disk-cache"); DO_TEST("disk-network-nbd", NONE); - DO_TEST("disk-network-nbd-export", NONE); - DO_TEST("disk-network-nbd-ipv6", NONE); - DO_TEST("disk-network-nbd-ipv6-export", NONE); - DO_TEST("disk-network-nbd-unix", NONE); DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_BL= OCK); DO_TEST_CAPS_LATEST("disk-network-iscsi"); DO_TEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-invalid", NONE= ); diff --git a/tests/qemuxml2xmloutdata/disk-network-nbd-export.xml b/tests/q= emuxml2xmloutdata/disk-network-nbd-export.xml deleted file mode 100644 index c4754c324c..0000000000 --- a/tests/qemuxml2xmloutdata/disk-network-nbd-export.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/qemuxml2xmloutdata/disk-network-nbd-ipv6-export.xml b/te= sts/qemuxml2xmloutdata/disk-network-nbd-ipv6-export.xml deleted file mode 100644 index 5e961b58f5..0000000000 --- a/tests/qemuxml2xmloutdata/disk-network-nbd-ipv6-export.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/qemuxml2xmloutdata/disk-network-nbd-ipv6.xml b/tests/qem= uxml2xmloutdata/disk-network-nbd-ipv6.xml deleted file mode 100644 index 7e1afff97b..0000000000 --- a/tests/qemuxml2xmloutdata/disk-network-nbd-ipv6.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/qemuxml2xmloutdata/disk-network-nbd-unix.xml b/tests/qem= uxml2xmloutdata/disk-network-nbd-unix.xml deleted file mode 100644 index 02c3f64f75..0000000000 --- a/tests/qemuxml2xmloutdata/disk-network-nbd-unix.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/qemuxml2xmloutdata/disk-network-nbd.xml b/tests/qemuxml2= xmloutdata/disk-network-nbd.xml index 165b61b348..818e8d7d7c 100644 --- a/tests/qemuxml2xmloutdata/disk-network-nbd.xml +++ b/tests/qemuxml2xmloutdata/disk-network-nbd.xml @@ -14,12 +14,6 @@ destroy /usr/bin/qemu-system-i686 - - - - -
- @@ -28,6 +22,38 @@
+ + + + + + +
+ + + + + + + +
+ + + + + + + +
+ + + + + + + +
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index edba1ca99d..b2aa903ec9 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -359,10 +359,6 @@ mymain(void) DO_TEST("disk-fmt-qcow", NONE); DO_TEST("disk-cache", QEMU_CAPS_SCSI_LSI); DO_TEST("disk-network-nbd", NONE); - DO_TEST("disk-network-nbd-export", NONE); - DO_TEST("disk-network-nbd-ipv6", NONE); - DO_TEST("disk-network-nbd-ipv6-export", NONE); - DO_TEST("disk-network-nbd-unix", NONE); DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-network-gluster", NONE); DO_TEST("disk-network-rbd", NONE); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 1532015543408246.04240868560805; Thu, 19 Jul 2018 08:52:23 -0700 (PDT) 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 051A53004416; Thu, 19 Jul 2018 15:52:22 +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 B1C1B5C73D; Thu, 19 Jul 2018 15:52:21 +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 643FF24F60; Thu, 19 Jul 2018 15:52:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpUXE028682 for ; Thu, 19 Jul 2018 11:51:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 588651C5A6; Thu, 19 Jul 2018 15:51:30 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE73B1C5B8 for ; Thu, 19 Jul 2018 15:51:29 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:51:08 +0200 Message-Id: <0e346f54938340a806a0fc831d98c147e658694e.1532015294.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 16/24] tests: qemuxml2argv: Add 'CAPS_LATEST' version of 'disk-network-nbd' 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: , MIME-Version: 1.0 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.49]); Thu, 19 Jul 2018 15:52:22 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- .../disk-network-nbd.x86_64-latest.args | 46 ++++++++++++++++++= ++++ tests/qemuxml2argvtest.c | 1 + 2 files changed, 47 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.a= rgs diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args new file mode 100644 index 0000000000..85452e715a --- /dev/null +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args @@ -0,0 +1,46 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-i686 \ +-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 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,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 \ +-drive file=3Dnbd:example.org:6000,format=3Draw,if=3Dnone,id=3Ddrive-virti= o-disk0 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Ddrive-vir= tio-disk0,\ +id=3Dvirtio-disk0,bootindex=3D1 \ +-drive file=3Dnbd:example.org:6000:exportname=3Dbar,format=3Draw,if=3Dnone= ,\ +id=3Ddrive-virtio-disk1 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-vir= tio-disk1,\ +id=3Dvirtio-disk1 \ +-drive 'file=3Dnbd://[::1]:6000,format=3Draw,if=3Dnone,id=3Ddrive-virtio-d= isk2' \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-vir= tio-disk2,\ +id=3Dvirtio-disk2 \ +-drive 'file=3Dnbd://[::1]:6000/bar,format=3Draw,if=3Dnone,id=3Ddrive-virt= io-disk3' \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-vir= tio-disk3,\ +id=3Dvirtio-disk3 \ +-drive file=3Dnbd:unix:/var/run/nbdsock:exportname=3Dbar,format=3Draw,if= =3Dnone,\ +id=3Ddrive-virtio-disk4 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x6,drive=3Ddrive-vir= tio-disk4,\ +id=3Dvirtio-disk4 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d4d98bfe21..7019d65eb7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1037,6 +1037,7 @@ mymain(void) DO_TEST_CAPS_VER("disk-cache", "2.7.0"); DO_TEST_CAPS_LATEST("disk-cache"); DO_TEST("disk-network-nbd", NONE); + DO_TEST_CAPS_LATEST("disk-network-nbd"); DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_BL= OCK); DO_TEST_CAPS_LATEST("disk-network-iscsi"); DO_TEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-invalid", NONE= ); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 153201555584654.04835133388758; Thu, 19 Jul 2018 08:52:35 -0700 (PDT) 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 896A0307C6FF; Thu, 19 Jul 2018 15:52:34 +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 AE33510021B1; Thu, 19 Jul 2018 15:52:33 +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 D33501800FD8; Thu, 19 Jul 2018 15:52:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpVBh028687 for ; Thu, 19 Jul 2018 11:51:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id F3BFB1C5A6; Thu, 19 Jul 2018 15:51:30 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9527D1C5B0 for ; Thu, 19 Jul 2018 15:51:30 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:51:09 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 17/24] tests: qemu: Remove pointless 'disk-networ-ceph-env' test 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: , MIME-Version: 1.0 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.42]); Thu, 19 Jul 2018 15:52:35 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The xml2argv variant was unused. The xml2xml variant is redundant in other tests for RBD. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- .../disk-network-rbd-ceph-env.args | 25 ------------ .../qemuxml2argvdata/disk-network-rbd-ceph-env.xml | 39 ------------------- .../disk-network-rbd-ceph-env.xml | 44 ------------------= ---- tests/qemuxml2xmltest.c | 1 - 4 files changed, 109 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-ceph-env.args delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-ceph-env.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-network-rbd-ceph-env.xml diff --git a/tests/qemuxml2argvdata/disk-network-rbd-ceph-env.args b/tests/= qemuxml2argvdata/disk-network-rbd-ceph-env.args deleted file mode 100644 index ead74e3110..0000000000 --- a/tests/qemuxml2argvdata/disk-network-rbd-ceph-env.args +++ /dev/null @@ -1,25 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/home/test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -QEMU_AUDIO_DRV=3Dnone \ -CEPH_ARGS=3D-m \ -mon1.example.org:6321,mon2.example.org:6322,mon3.example.org:6322 \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dide,bus=3D0,unit=3D= 0 \ --drive file=3Drbd:pool/image,format=3Draw,if=3Dvirtio \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuxml2argvdata/disk-network-rbd-ceph-env.xml b/tests/q= emuxml2argvdata/disk-network-rbd-ceph-env.xml deleted file mode 100644 index 4f54867c6c..0000000000 --- a/tests/qemuxml2argvdata/disk-network-rbd-ceph-env.xml +++ /dev/null @@ -1,39 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - - - - - - - - - - - - - diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd-ceph-env.xml b/tests= /qemuxml2xmloutdata/disk-network-rbd-ceph-env.xml deleted file mode 100644 index 2e46e1d0b9..0000000000 --- a/tests/qemuxml2xmloutdata/disk-network-rbd-ceph-env.xml +++ /dev/null @@ -1,44 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - - - - -
- - -
- - -
- - - - - - - diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index b2aa903ec9..a0bf160ee6 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -364,7 +364,6 @@ mymain(void) DO_TEST("disk-network-rbd", NONE); DO_TEST("disk-network-rbd-auth", NONE); DO_TEST("disk-network-rbd-ipv6", NONE); - DO_TEST("disk-network-rbd-ceph-env", NONE); DO_TEST("disk-network-source-auth", NONE); DO_TEST("disk-network-sheepdog", NONE); DO_TEST("disk-network-vxhs", NONE); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 1532015562408522.661140684049; Thu, 19 Jul 2018 08:52:42 -0700 (PDT) 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 1B029BDD1; Thu, 19 Jul 2018 15:52:41 +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 CB6355D9CC; Thu, 19 Jul 2018 15:52: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 735C424F64; Thu, 19 Jul 2018 15:52:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpVMj028692 for ; Thu, 19 Jul 2018 11:51:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9ACD31C5A6; Thu, 19 Jul 2018 15:51:31 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C2BB1C5B0 for ; Thu, 19 Jul 2018 15:51:31 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:51:10 +0200 Message-Id: <8a1c2544442b9d4a6c632c5dc441849bd5a1c3f3.1532015294.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 18/24] tests: qemuxml2argv: Unify testing of 'disk-network-rbd' 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: , MIME-Version: 1.0 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.29]); Thu, 19 Jul 2018 15:52:41 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Move the authentication and ipv6 cases into the main test file. To allow removal of the separate testing of the secure credential passing via the 'secret' object in qemu, use the DO_TEST_CAPS_VER macro with version 2.5.0 when the secret object is not supported by qemu. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- .../disk-network-rbd-auth-AES.args | 47 ----------------- .../qemuxml2argvdata/disk-network-rbd-auth-AES.xml | 55 ------------------- tests/qemuxml2argvdata/disk-network-rbd-auth.args | 32 ------------ tests/qemuxml2argvdata/disk-network-rbd-auth.xml | 42 --------------- tests/qemuxml2argvdata/disk-network-rbd-ipv6.args | 31 ----------- tests/qemuxml2argvdata/disk-network-rbd-ipv6.xml | 40 -------------- tests/qemuxml2argvdata/disk-network-rbd.args | 44 ---------------- .../disk-network-rbd.x86_64-2.5.0.args | 55 +++++++++++++++++++ .../disk-network-rbd.x86_64-latest.args | 61 ++++++++++++++++++= ++++ tests/qemuxml2argvdata/disk-network-rbd.xml | 28 +++++++--- tests/qemuxml2argvtest.c | 9 ++-- tests/qemuxml2xmloutdata/disk-network-rbd-auth.xml | 47 ----------------- tests/qemuxml2xmloutdata/disk-network-rbd-ipv6.xml | 45 ---------------- tests/qemuxml2xmloutdata/disk-network-rbd.xml | 30 ++++++++--- tests/qemuxml2xmltest.c | 2 - 15 files changed, 165 insertions(+), 403 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-auth-AES.args delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-auth-AES.xml delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-auth.args delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-auth.xml delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-ipv6.args delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-ipv6.xml delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.args create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.ar= gs create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.a= rgs delete mode 100644 tests/qemuxml2xmloutdata/disk-network-rbd-auth.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-network-rbd-ipv6.xml diff --git a/tests/qemuxml2argvdata/disk-network-rbd-auth-AES.args b/tests/= qemuxml2argvdata/disk-network-rbd-auth-AES.args deleted file mode 100644 index 9c39082bec..0000000000 --- a/tests/qemuxml2argvdata/disk-network-rbd-auth-AES.args +++ /dev/null @@ -1,47 +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 \ --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 \ --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 \ --boot c \ --device virtio-scsi-pci,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 \ --object secret,id=3Dvirtio-disk0-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ --drive 'file=3Drbd:pool/image:id=3Dmyname:auth_supported=3Dcephx\;none:\ -mon_host=3Dmon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.or= g\:\ -6322,file.password-secret=3Dvirtio-disk0-secret0,format=3Draw,if=3Dnone,\ -id=3Ddrive-virtio-disk0' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-virtio-disk0,\ -id=3Dvirtio-disk0 \ --object secret,id=3Dscsi0-0-0-0-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ --drive 'file=3Drbd:pool/image:id=3Dmyname:auth_supported=3Dcephx\;none:\ -mon_host=3Dmon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.or= g\:\ -6322,file.password-secret=3Dscsi0-0-0-0-secret0,format=3Draw,if=3Dnone,\ -id=3Ddrive-scsi0-0-0-0,cache=3Dnone' \ --device scsi-disk,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,\ -drive=3Ddrive-scsi0-0-0-0,id=3Dscsi0-0-0-0 diff --git a/tests/qemuxml2argvdata/disk-network-rbd-auth-AES.xml b/tests/q= emuxml2argvdata/disk-network-rbd-auth-AES.xml deleted file mode 100644 index 390d2d6038..0000000000 --- a/tests/qemuxml2argvdata/disk-network-rbd-auth-AES.xml +++ /dev/null @@ -1,55 +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-network-rbd-auth.args b/tests/qemu= xml2argvdata/disk-network-rbd-auth.args deleted file mode 100644 index 163f02aef6..0000000000 --- a/tests/qemuxml2argvdata/disk-network-rbd-auth.args +++ /dev/null @@ -1,32 +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 \ --boot c \ --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 \ --drive 'file=3Drbd:pool/image:id=3Dmyname:\ -key=3DQVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=3D:\ -auth_supported=3Dcephx\;none:mon_host=3Dmon1.example.org\:6321\;mon2.examp= le.org\:\ -6322\;mon3.example.org\:6322,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk= 0' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-virtio-disk0,\ -id=3Dvirtio-disk0 diff --git a/tests/qemuxml2argvdata/disk-network-rbd-auth.xml b/tests/qemux= ml2argvdata/disk-network-rbd-auth.xml deleted file mode 100644 index 10b9738a9b..0000000000 --- a/tests/qemuxml2argvdata/disk-network-rbd-auth.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-network-rbd-ipv6.args b/tests/qemu= xml2argvdata/disk-network-rbd-ipv6.args deleted file mode 100644 index 413b3c4ffd..0000000000 --- a/tests/qemuxml2argvdata/disk-network-rbd-ipv6.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 \ --boot c \ --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 \ --drive 'file=3Drbd:pool/image:auth_supported=3Dnone:mon_host=3D[\:\:1]\:\ -6321\;example.org\:6789\;[ffff\:1234\:567\:abc\:\:0f]\:6322\;[2001\:db8\:\= :\ -ff00\:42\:8329]\:6322,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-virtio-disk0,\ -id=3Dvirtio-disk0 diff --git a/tests/qemuxml2argvdata/disk-network-rbd-ipv6.xml b/tests/qemux= ml2argvdata/disk-network-rbd-ipv6.xml deleted file mode 100644 index 7dad32e0c9..0000000000 --- a/tests/qemuxml2argvdata/disk-network-rbd-ipv6.xml +++ /dev/null @@ -1,40 +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-network-rbd.args b/tests/qemuxml2a= rgvdata/disk-network-rbd.args deleted file mode 100644 index 08a712e67f..0000000000 --- a/tests/qemuxml2argvdata/disk-network-rbd.args +++ /dev/null @@ -1,44 +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 \ --boot c \ --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 \ --drive 'file=3Drbd:pool/image:auth_supported=3Dnone:mon_host=3Dmon1.exampl= e.org\:\ -6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=3Draw,if=3Dnon= e,\ -id=3Ddrive-virtio-disk0' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-virtio-disk0,\ -id=3Dvirtio-disk0 \ --drive file=3Drbd:pool/image@asdf:auth_supported=3Dnone,format=3Draw,if=3D= none,\ -id=3Ddrive-virtio-disk1 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-virtio-disk1,\ -id=3Dvirtio-disk1 \ --drive 'file=3Drbd:pool/image@foo:auth_supported=3Dnone:mon_host=3Dmon1.ex= ample.org\:\ -6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=3Draw,if=3Dnon= e,\ -id=3Ddrive-virtio-disk2' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-virtio-disk2,\ -id=3Dvirtio-disk2 \ --drive file=3Drbd:pool/image@foo:auth_supported=3Dnone:conf=3D/blah/test.c= onf,\ -format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk3 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Ddrive-virtio-disk3,\ -id=3Dvirtio-disk3 diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args b/te= sts/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args new file mode 100644 index 0000000000..82fce3f4de --- /dev/null +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args @@ -0,0 +1,55 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-i686 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-machine pc-i440fx-2.5,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-QEMUGuest1/moni= tor.sock,\ +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 \ +-drive 'file=3Drbd:pool/image:auth_supported=3Dnone:mon_host=3Dmon1.exampl= e.org\:\ +6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=3Draw,if=3Dnon= e,\ +id=3Ddrive-virtio-disk0' \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Ddrive-vir= tio-disk0,\ +id=3Dvirtio-disk0,bootindex=3D1 \ +-drive file=3Drbd:pool/image@asdf:auth_supported=3Dnone,format=3Draw,if=3D= none,\ +id=3Ddrive-virtio-disk1 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-vir= tio-disk1,\ +id=3Dvirtio-disk1 \ +-drive 'file=3Drbd:pool/image@foo:auth_supported=3Dnone:mon_host=3Dmon1.ex= ample.org\:\ +6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=3Draw,if=3Dnon= e,\ +id=3Ddrive-virtio-disk2' \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-vir= tio-disk2,\ +id=3Dvirtio-disk2 \ +-drive file=3Drbd:pool/image@foo:auth_supported=3Dnone:conf=3D/blah/test.c= onf,\ +format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk3 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-vir= tio-disk3,\ +id=3Dvirtio-disk3 \ +-drive 'file=3Drbd:pool/image:id=3Dmyname:\ +key=3DQVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=3D:\ +auth_supported=3Dcephx\;none:mon_host=3Dmon1.example.org\:6321\;mon2.examp= le.org\:\ +6322\;mon3.example.org\:6322,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk= 4' \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x6,drive=3Ddrive-vir= tio-disk4,\ +id=3Dvirtio-disk4 \ +-drive 'file=3Drbd:pool/image:auth_supported=3Dnone:mon_host=3D[\:\:1]\:\ +6321\;example.org\:6789\;[ffff\:1234\:567\:abc\:\:0f]\:6322\;[2001\:db8\:\= :\ +ff00\:42\:8329]\:6322,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk5' \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x7,drive=3Ddrive-vir= tio-disk5,\ +id=3Dvirtio-disk5 \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args new file mode 100644 index 0000000000..0c5898cbd3 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args @@ -0,0 +1,61 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-i686 \ +-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 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,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 \ +-drive 'file=3Drbd:pool/image:auth_supported=3Dnone:mon_host=3Dmon1.exampl= e.org\:\ +6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=3Draw,if=3Dnon= e,\ +id=3Ddrive-virtio-disk0' \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Ddrive-vir= tio-disk0,\ +id=3Dvirtio-disk0,bootindex=3D1 \ +-drive file=3Drbd:pool/image@asdf:auth_supported=3Dnone,format=3Draw,if=3D= none,\ +id=3Ddrive-virtio-disk1 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-vir= tio-disk1,\ +id=3Dvirtio-disk1 \ +-drive 'file=3Drbd:pool/image@foo:auth_supported=3Dnone:mon_host=3Dmon1.ex= ample.org\:\ +6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=3Draw,if=3Dnon= e,\ +id=3Ddrive-virtio-disk2' \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-vir= tio-disk2,\ +id=3Dvirtio-disk2 \ +-drive file=3Drbd:pool/image@foo:auth_supported=3Dnone:conf=3D/blah/test.c= onf,\ +format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk3 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-vir= tio-disk3,\ +id=3Dvirtio-disk3 \ +-object secret,id=3Dvirtio-disk4-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-drive 'file=3Drbd:pool/image:id=3Dmyname:auth_supported=3Dcephx\;none:\ +mon_host=3Dmon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.or= g\:\ +6322,file.password-secret=3Dvirtio-disk4-secret0,format=3Draw,if=3Dnone,\ +id=3Ddrive-virtio-disk4' \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x6,drive=3Ddrive-vir= tio-disk4,\ +id=3Dvirtio-disk4 \ +-drive 'file=3Drbd:pool/image:auth_supported=3Dnone:mon_host=3D[\:\:1]\:\ +6321\;example.org\:6789\;[ffff\:1234\:567\:abc\:\:0f]\:6322\;[2001\:db8\:\= :\ +ff00\:42\:8329]\:6322,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk5' \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x7,drive=3Ddrive-vir= tio-disk5,\ +id=3Dvirtio-disk5 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-rbd.xml b/tests/qemuxml2ar= gvdata/disk-network-rbd.xml index e342ff3b2f..124a80cdf8 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.xml +++ b/tests/qemuxml2argvdata/disk-network-rbd.xml @@ -14,12 +14,6 @@ destroy /usr/bin/qemu-system-i686 - - - - -
- @@ -54,6 +48,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7019d65eb7..2db4d350a5 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1045,14 +1045,11 @@ mymain(void) DO_TEST_PARSE_ERROR("disk-network-source-auth-both", NONE); DO_TEST("disk-network-gluster", QEMU_CAPS_GLUSTER_DEBUG_LEVEL); - DO_TEST("disk-network-rbd", NONE); + DO_TEST_CAPS_VER("disk-network-rbd", "2.5.0"); + DO_TEST_CAPS_LATEST("disk-network-rbd"); + DO_TEST_FAILURE("disk-network-rbd-no-colon", NONE); DO_TEST("disk-network-sheepdog", NONE); - DO_TEST("disk-network-rbd-auth", NONE); DO_TEST("disk-network-source-auth", NONE); - DO_TEST("disk-network-rbd-auth-AES", - QEMU_CAPS_OBJECT_SECRET, QEMU_CAPS_VIRTIO_SCSI); - DO_TEST("disk-network-rbd-ipv6", NONE); - DO_TEST_FAILURE("disk-network-rbd-no-colon", NONE); DO_TEST("disk-network-vxhs", QEMU_CAPS_VXHS); driver.config->vxhsTLS =3D 1; DO_TEST("disk-network-tlsx509", QEMU_CAPS_VXHS, diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd-auth.xml b/tests/qem= uxml2xmloutdata/disk-network-rbd-auth.xml deleted file mode 100644 index b18335c1bd..0000000000 --- a/tests/qemuxml2xmloutdata/disk-network-rbd-auth.xml +++ /dev/null @@ -1,47 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - - - - - - - -
- - -
- - -
- - - - - - - diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd-ipv6.xml b/tests/qem= uxml2xmloutdata/disk-network-rbd-ipv6.xml deleted file mode 100644 index 765ee26a24..0000000000 --- a/tests/qemuxml2xmloutdata/disk-network-rbd-ipv6.xml +++ /dev/null @@ -1,45 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - - - - - -
- - -
- - -
- - - - - - - diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd.xml b/tests/qemuxml2= xmloutdata/disk-network-rbd.xml index 344fb9c107..a870bb82f8 100644 --- a/tests/qemuxml2xmloutdata/disk-network-rbd.xml +++ b/tests/qemuxml2xmloutdata/disk-network-rbd.xml @@ -14,12 +14,6 @@ destroy /usr/bin/qemu-system-i686 - - - - -
- @@ -58,6 +52,30 @@
+ + + + + + + + + + + +
+ + + + + + + + + + +
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index a0bf160ee6..a333d448c3 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -362,8 +362,6 @@ mymain(void) DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-network-gluster", NONE); DO_TEST("disk-network-rbd", NONE); - DO_TEST("disk-network-rbd-auth", NONE); - DO_TEST("disk-network-rbd-ipv6", NONE); DO_TEST("disk-network-source-auth", NONE); DO_TEST("disk-network-sheepdog", NONE); DO_TEST("disk-network-vxhs", NONE); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 1532015549453742.0798971198716; Thu, 19 Jul 2018 08:52:29 -0700 (PDT) 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 2DD44FEC9; Thu, 19 Jul 2018 15:52:28 +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 D619D60F86; Thu, 19 Jul 2018 15:52:27 +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 6CBEC18037F3; Thu, 19 Jul 2018 15:52:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpWEO028701 for ; Thu, 19 Jul 2018 11:51:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 41E7B1C5A6; Thu, 19 Jul 2018 15:51:32 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id D7B8D1C5B0 for ; Thu, 19 Jul 2018 15:51:31 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:51:11 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 19/24] tests: qemu: Remove pointless 'disks-many' test 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: , MIME-Version: 1.0 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.29]); Thu, 19 Jul 2018 15:52:28 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We have several cases when a VM has multiple disks in the test files so having another one without any interresting configuration is not necessary. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- tests/qemuxml2argvdata/disk-many.args | 32 --------------------- tests/qemuxml2argvdata/disk-many.xml | 48 ------------------------------- tests/qemuxml2argvtest.c | 1 - tests/qemuxml2xmloutdata/disk-many.xml | 52 ------------------------------= ---- tests/qemuxml2xmltest.c | 1 - 5 files changed, 134 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-many.args delete mode 100644 tests/qemuxml2argvdata/disk-many.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-many.xml diff --git a/tests/qemuxml2argvdata/disk-many.args b/tests/qemuxml2argvdata= /disk-many.args deleted file mode 100644 index 97baddd67e..0000000000 --- a/tests/qemuxml2argvdata/disk-many.args +++ /dev/null @@ -1,32 +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 \ --boot c \ --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 \ --drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-1 \ --device ide-drive,bus=3Dide.0,unit=3D1,drive=3Ddrive-ide0-0-1,id=3Dide0-0-= 1 \ --drive file=3D/tmp/data.img,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0 \ --device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-= 0 \ --drive file=3D/tmp/logs.img,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-1 \ --device ide-drive,bus=3Dide.1,unit=3D1,drive=3Ddrive-ide0-1-1,id=3Dide0-1-1 diff --git a/tests/qemuxml2argvdata/disk-many.xml b/tests/qemuxml2argvdata/= disk-many.xml deleted file mode 100644 index fb915ac489..0000000000 --- a/tests/qemuxml2argvdata/disk-many.xml +++ /dev/null @@ -1,48 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - - - - - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 2db4d350a5..3554b63428 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1002,7 +1002,6 @@ mymain(void) DO_TEST("disk-floppy-tray", NONE); DO_TEST("disk-virtio-s390", QEMU_CAPS_VIRTIO_S390); - DO_TEST("disk-many", NONE); DO_TEST("disk-virtio", QEMU_CAPS_DRIVE_BOOT); DO_TEST("disk-virtio-ccw", QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); diff --git a/tests/qemuxml2xmloutdata/disk-many.xml b/tests/qemuxml2xmloutd= ata/disk-many.xml deleted file mode 100644 index b7a971e51d..0000000000 --- a/tests/qemuxml2xmloutdata/disk-many.xml +++ /dev/null @@ -1,52 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - -
- - - - - -
- - - - - -
- - -
- - -
- - - - - - - diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index a333d448c3..795ddc7003 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -348,7 +348,6 @@ mymain(void) DO_TEST("disk-aio", NONE); DO_TEST("disk-cdrom", NONE); DO_TEST("disk-floppy", NONE); - DO_TEST("disk-many", NONE); DO_TEST("disk-usb-device", NONE); DO_TEST("disk-virtio", NONE); DO_TEST("floppy-drive-fat", NONE); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 1532015557264194.52253002218754; Thu, 19 Jul 2018 08:52:37 -0700 (PDT) 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 A424E804EF; Thu, 19 Jul 2018 15:52:35 +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 66CD210021B1; Thu, 19 Jul 2018 15:52: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 E46CF1800C99; Thu, 19 Jul 2018 15:52:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpXx6028711 for ; Thu, 19 Jul 2018 11:51:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id DD4E21C5A6; Thu, 19 Jul 2018 15:51:32 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7EC2C1C5B8 for ; Thu, 19 Jul 2018 15:51:32 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:51:12 +0200 Message-Id: <0ba2c8651a56d1fc66c9b9c26b77b4ea0f146795.1532015294.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 20/24] tests: qemuxml2argv: Add CAPS_LATEST version of 'disk-floppy' and 'floppy-drive-fat' 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: , MIME-Version: 1.0 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.27]); Thu, 19 Jul 2018 15:52:36 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- .../disk-floppy.x86_64-latest.args | 35 ++++++++++++++++++= ++++ .../floppy-drive-fat.x86_64-latest.args | 33 ++++++++++++++++++= ++ tests/qemuxml2argvtest.c | 2 ++ 3 files changed, 70 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.a= rgs diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-floppy.x86_64-latest.args new file mode 100644 index 0000000000..302e19b36a --- /dev/null +++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-i686 \ +-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 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,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 \ +-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/dev/fd0,format=3Draw,if=3Dnone,id=3Ddrive-fdc0-0-0 \ +-global isa-fdc.driveA=3Ddrive-fdc0-0-0 \ +-drive file=3D/tmp/firmware.img,format=3Draw,if=3Dnone,id=3Ddrive-fdc0-0-1= \ +-global isa-fdc.driveB=3Ddrive-fdc0-0-1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args b/t= ests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args new file mode 100644 index 0000000000..bf133aaab0 --- /dev/null +++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args @@ -0,0 +1,33 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-i686 \ +-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 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,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 \ +-drive file=3Dfat:floppy:/var/somefiles,if=3Dnone,id=3Ddrive-fdc0-0-0,read= only=3Don \ +-global isa-fdc.driveA=3Ddrive-fdc0-0-0 \ +-global isa-fdc.bootindexA=3D1 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3554b63428..06ba425da5 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -997,6 +997,7 @@ mymain(void) QEMU_CAPS_VIRTIO_TX_ALG); DO_TEST_CAPS_LATEST("disk-cdrom-tray"); DO_TEST("disk-floppy", NONE); + DO_TEST_CAPS_LATEST("disk-floppy"); DO_TEST_FAILURE("disk-floppy-pseries", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); DO_TEST("disk-floppy-tray", NONE); @@ -1019,6 +1020,7 @@ mymain(void) QEMU_CAPS_DRIVE_BOOT); DO_TEST("floppy-drive-fat", QEMU_CAPS_DRIVE_BOOT); + DO_TEST_CAPS_LATEST("floppy-drive-fat"); DO_TEST("disk-readonly-disk", NONE); DO_TEST("disk-fmt-qcow", QEMU_CAPS_DRIVE_BOOT); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 153201556862155.69507277326079; Thu, 19 Jul 2018 08:52:48 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id D47C52027A; Thu, 19 Jul 2018 15:52:46 +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 8A342177B5; Thu, 19 Jul 2018 15:52:46 +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 2FA3A24F63; Thu, 19 Jul 2018 15:52:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpX4v028716 for ; Thu, 19 Jul 2018 11:51:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 84EF11C5A6; Thu, 19 Jul 2018 15:51:33 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 26C491C5B0 for ; Thu, 19 Jul 2018 15:51:33 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:51:13 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 21/24] tests: qemuxml2argv: Add CAPS_LATEST version of 'disk-readonly' and '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: , MIME-Version: 1.0 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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 19 Jul 2018 15:52:47 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- .../disk-readonly-disk.x86_64-latest.args | 34 ++++++++++++++++++= ++ .../disk-shared.x86_64-latest.args | 37 ++++++++++++++++++= ++++ tests/qemuxml2argvtest.c | 2 ++ 3 files changed, 73 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest= .args create mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args new file mode 100644 index 0000000000..3fd8f5c849 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-i686 \ +-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 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,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 \ +-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/dev/sr0,format=3Draw,if=3Dnone,id=3Ddrive-ide0-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 \ +-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 new file mode 100644 index 0000000000..15f8c6b3d7 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args @@ -0,0 +1,37 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-i686 \ +-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 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,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 \ +-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,\ +bootindex=3D1,write-cache=3Don,serial=3DXYZXYZXYZYXXYZYZYXYZY \ +-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 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 06ba425da5..aef69aeb2e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1022,12 +1022,14 @@ mymain(void) QEMU_CAPS_DRIVE_BOOT); DO_TEST_CAPS_LATEST("floppy-drive-fat"); DO_TEST("disk-readonly-disk", NONE); + DO_TEST_CAPS_LATEST("disk-readonly-disk"); DO_TEST("disk-fmt-qcow", QEMU_CAPS_DRIVE_BOOT); DO_TEST_PARSE_ERROR("disk-fmt-cow", QEMU_CAPS_DRIVE_BOOT); DO_TEST_PARSE_ERROR("disk-fmt-dir", QEMU_CAPS_DRIVE_BOOT); DO_TEST_PARSE_ERROR("disk-fmt-iso", QEMU_CAPS_DRIVE_BOOT); DO_TEST("disk-shared", NONE); + 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); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 1532015573728990.2294445348722; Thu, 19 Jul 2018 08:52:53 -0700 (PDT) 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 699CA308FBA4; Thu, 19 Jul 2018 15:52:52 +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 13796102BCC4; Thu, 19 Jul 2018 15:52:52 +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 BA3D624F58; Thu, 19 Jul 2018 15:52:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpY3M028727 for ; Thu, 19 Jul 2018 11:51:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2BFEC1C5A6; Thu, 19 Jul 2018 15:51:34 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id C207F1C5B0 for ; Thu, 19 Jul 2018 15:51:33 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:51:14 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 22/24] tests: qemuxml2argv: Add CAPS_LATEST version of 'disk-network-gluster' 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: , MIME-Version: 1.0 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.43]); Thu, 19 Jul 2018 15:52:53 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- .../disk-network-gluster.x86_64-latest.args | 44 ++++++++++++++++++= ++++ tests/qemuxml2argvtest.c | 1 + 2 files changed, 45 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-late= st.args diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args new file mode 100644 index 0000000000..9b99db8715 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args @@ -0,0 +1,44 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-i686 \ +-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 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,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 \ +-drive file=3Dgluster://example.org:6000/Volume1/Image,file.debug=3D4,form= at=3Draw,\ +if=3Dnone,id=3Ddrive-virtio-disk0 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Ddrive-vir= tio-disk0,\ +id=3Dvirtio-disk0,bootindex=3D1 \ +-drive 'file=3Dgluster+unix:///Volume2/Image?socket=3D/path/to/sock,file.d= ebug=3D4,\ +format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk1' \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-vir= tio-disk1,\ +id=3Dvirtio-disk1 \ +-drive file.driver=3Dgluster,file.volume=3DVolume3,file.path=3DImage.qcow2= ,\ +file.server.0.type=3Dtcp,file.server.0.host=3Dexample.org,file.server.0.po= rt=3D6000,\ +file.server.1.type=3Dtcp,file.server.1.host=3Dexample.org,file.server.1.po= rt=3D24007,\ +file.server.2.type=3Dunix,file.server.2.socket=3D/path/to/sock,file.debug= =3D4,\ +format=3Dqcow2,if=3Dnone,id=3Ddrive-virtio-disk2 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-vir= tio-disk2,\ +id=3Dvirtio-disk2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index aef69aeb2e..0c6356f19f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1048,6 +1048,7 @@ mymain(void) DO_TEST_PARSE_ERROR("disk-network-source-auth-both", NONE); DO_TEST("disk-network-gluster", QEMU_CAPS_GLUSTER_DEBUG_LEVEL); + DO_TEST_CAPS_LATEST("disk-network-gluster"); DO_TEST_CAPS_VER("disk-network-rbd", "2.5.0"); DO_TEST_CAPS_LATEST("disk-network-rbd"); DO_TEST_FAILURE("disk-network-rbd-no-colon", NONE); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 1532015535401576.7926609289547; Thu, 19 Jul 2018 08:52:15 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BF332C0587FE; Thu, 19 Jul 2018 15:52:13 +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 8A505308BDB9; Thu, 19 Jul 2018 15:52:13 +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 E422318037F7; Thu, 19 Jul 2018 15:52:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpYtG028741 for ; Thu, 19 Jul 2018 11:51:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id C762D1C5A6; Thu, 19 Jul 2018 15:51:34 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 68F091C5B0 for ; Thu, 19 Jul 2018 15:51:34 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:51:15 +0200 Message-Id: <1a154987b06c8129432c456e82a7e835f4c4f31f.1532015294.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 23/24] tests: qemuxml2argv: Add CAPS_LATEST version of 'disk-network-sheepdog' 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: , MIME-Version: 1.0 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.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 19 Jul 2018 15:52:14 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- .../disk-network-sheepdog.x86_64-latest.args | 35 ++++++++++++++++++= ++++ tests/qemuxml2argvtest.c | 1 + 2 files changed, 36 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-lat= est.args diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.arg= s b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args new file mode 100644 index 0000000000..544c673820 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-i686 \ +-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 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,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 \ +-drive file=3D/dev/HostVG/QEMU,,Guest,,,,1,format=3Draw,if=3Dnone,id=3Ddri= ve-ide0-0-0 \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-drive file=3Dsheepdog:example.org:6000:image,,with,,commas,format=3Draw,i= f=3Dnone,\ +id=3Ddrive-virtio-disk0 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Ddrive-vir= tio-disk0,\ +id=3Dvirtio-disk0 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0c6356f19f..dfac925359 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1053,6 +1053,7 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-network-rbd"); DO_TEST_FAILURE("disk-network-rbd-no-colon", NONE); DO_TEST("disk-network-sheepdog", NONE); + DO_TEST_CAPS_LATEST("disk-network-sheepdog"); DO_TEST("disk-network-source-auth", NONE); DO_TEST("disk-network-vxhs", QEMU_CAPS_VXHS); driver.config->vxhsTLS =3D 1; --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 07:17:02 2024 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 1532015581226953.7857820683437; Thu, 19 Jul 2018 08:53:01 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 087003DBFC; Thu, 19 Jul 2018 15:52:58 +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 8C33E600C2; Thu, 19 Jul 2018 15:52:57 +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 40E0424F59; Thu, 19 Jul 2018 15:52:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpb7q028759 for ; Thu, 19 Jul 2018 11:51:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1E58B1C5B0; Thu, 19 Jul 2018 15:51:37 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id B40461C5A6 for ; Thu, 19 Jul 2018 15:51:34 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:51:16 +0200 Message-Id: <7e052c86e78ddee113396a554b62fa7e5733c74b.1532015294.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 24/24] tests: qemuxml2argv: Add CAPS_LATEST version of security-related 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: , MIME-Version: 1.0 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 19 Jul 2018 15:53:00 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 'disk-network-source-auth' and 'disk-netowrk-tlsx509' Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- .../disk-network-source-auth.x86_64-latest.args | 47 +++++++++++++++++ .../disk-network-tlsx509.x86_64-latest.args | 59 ++++++++++++++++++= ++++ tests/qemuxml2argvtest.c | 2 + 3 files changed, 108 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.x86_64-= latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-late= st.args diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.= args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args new file mode 100644 index 0000000000..9f124ec75f --- /dev/null +++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args @@ -0,0 +1,47 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-i686 \ +-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 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,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 \ +-object secret,id=3Dvirtio-disk0-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:6000,\ +file.target=3Diqn.1992-01.com.example:storage,file.lun=3D1,file.transport= =3Dtcp,\ +file.user=3Dmyname,file.password-secret=3Dvirtio-disk0-secret0,format=3Dra= w,if=3Dnone,\ +id=3Ddrive-virtio-disk0 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Ddrive-vir= tio-disk0,\ +id=3Dvirtio-disk0,bootindex=3D1 \ +-object secret,id=3Dvirtio-disk1-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-drive 'file=3Drbd:pool/image:id=3Dmyname:auth_supported=3Dcephx\;none:\ +mon_host=3Dmon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.or= g\:\ +6322,file.password-secret=3Dvirtio-disk1-secret0,format=3Draw,if=3Dnone,\ +id=3Ddrive-virtio-disk1' \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-vir= tio-disk1,\ +id=3Dvirtio-disk1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args new file mode 100644 index 0000000000..48d70e1cd3 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args @@ -0,0 +1,59 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-x86_64 \ +-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 \ +-cpu qemu32 \ +-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,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 \ +-object tls-creds-x509,id=3Dobjvirtio-disk0_tls0,dir=3D/etc/pki/libvirt-vx= hs/dummy,\ +,path,endpoint=3Dclient,verify-peer=3Dyes \ +-drive file.driver=3Dvxhs,file.tls-creds=3Dobjvirtio-disk0_tls0,\ +file.vdisk-id=3Deb90327c-8302-4725-9e1b-4e85ed4dc251,\ +file.server.host=3D192.168.0.1,file.server.port=3D9999,format=3Draw,if=3Dn= one,\ +id=3Ddrive-virtio-disk0,cache=3Dnone \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-vir= tio-disk0,\ +id=3Dvirtio-disk0,bootindex=3D1,write-cache=3Don,\ +serial=3Deb90327c-8302-4725-9e1b-4e85ed4dc251 \ +-object tls-creds-x509,id=3Dobjvirtio-disk1_tls0,dir=3D/etc/pki/libvirt-vx= hs/dummy,\ +,path,endpoint=3Dclient,verify-peer=3Dyes \ +-drive file.driver=3Dvxhs,file.tls-creds=3Dobjvirtio-disk1_tls0,\ +file.vdisk-id=3Deb90327c-8302-4725-9e1b-4e85ed4dc252,\ +file.server.host=3D192.168.0.2,file.server.port=3D9999,format=3Draw,if=3Dn= one,\ +id=3Ddrive-virtio-disk1,cache=3Dnone \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-vir= tio-disk1,\ +id=3Dvirtio-disk1,write-cache=3Don,serial=3Deb90327c-8302-4725-9e1b-4e85ed= 4dc252 \ +-drive file.driver=3Dvxhs,file.vdisk-id=3Deb90327c-8302-4725-9e1b-4e85ed4d= c253,\ +file.server.host=3D192.168.0.3,file.server.port=3D9999,format=3Draw,if=3Dn= one,\ +id=3Ddrive-virtio-disk2,cache=3Dnone \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x6,drive=3Ddrive-vir= tio-disk2,\ +id=3Dvirtio-disk2,write-cache=3Don,serial=3Deb90327c-8302-4725-9e1b-4e85ed= 4dc252 \ +-object tls-creds-x509,id=3Dobjvirtio-disk3_tls0,dir=3D/etc/pki/libvirt-nb= d/dummy,,\ +path,endpoint=3Dclient,verify-peer=3Dyes \ +-drive file.driver=3Dnbd,file.server.type=3Dinet,file.server.host=3Dexampl= e.com,\ +file.server.port=3D1234,file.tls-creds=3Dobjvirtio-disk3_tls0,format=3Draw= ,if=3Dnone,\ +id=3Ddrive-virtio-disk3,cache=3Dnone \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x7,drive=3Ddrive-vir= tio-disk3,\ +id=3Dvirtio-disk3,write-cache=3Don \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index dfac925359..1a936faef1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1055,10 +1055,12 @@ mymain(void) DO_TEST("disk-network-sheepdog", NONE); DO_TEST_CAPS_LATEST("disk-network-sheepdog"); DO_TEST("disk-network-source-auth", NONE); + DO_TEST_CAPS_LATEST("disk-network-source-auth"); DO_TEST("disk-network-vxhs", QEMU_CAPS_VXHS); driver.config->vxhsTLS =3D 1; DO_TEST("disk-network-tlsx509", QEMU_CAPS_VXHS, QEMU_CAPS_OBJECT_TLS_CREDS_X509, QEMU_CAPS_NBD_TLS); + DO_TEST_CAPS_LATEST("disk-network-tlsx509"); driver.config->vxhsTLS =3D 0; VIR_FREE(driver.config->vxhsTLSx509certdir); DO_TEST("disk-no-boot", --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list