[libvirt] [PATCH 00/24] tests: qemu: Clean up disk testing (blockdev-add saga)
Clean up many test files and add CAPS_LATEST versions of tests which will change when we switch from -drive to -blockdev This series removes many duplicated and obsolete tests and adds much more useful CAPS_LATEST testing Peter Krempa (24): tests: qemu: Drop 'drive' from disk tests tests: qemuxml2xml: Remove duplicate test disk-copy-on-read.xml tests: qemuxml2argv: Add 'CAPS_LATEST' version of "disk-copy_on_read" tests: qemuxml2argv: Remove tests obsoleted by assuming support for '-device' tests: qemuxml2argv: Unify network cdrom source testing tests: qemuxml2argv: Unify testing of local cdroms tests: qemuxml2argv: Add 'CAPS_LATEST' data for disk-cdrom* tests tests: qemuxml2argv: Add 'CAPS_LATEST' version for 'disk-detect-zeroes' tests: qemuxml2argv: Add 'CAPS_LATEST' version of 'disk-aio' test tests: qemuxml2argv: Rename disk-write-cache test do disk-cache tests: qemu: Add xml2xml and minimal version of 'disk-cache' test tests: qemu: Unify disk cache testing tests: qemu: Unify iscsi disk source testing tests: qemuxml2argv: Add 'CAPS_LATEST' version of 'disk-network-iscsi' tests: qemu: Unify nbd disk source testing tests: qemuxml2argv: Add 'CAPS_LATEST' version of 'disk-network-nbd' tests: qemu: Remove pointless 'disk-networ-ceph-env' test tests: qemuxml2argv: Unify testing of 'disk-network-rbd' tests: qemu: Remove pointless 'disks-many' test tests: qemuxml2argv: Add CAPS_LATEST version of 'disk-floppy' and 'floppy-drive-fat' tests: qemuxml2argv: Add CAPS_LATEST version of 'disk-readonly' and 'disk-shared' tests: qemuxml2argv: Add CAPS_LATEST version of 'disk-network-gluster' tests: qemuxml2argv: Add CAPS_LATEST version of 'disk-network-sheepdog' tests: qemuxml2argv: Add CAPS_LATEST version of security-related tests ...ress-conflict.xml => disk-address-conflict.xml} | 0 tests/qemuxml2argvdata/disk-aio.x86_64-latest.args | 37 +++++++ ...-drive-boot-cdrom.args => disk-boot-cdrom.args} | 0 ...sk-drive-boot-cdrom.xml => disk-boot-cdrom.xml} | 0 ...sk-drive-boot-disk.args => disk-boot-disk.args} | 0 ...disk-drive-boot-disk.xml => disk-boot-disk.xml} | 0 tests/qemuxml2argvdata/disk-cache.args | 41 ++++++++ ..._64-2.6.0.args => disk-cache.x86_64-2.6.0.args} | 3 + ..._64-2.7.0.args => disk-cache.x86_64-2.7.0.args} | 4 + ...4-latest.args => disk-cache.x86_64-latest.args} | 4 + .../{disk-drive-write-cache.xml => disk-cache.xml} | 6 ++ tests/qemuxml2argvdata/disk-cdrom-empty.args | 28 ------ tests/qemuxml2argvdata/disk-cdrom-empty.xml | 36 ------- 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 => disk-cdrom-network.args} | 9 ++ .../disk-cdrom-network.x86_64-latest.args | 41 ++++++++ ...om-network-https.xml => disk-cdrom-network.xml} | 27 +++++ .../disk-cdrom-tray-no-device-cap.args | 29 ------ .../disk-cdrom-tray-no-device-cap.xml | 32 ------ .../disk-cdrom-tray.x86_64-latest.args | 39 +++++++ tests/qemuxml2argvdata/disk-cdrom.args | 4 +- .../qemuxml2argvdata/disk-cdrom.x86_64-latest.args | 35 +++++++ tests/qemuxml2argvdata/disk-cdrom.xml | 6 ++ .../disk-copy_on_read.x86_64-latest.args | 41 ++++++++ ...-detect-zeroes.args => disk-detect-zeroes.args} | 0 .../disk-detect-zeroes.x86_64-latest.args | 37 +++++++ ...ve-detect-zeroes.xml => disk-detect-zeroes.xml} | 0 .../{disk-drive-discard.args => disk-discard.args} | 0 .../{disk-drive-discard.xml => disk-discard.xml} | 0 .../disk-drive-cache-directsync.args | 30 ------ .../disk-drive-cache-directsync.xml | 37 ------- .../qemuxml2argvdata/disk-drive-cache-unsafe.args | 30 ------ tests/qemuxml2argvdata/disk-drive-cache-unsafe.xml | 37 ------- .../qemuxml2argvdata/disk-drive-cache-v2-none.args | 30 ------ .../qemuxml2argvdata/disk-drive-cache-v2-none.xml | 37 ------- tests/qemuxml2argvdata/disk-drive-cache-v2-wb.args | 30 ------ tests/qemuxml2argvdata/disk-drive-cache-v2-wb.xml | 37 ------- tests/qemuxml2argvdata/disk-drive-cache-v2-wt.args | 30 ------ tests/qemuxml2argvdata/disk-drive-cache-v2-wt.xml | 37 ------- tests/qemuxml2argvdata/disk-drive-copy-on-read.xml | 30 ------ .../disk-drive-network-iscsi-lun.args | 29 ------ .../disk-drive-network-iscsi-lun.xml | 28 ------ .../qemuxml2argvdata/disk-drive-network-iscsi.args | 32 ------ .../qemuxml2argvdata/disk-drive-network-iscsi.xml | 37 ------- .../disk-drive-network-nbd-export.args | 30 ------ .../disk-drive-network-nbd-export.xml | 37 ------- .../disk-drive-network-nbd-ipv6-export.args | 29 ------ .../disk-drive-network-nbd-ipv6-export.xml | 37 ------- .../disk-drive-network-nbd-ipv6.args | 29 ------ .../disk-drive-network-nbd-ipv6.xml | 37 ------- .../disk-drive-network-nbd-unix.args | 30 ------ .../disk-drive-network-nbd-unix.xml | 37 ------- tests/qemuxml2argvdata/disk-drive-network-nbd.args | 29 ------ tests/qemuxml2argvdata/disk-drive-network-nbd.xml | 37 ------- .../disk-drive-network-rbd-auth-AES.xml | 55 ---------- .../disk-drive-network-rbd-auth.args | 32 ------ .../disk-drive-network-rbd-auth.xml | 42 -------- .../disk-drive-network-rbd-ceph-env.args | 25 ----- .../disk-drive-network-rbd-ceph-env.xml | 39 ------- .../disk-drive-network-rbd-ipv6.args | 31 ------ .../disk-drive-network-rbd-ipv6.xml | 40 -------- .../disk-drive-readonly-no-device.args | 30 ------ .../disk-drive-readonly-no-device.xml | 32 ------ ...ve-error-policy.args => disk-error-policy.args} | 0 ...t.args => disk-error-policy.x86_64-latest.args} | 0 ...rive-error-policy.xml => disk-error-policy.xml} | 0 .../disk-floppy-tray-no-device-cap.xml | 37 ------- ...ice-cap.args => disk-floppy.x86_64-latest.args} | 20 ++-- .../{disk-drive-fmt-cow.xml => disk-fmt-cow.xml} | 0 .../{disk-drive-fmt-dir.xml => disk-fmt-dir.xml} | 0 .../{disk-drive-fmt-iso.xml => disk-fmt-iso.xml} | 0 ...disk-drive-fmt-qcow.args => disk-fmt-qcow.args} | 0 .../{disk-drive-fmt-qcow.xml => disk-fmt-qcow.xml} | 0 ...sk-ide-drive-split.args => disk-ide-split.args} | 0 ...disk-ide-drive-split.xml => disk-ide-split.xml} | 0 tests/qemuxml2argvdata/disk-many.args | 32 ------ tests/qemuxml2argvdata/disk-many.xml | 48 --------- ...work-gluster.args => disk-network-gluster.args} | 0 .../disk-network-gluster.x86_64-latest.args | 44 ++++++++ ...etwork-gluster.xml => disk-network-gluster.xml} | 0 ...disk-network-iscsi-auth-secrettype-invalid.xml} | 0 ...> disk-network-iscsi-auth-wrong-secrettype.xml} | 0 ...ork-iscsi-auth.args => disk-network-iscsi.args} | 25 +++-- .../disk-network-iscsi.x86_64-latest.args | 63 ++++++++++++ ...twork-iscsi-auth.xml => disk-network-iscsi.xml} | 26 ++++- ...rive-network-rbd.args => disk-network-nbd.args} | 21 ++-- .../disk-network-nbd.x86_64-latest.args | 46 +++++++++ tests/qemuxml2argvdata/disk-network-nbd.xml | 59 +++++++++++ ...-no-colon.xml => disk-network-rbd-no-colon.xml} | 0 .../disk-network-rbd.x86_64-2.5.0.args | 55 ++++++++++ .../disk-network-rbd.x86_64-latest.args | 61 +++++++++++ ...-drive-network-rbd.xml => disk-network-rbd.xml} | 28 ++++-- ...rk-sheepdog.args => disk-network-sheepdog.args} | 0 .../disk-network-sheepdog.x86_64-latest.args | 35 +++++++ ...work-sheepdog.xml => disk-network-sheepdog.xml} | 0 ...-both.xml => disk-network-source-auth-both.xml} | 0 ...rce-auth.args => disk-network-source-auth.args} | 0 ...=> disk-network-source-auth.x86_64-latest.args} | 38 +++---- ...ource-auth.xml => disk-network-source-auth.xml} | 0 ...work-tlsx509.args => disk-network-tlsx509.args} | 0 .../disk-network-tlsx509.x86_64-latest.args | 59 +++++++++++ ...etwork-tlsx509.xml => disk-network-tlsx509.xml} | 0 ...ve-network-vxhs.args => disk-network-vxhs.args} | 0 ...rive-network-vxhs.xml => disk-network-vxhs.xml} | 0 .../{disk-drive-no-boot.args => disk-no-boot.args} | 0 .../{disk-drive-no-boot.xml => disk-no-boot.xml} | 0 ...-readonly-disk.args => disk-readonly-disk.args} | 0 .../disk-readonly-disk.x86_64-latest.args | 34 +++++++ ...ve-readonly-disk.xml => disk-readonly-disk.xml} | 0 ...hared-locking.args => disk-shared-locking.args} | 0 ...-shared-locking.xml => disk-shared-locking.xml} | 0 ...-drive-shared-qcow.xml => disk-shared-qcow.xml} | 0 .../{disk-drive-shared.args => disk-shared.args} | 0 .../disk-shared.x86_64-latest.args | 37 +++++++ .../{disk-drive-shared.xml => disk-shared.xml} | 0 ...o-drive-queues.args => disk-virtio-queues.args} | 0 ...tio-drive-queues.xml => disk-virtio-queues.xml} | 0 .../floppy-drive-fat.x86_64-latest.args | 33 ++++++ tests/qemuxml2argvtest.c | 112 ++++++++++----------- ...sk-drive-boot-cdrom.xml => disk-boot-cdrom.xml} | 0 ...disk-drive-boot-disk.xml => disk-boot-disk.xml} | 0 .../{disk-many.xml => disk-cache.xml} | 36 ++++--- tests/qemuxml2xmloutdata/disk-cdrom-empty.xml | 40 -------- tests/qemuxml2xmloutdata/disk-cdrom.xml | 6 ++ tests/qemuxml2xmloutdata/disk-detect-zeroes.xml | 1 + .../{disk-drive-discard.xml => disk-discard.xml} | 0 .../disk-drive-cache-directsync.xml | 41 -------- .../qemuxml2xmloutdata/disk-drive-cache-unsafe.xml | 41 -------- .../disk-drive-cache-v2-none.xml | 41 -------- .../qemuxml2xmloutdata/disk-drive-cache-v2-wb.xml | 41 -------- .../qemuxml2xmloutdata/disk-drive-cache-v2-wt.xml | 41 -------- .../qemuxml2xmloutdata/disk-drive-copy-on-read.xml | 36 ------- .../disk-drive-detect-zeroes.xml | 1 - .../disk-drive-network-iscsi.xml | 41 -------- .../disk-drive-network-nbd-export.xml | 42 -------- .../disk-drive-network-nbd-ipv6-export.xml | 42 -------- .../disk-drive-network-nbd-ipv6.xml | 42 -------- .../disk-drive-network-nbd-unix.xml | 42 -------- .../qemuxml2xmloutdata/disk-drive-network-nbd.xml | 42 -------- .../disk-drive-network-rbd-auth.xml | 47 --------- .../disk-drive-network-rbd-ceph-env.xml | 44 -------- .../disk-drive-network-rbd-ipv6.xml | 45 --------- ...rive-error-policy.xml => disk-error-policy.xml} | 0 .../{disk-drive-fat.xml => disk-fat.xml} | 0 .../{disk-drive-fmt-qcow.xml => disk-fmt-qcow.xml} | 0 ...etwork-gluster.xml => disk-network-gluster.xml} | 0 ...twork-iscsi-auth.xml => disk-network-iscsi.xml} | 35 ++++++- tests/qemuxml2xmloutdata/disk-network-nbd.xml | 68 +++++++++++++ ...-drive-network-rbd.xml => disk-network-rbd.xml} | 30 ++++-- ...work-sheepdog.xml => disk-network-sheepdog.xml} | 0 ...ource-auth.xml => disk-network-source-auth.xml} | 0 ...etwork-tlsx509.xml => disk-network-tlsx509.xml} | 0 ...rive-network-vxhs.xml => disk-network-vxhs.xml} | 0 ...tio-drive-queues.xml => disk-virtio-queues.xml} | 0 tests/qemuxml2xmltest.c | 47 +++------ 162 files changed, 1184 insertions(+), 2481 deletions(-) rename tests/qemuxml2argvdata/{disk-drive-address-conflict.xml => disk-address-conflict.xml} (100%) create mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-boot-cdrom.args => disk-boot-cdrom.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-boot-cdrom.xml => disk-boot-cdrom.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-boot-disk.args => disk-boot-disk.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-boot-disk.xml => disk-boot-disk.xml} (100%) create mode 100644 tests/qemuxml2argvdata/disk-cache.args rename tests/qemuxml2argvdata/{disk-drive-write-cache.x86_64-2.6.0.args => disk-cache.x86_64-2.6.0.args} (90%) rename tests/qemuxml2argvdata/{disk-drive-write-cache.x86_64-2.7.0.args => disk-cache.x86_64-2.7.0.args} (90%) rename tests/qemuxml2argvdata/{disk-drive-write-cache.x86_64-latest.args => disk-cache.x86_64-latest.args} (90%) rename tests/qemuxml2argvdata/{disk-drive-write-cache.xml => disk-cache.xml} (86%) delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-empty.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-empty.xml 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 => disk-cdrom-network.args} (58%) create mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-cdrom-network-https.xml => disk-cdrom-network.xml} (52%) delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.xml create mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-detect-zeroes.args => disk-detect-zeroes.args} (100%) create mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-detect-zeroes.xml => disk-detect-zeroes.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-discard.args => disk-discard.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-discard.xml => disk-discard.xml} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-directsync.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-directsync.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-unsafe.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-unsafe.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-none.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-none.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-wb.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-wb.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-wt.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-wt.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-copy-on-read.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-iscsi-lun.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-iscsi-lun.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-iscsi.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-iscsi.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-export.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-export.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6-export.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6-export.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-unix.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-unix.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-auth-AES.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-auth.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-auth.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-ceph-env.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-ceph-env.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-ipv6.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-ipv6.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-readonly-no-device.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-readonly-no-device.xml rename tests/qemuxml2argvdata/{disk-drive-error-policy.args => disk-error-policy.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-error-policy.x86_64-latest.args => disk-error-policy.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-error-policy.xml => disk-error-policy.xml} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.xml rename tests/qemuxml2argvdata/{disk-floppy-tray-no-device-cap.args => disk-floppy.x86_64-latest.args} (53%) rename tests/qemuxml2argvdata/{disk-drive-fmt-cow.xml => disk-fmt-cow.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-dir.xml => disk-fmt-dir.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-iso.xml => disk-fmt-iso.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-qcow.args => disk-fmt-qcow.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-qcow.xml => disk-fmt-qcow.xml} (100%) rename tests/qemuxml2argvdata/{disk-ide-drive-split.args => disk-ide-split.args} (100%) rename tests/qemuxml2argvdata/{disk-ide-drive-split.xml => disk-ide-split.xml} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-many.args delete mode 100644 tests/qemuxml2argvdata/disk-many.xml rename tests/qemuxml2argvdata/{disk-drive-network-gluster.args => disk-network-gluster.args} (100%) create mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-network-gluster.xml => disk-network-gluster.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth-secrettype-invalid.xml => disk-network-iscsi-auth-secrettype-invalid.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth-wrong-secrettype.xml => disk-network-iscsi-auth-wrong-secrettype.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth.args => disk-network-iscsi.args} (54%) create mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth.xml => disk-network-iscsi.xml} (63%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd.args => disk-network-nbd.args} (56%) create mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-nbd.xml rename tests/qemuxml2argvdata/{disk-drive-network-rbd-no-colon.xml => disk-network-rbd-no-colon.xml} (100%) create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-network-rbd.xml => disk-network-rbd.xml} (71%) rename tests/qemuxml2argvdata/{disk-drive-network-sheepdog.args => disk-network-sheepdog.args} (100%) create mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-network-sheepdog.xml => disk-network-sheepdog.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-source-auth-both.xml => disk-network-source-auth-both.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-source-auth.args => disk-network-source-auth.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-auth-AES.args => disk-network-source-auth.x86_64-latest.args} (51%) rename tests/qemuxml2argvdata/{disk-drive-network-source-auth.xml => disk-network-source-auth.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-tlsx509.args => disk-network-tlsx509.args} (100%) create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-network-tlsx509.xml => disk-network-tlsx509.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-vxhs.args => disk-network-vxhs.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-vxhs.xml => disk-network-vxhs.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-no-boot.args => disk-no-boot.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-no-boot.xml => disk-no-boot.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-readonly-disk.args => disk-readonly-disk.args} (100%) create mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-readonly-disk.xml => disk-readonly-disk.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared-locking.args => disk-shared-locking.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared-locking.xml => disk-shared-locking.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared-qcow.xml => disk-shared-qcow.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared.args => disk-shared.args} (100%) create mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-shared.xml => disk-shared.xml} (100%) rename tests/qemuxml2argvdata/{disk-virtio-drive-queues.args => disk-virtio-queues.args} (100%) rename tests/qemuxml2argvdata/{disk-virtio-drive-queues.xml => disk-virtio-queues.xml} (100%) create mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args rename tests/qemuxml2xmloutdata/{disk-drive-boot-cdrom.xml => disk-boot-cdrom.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-boot-disk.xml => disk-boot-disk.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-many.xml => disk-cache.xml} (54%) delete mode 100644 tests/qemuxml2xmloutdata/disk-cdrom-empty.xml create mode 120000 tests/qemuxml2xmloutdata/disk-detect-zeroes.xml rename tests/qemuxml2xmloutdata/{disk-drive-discard.xml => disk-discard.xml} (100%) delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-cache-directsync.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-cache-unsafe.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-cache-v2-none.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-cache-v2-wb.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-cache-v2-wt.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml delete mode 120000 tests/qemuxml2xmloutdata/disk-drive-detect-zeroes.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-iscsi.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-nbd-export.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6-export.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-nbd-unix.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-nbd.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-rbd-auth.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-rbd-ceph-env.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-rbd-ipv6.xml rename tests/qemuxml2xmloutdata/{disk-drive-error-policy.xml => disk-error-policy.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-fat.xml => disk-fat.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-fmt-qcow.xml => disk-fmt-qcow.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-gluster.xml => disk-network-gluster.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-iscsi-auth.xml => disk-network-iscsi.xml} (59%) create mode 100644 tests/qemuxml2xmloutdata/disk-network-nbd.xml rename tests/qemuxml2xmloutdata/{disk-drive-network-rbd.xml => disk-network-rbd.xml} (72%) rename tests/qemuxml2xmloutdata/{disk-drive-network-sheepdog.xml => disk-network-sheepdog.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-source-auth.xml => disk-network-source-auth.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-tlsx509.xml => disk-network-tlsx509.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-vxhs.xml => disk-network-vxhs.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-virtio-drive-queues.xml => disk-virtio-queues.xml} (100%) -- 2.16.2
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...ress-conflict.xml => disk-address-conflict.xml} | 0 ...-drive-boot-cdrom.args => disk-boot-cdrom.args} | 0 ...sk-drive-boot-cdrom.xml => disk-boot-cdrom.xml} | 0 ...sk-drive-boot-disk.args => disk-boot-disk.args} | 0 ...disk-drive-boot-disk.xml => disk-boot-disk.xml} | 0 ...-directsync.args => disk-cache-directsync.args} | 0 ...he-directsync.xml => disk-cache-directsync.xml} | 0 ...ve-cache-unsafe.args => disk-cache-unsafe.args} | 0 ...rive-cache-unsafe.xml => disk-cache-unsafe.xml} | 0 ...-cache-v2-none.args => disk-cache-v2-none.args} | 0 ...ve-cache-v2-none.xml => disk-cache-v2-none.xml} | 0 ...rive-cache-v2-wb.args => disk-cache-v2-wb.args} | 0 ...-drive-cache-v2-wb.xml => disk-cache-v2-wb.xml} | 0 ...rive-cache-v2-wt.args => disk-cache-v2-wt.args} | 0 ...-drive-cache-v2-wt.xml => disk-cache-v2-wt.xml} | 0 ...rive-copy-on-read.xml => disk-copy-on-read.xml} | 0 ...-detect-zeroes.args => disk-detect-zeroes.args} | 0 ...ve-detect-zeroes.xml => disk-detect-zeroes.xml} | 0 .../{disk-drive-discard.args => disk-discard.args} | 0 .../{disk-drive-discard.xml => disk-discard.xml} | 0 ...ve-error-policy.args => disk-error-policy.args} | 0 ...t.args => disk-error-policy.x86_64-latest.args} | 0 ...rive-error-policy.xml => disk-error-policy.xml} | 0 .../{disk-drive-fmt-cow.xml => disk-fmt-cow.xml} | 0 .../{disk-drive-fmt-dir.xml => disk-fmt-dir.xml} | 0 .../{disk-drive-fmt-iso.xml => disk-fmt-iso.xml} | 0 ...disk-drive-fmt-qcow.args => disk-fmt-qcow.args} | 0 .../{disk-drive-fmt-qcow.xml => disk-fmt-qcow.xml} | 0 ...sk-ide-drive-split.args => disk-ide-split.args} | 0 ...disk-ide-drive-split.xml => disk-ide-split.xml} | 0 ...work-gluster.args => disk-network-gluster.args} | 0 ...etwork-gluster.xml => disk-network-gluster.xml} | 0 ...disk-network-iscsi-auth-secrettype-invalid.xml} | 0 ...> disk-network-iscsi-auth-wrong-secrettype.xml} | 0 ...scsi-auth.args => disk-network-iscsi-auth.args} | 0 ...-iscsi-auth.xml => disk-network-iscsi-auth.xml} | 0 ...-iscsi-lun.args => disk-network-iscsi-lun.args} | 0 ...rk-iscsi-lun.xml => disk-network-iscsi-lun.xml} | 0 ...-network-iscsi.args => disk-network-iscsi.args} | 0 ...ve-network-iscsi.xml => disk-network-iscsi.xml} | 0 ...bd-export.args => disk-network-nbd-export.args} | 0 ...-nbd-export.xml => disk-network-nbd-export.xml} | 0 ...port.args => disk-network-nbd-ipv6-export.args} | 0 ...export.xml => disk-network-nbd-ipv6-export.xml} | 0 ...rk-nbd-ipv6.args => disk-network-nbd-ipv6.args} | 0 ...work-nbd-ipv6.xml => disk-network-nbd-ipv6.xml} | 0 ...rk-nbd-unix.args => disk-network-nbd-unix.args} | 0 ...work-nbd-unix.xml => disk-network-nbd-unix.xml} | 0 ...rive-network-nbd.args => disk-network-nbd.args} | 0 ...-drive-network-nbd.xml => disk-network-nbd.xml} | 0 ...uth-AES.args => disk-network-rbd-auth-AES.args} | 0 ...-auth-AES.xml => disk-network-rbd-auth-AES.xml} | 0 ...rk-rbd-auth.args => disk-network-rbd-auth.args} | 0 ...work-rbd-auth.xml => disk-network-rbd-auth.xml} | 0 ...eph-env.args => disk-network-rbd-ceph-env.args} | 0 ...-ceph-env.xml => disk-network-rbd-ceph-env.xml} | 0 ...rk-rbd-ipv6.args => disk-network-rbd-ipv6.args} | 0 ...work-rbd-ipv6.xml => disk-network-rbd-ipv6.xml} | 0 ...-no-colon.xml => disk-network-rbd-no-colon.xml} | 0 ...rive-network-rbd.args => disk-network-rbd.args} | 0 ...-drive-network-rbd.xml => disk-network-rbd.xml} | 0 ...rk-sheepdog.args => disk-network-sheepdog.args} | 0 ...work-sheepdog.xml => disk-network-sheepdog.xml} | 0 ...-both.xml => disk-network-source-auth-both.xml} | 0 ...rce-auth.args => disk-network-source-auth.args} | 0 ...ource-auth.xml => disk-network-source-auth.xml} | 0 ...work-tlsx509.args => disk-network-tlsx509.args} | 0 ...etwork-tlsx509.xml => disk-network-tlsx509.xml} | 0 ...ve-network-vxhs.args => disk-network-vxhs.args} | 0 ...rive-network-vxhs.xml => disk-network-vxhs.xml} | 0 .../{disk-drive-no-boot.args => disk-no-boot.args} | 0 .../{disk-drive-no-boot.xml => disk-no-boot.xml} | 0 ...-readonly-disk.args => disk-readonly-disk.args} | 0 ...ve-readonly-disk.xml => disk-readonly-disk.xml} | 0 ...no-device.args => disk-readonly-no-device.args} | 0 ...y-no-device.xml => disk-readonly-no-device.xml} | 0 ...hared-locking.args => disk-shared-locking.args} | 0 ...-shared-locking.xml => disk-shared-locking.xml} | 0 ...-drive-shared-qcow.xml => disk-shared-qcow.xml} | 0 .../{disk-drive-shared.args => disk-shared.args} | 0 .../{disk-drive-shared.xml => disk-shared.xml} | 0 ...o-drive-queues.args => disk-virtio-queues.args} | 0 ...tio-drive-queues.xml => disk-virtio-queues.xml} | 0 ...6.0.args => disk-write-cache.x86_64-2.6.0.args} | 0 ...7.0.args => disk-write-cache.x86_64-2.7.0.args} | 0 ...st.args => disk-write-cache.x86_64-latest.args} | 0 ...-drive-write-cache.xml => disk-write-cache.xml} | 0 tests/qemuxml2argvtest.c | 96 +++++++++++----------- ...sk-drive-boot-cdrom.xml => disk-boot-cdrom.xml} | 0 ...disk-drive-boot-disk.xml => disk-boot-disk.xml} | 0 ...he-directsync.xml => disk-cache-directsync.xml} | 0 ...rive-cache-unsafe.xml => disk-cache-unsafe.xml} | 0 ...ve-cache-v2-none.xml => disk-cache-v2-none.xml} | 0 ...-drive-cache-v2-wb.xml => disk-cache-v2-wb.xml} | 0 ...-drive-cache-v2-wt.xml => disk-cache-v2-wt.xml} | 0 ...rive-copy-on-read.xml => disk-copy-on-read.xml} | 0 tests/qemuxml2xmloutdata/disk-detect-zeroes.xml | 1 + .../{disk-drive-discard.xml => disk-discard.xml} | 0 .../disk-drive-detect-zeroes.xml | 1 - ...rive-error-policy.xml => disk-error-policy.xml} | 0 .../{disk-drive-fat.xml => disk-fat.xml} | 0 .../{disk-drive-fmt-qcow.xml => disk-fmt-qcow.xml} | 0 ...etwork-gluster.xml => disk-network-gluster.xml} | 0 ...-iscsi-auth.xml => disk-network-iscsi-auth.xml} | 0 ...ve-network-iscsi.xml => disk-network-iscsi.xml} | 0 ...-nbd-export.xml => disk-network-nbd-export.xml} | 0 ...export.xml => disk-network-nbd-ipv6-export.xml} | 0 ...work-nbd-ipv6.xml => disk-network-nbd-ipv6.xml} | 0 ...work-nbd-unix.xml => disk-network-nbd-unix.xml} | 0 ...-drive-network-nbd.xml => disk-network-nbd.xml} | 0 ...work-rbd-auth.xml => disk-network-rbd-auth.xml} | 0 ...-ceph-env.xml => disk-network-rbd-ceph-env.xml} | 0 ...work-rbd-ipv6.xml => disk-network-rbd-ipv6.xml} | 0 ...-drive-network-rbd.xml => disk-network-rbd.xml} | 0 ...work-sheepdog.xml => disk-network-sheepdog.xml} | 0 ...ource-auth.xml => disk-network-source-auth.xml} | 0 ...etwork-tlsx509.xml => disk-network-tlsx509.xml} | 0 ...rive-network-vxhs.xml => disk-network-vxhs.xml} | 0 ...tio-drive-queues.xml => disk-virtio-queues.xml} | 0 tests/qemuxml2xmltest.c | 58 ++++++------- 120 files changed, 78 insertions(+), 78 deletions(-) rename tests/qemuxml2argvdata/{disk-drive-address-conflict.xml => disk-address-conflict.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-boot-cdrom.args => disk-boot-cdrom.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-boot-cdrom.xml => disk-boot-cdrom.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-boot-disk.args => disk-boot-disk.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-boot-disk.xml => disk-boot-disk.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-directsync.args => disk-cache-directsync.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-directsync.xml => disk-cache-directsync.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-unsafe.args => disk-cache-unsafe.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-unsafe.xml => disk-cache-unsafe.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-v2-none.args => disk-cache-v2-none.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-v2-none.xml => disk-cache-v2-none.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-v2-wb.args => disk-cache-v2-wb.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-v2-wb.xml => disk-cache-v2-wb.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-v2-wt.args => disk-cache-v2-wt.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-v2-wt.xml => disk-cache-v2-wt.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-copy-on-read.xml => disk-copy-on-read.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-detect-zeroes.args => disk-detect-zeroes.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-detect-zeroes.xml => disk-detect-zeroes.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-discard.args => disk-discard.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-discard.xml => disk-discard.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-error-policy.args => disk-error-policy.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-error-policy.x86_64-latest.args => disk-error-policy.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-error-policy.xml => disk-error-policy.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-cow.xml => disk-fmt-cow.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-dir.xml => disk-fmt-dir.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-iso.xml => disk-fmt-iso.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-qcow.args => disk-fmt-qcow.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-qcow.xml => disk-fmt-qcow.xml} (100%) rename tests/qemuxml2argvdata/{disk-ide-drive-split.args => disk-ide-split.args} (100%) rename tests/qemuxml2argvdata/{disk-ide-drive-split.xml => disk-ide-split.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-gluster.args => disk-network-gluster.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-gluster.xml => disk-network-gluster.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth-secrettype-invalid.xml => disk-network-iscsi-auth-secrettype-invalid.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth-wrong-secrettype.xml => disk-network-iscsi-auth-wrong-secrettype.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth.args => disk-network-iscsi-auth.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth.xml => disk-network-iscsi-auth.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-lun.args => disk-network-iscsi-lun.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-lun.xml => disk-network-iscsi-lun.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi.args => disk-network-iscsi.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi.xml => disk-network-iscsi.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-export.args => disk-network-nbd-export.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-export.xml => disk-network-nbd-export.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-ipv6-export.args => disk-network-nbd-ipv6-export.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-ipv6-export.xml => disk-network-nbd-ipv6-export.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-ipv6.args => disk-network-nbd-ipv6.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-ipv6.xml => disk-network-nbd-ipv6.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-unix.args => disk-network-nbd-unix.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-unix.xml => disk-network-nbd-unix.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd.args => disk-network-nbd.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd.xml => disk-network-nbd.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-auth-AES.args => disk-network-rbd-auth-AES.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-auth-AES.xml => disk-network-rbd-auth-AES.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-auth.args => disk-network-rbd-auth.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-auth.xml => disk-network-rbd-auth.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-ceph-env.args => disk-network-rbd-ceph-env.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-ceph-env.xml => disk-network-rbd-ceph-env.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-ipv6.args => disk-network-rbd-ipv6.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-ipv6.xml => disk-network-rbd-ipv6.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-no-colon.xml => disk-network-rbd-no-colon.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd.args => disk-network-rbd.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd.xml => disk-network-rbd.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-sheepdog.args => disk-network-sheepdog.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-sheepdog.xml => disk-network-sheepdog.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-source-auth-both.xml => disk-network-source-auth-both.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-source-auth.args => disk-network-source-auth.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-source-auth.xml => disk-network-source-auth.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-tlsx509.args => disk-network-tlsx509.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-tlsx509.xml => disk-network-tlsx509.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-vxhs.args => disk-network-vxhs.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-vxhs.xml => disk-network-vxhs.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-no-boot.args => disk-no-boot.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-no-boot.xml => disk-no-boot.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-readonly-disk.args => disk-readonly-disk.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-readonly-disk.xml => disk-readonly-disk.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-readonly-no-device.args => disk-readonly-no-device.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-readonly-no-device.xml => disk-readonly-no-device.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared-locking.args => disk-shared-locking.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared-locking.xml => disk-shared-locking.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared-qcow.xml => disk-shared-qcow.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared.args => disk-shared.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared.xml => disk-shared.xml} (100%) rename tests/qemuxml2argvdata/{disk-virtio-drive-queues.args => disk-virtio-queues.args} (100%) rename tests/qemuxml2argvdata/{disk-virtio-drive-queues.xml => disk-virtio-queues.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-write-cache.x86_64-2.6.0.args => disk-write-cache.x86_64-2.6.0.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-write-cache.x86_64-2.7.0.args => disk-write-cache.x86_64-2.7.0.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-write-cache.x86_64-latest.args => disk-write-cache.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-write-cache.xml => disk-write-cache.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-boot-cdrom.xml => disk-boot-cdrom.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-boot-disk.xml => disk-boot-disk.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-cache-directsync.xml => disk-cache-directsync.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-cache-unsafe.xml => disk-cache-unsafe.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-cache-v2-none.xml => disk-cache-v2-none.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-cache-v2-wb.xml => disk-cache-v2-wb.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-cache-v2-wt.xml => disk-cache-v2-wt.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-copy-on-read.xml => disk-copy-on-read.xml} (100%) create mode 120000 tests/qemuxml2xmloutdata/disk-detect-zeroes.xml rename tests/qemuxml2xmloutdata/{disk-drive-discard.xml => disk-discard.xml} (100%) delete mode 120000 tests/qemuxml2xmloutdata/disk-drive-detect-zeroes.xml rename tests/qemuxml2xmloutdata/{disk-drive-error-policy.xml => disk-error-policy.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-fat.xml => disk-fat.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-fmt-qcow.xml => disk-fmt-qcow.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-gluster.xml => disk-network-gluster.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-iscsi-auth.xml => disk-network-iscsi-auth.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-iscsi.xml => disk-network-iscsi.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-nbd-export.xml => disk-network-nbd-export.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-nbd-ipv6-export.xml => disk-network-nbd-ipv6-export.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-nbd-ipv6.xml => disk-network-nbd-ipv6.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-nbd-unix.xml => disk-network-nbd-unix.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-nbd.xml => disk-network-nbd.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-rbd-auth.xml => disk-network-rbd-auth.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-rbd-ceph-env.xml => disk-network-rbd-ceph-env.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-rbd-ipv6.xml => disk-network-rbd-ipv6.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-rbd.xml => disk-network-rbd.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-sheepdog.xml => disk-network-sheepdog.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-source-auth.xml => disk-network-source-auth.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-tlsx509.xml => disk-network-tlsx509.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-vxhs.xml => disk-network-vxhs.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-virtio-drive-queues.xml => disk-virtio-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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/tests/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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.args b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-error-policy.x86_64-latest.args rename to tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-drive-error-policy.xml b/tests/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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-secrettype-invalid.xml b/tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid.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-secrettype.xml b/tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-iscsi-auth-wrong-secrettype.xml rename to tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-iscsi-auth.args b/tests/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/tests/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/tests/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/tests/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/qemuxml2argvdata/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/qemuxml2argvdata/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/tests/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/tests/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/tests/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/tests/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/qemuxml2argvdata/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/qemuxml2argvdata/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/tests/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/tests/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/tests/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/tests/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/tests/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/qemuxml2argvdata/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/qemuxml2argvdata/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/tests/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/tests/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/tests/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/tests/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/tests/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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.args 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.args 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.args 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/qemuxml2argvdata/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 = 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 = 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/qemuxml2xmloutdata/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/qemuxml2xmloutdata/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/tests/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/qemuxml2xmloutdata/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/qemuxml2xmloutdata/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/qemuxml2xmloutdata/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/qemuxml2xmloutdata/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/qemuxml2xmloutdata/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/qemuxml2xmloutdata/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/qemuxml2xmloutdata/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/qemuxml2xmloutdata/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/qemuxml2xmloutdata/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/tests/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/tests/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/tests/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.xml 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/tests/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/tests/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/qemuxml2xmloutdata/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/tests/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/tests/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/qemuxml2xmloutdata/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/tests/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/tests/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/qemuxml2xmloutdata/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); -- 2.16.2
On Thu, Jul 19, 2018 at 05:50:53PM +0200, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...ress-conflict.xml => disk-address-conflict.xml} | 0 ...-drive-boot-cdrom.args => disk-boot-cdrom.args} | 0
[...]
rename tests/qemuxml2xmloutdata/{disk-drive-network-vxhs.xml => disk-network-vxhs.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-virtio-drive-queues.xml => disk-virtio-queues.xml} (100%)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
We also have disk-copy_on_read.xml which also tests the command line. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- 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/qemuxml2argvdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver copy_on_read='on'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-copy-on-read.xml b/tests/qemuxml2xmloutdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw' copy_on_read='on'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </memballoon> - </devices> -</domain> 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); -- 2.16.2
On Thu, Jul 19, 2018 at 05:50:54PM +0200, Peter Krempa wrote:
We also have disk-copy_on_read.xml which also tests the command line.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- 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
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name guest=test,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-test/master-key.aes \ +-machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \ +-m 1024 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 468404ad-d49c-40f2-9e14-02294f9c1be3 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot menu=on,strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ +-drive file=/var/lib/libvirt/images/f14.img,format=qcow2,if=none,\ +id=drive-virtio-disk0,copy-on-read=on \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ +id=virtio-disk0,bootindex=2 \ +-drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,format=raw,if=none,\ +id=drive-ide0-1-0,readonly=on \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ +-netdev user,id=hostnet0 \ +-device virtio-net-pci,tx=bh,netdev=hostnet0,id=net0,mac=52:54:00:e5:48:58,\ +bus=pci.0,addr=0x2 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on 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", -- 2.16.2
On Thu, Jul 19, 2018 at 05:50:55PM +0200, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
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 <pkrempa@redhat.com> --- .../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.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.xml delete mode 100644 tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.args delete mode 100644 tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.xml 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/tests/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive if=none,id=drive-ide0-1-0,media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.xml b/tests/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='file' device='cdrom'> - <source file='/root/boot.iso'/> - <target dev='hdc' bus='ide' tray='open'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.args b/tests/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=/dev/fd0,format=raw,if=none,id=drive-fdc0-0-0 \ --global isa-fdc.driveA=drive-fdc0-0-0 \ --drive if=none,id=drive-fdc0-0-1 \ --global isa-fdc.driveB=drive-fdc0-0-1 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.xml b/tests/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='floppy'> - <source dev='/dev/fd0'/> - <target dev='fda' bus='fdc' tray='closed'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='file' device='floppy'> - <source file='/tmp/firmware.img'/> - <target dev='fdb' bus='fdc' tray='open'/> - <address type='drive' controller='0' bus='0' target='0' unit='1'/> - </disk> - <controller type='usb' index='0'/> - <controller type='fdc' index='0'/> - <controller type='ide' index='0'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-readonly-no-device.args b/tests/qemuxml2argvdata/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=/dev/sr0,format=raw,if=none,id=drive-ide0-1-0,media=cdrom,\ -readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-readonly-no-device.xml b/tests/qemuxml2argvdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='cdrom'> - <source dev='/dev/sr0'/> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <memballoon model='virtio'/> - </devices> -</domain> 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); -- 2.16.2
On Thu, Jul 19, 2018 at 05:50:56PM +0200, Peter Krempa wrote:
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 <pkrempa@redhat.com> --- .../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.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.xml delete mode 100644 tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.args delete mode 100644 tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.xml delete mode 100644 tests/qemuxml2argvdata/disk-readonly-no-device.args delete mode 100644 tests/qemuxml2argvdata/disk-readonly-no-device.xml
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
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 <pkrempa@redhat.com> --- 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 => disk-cdrom-network.args} | 9 ++++++ ...om-network-https.xml => 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 => disk-cdrom-network.args} (58%) rename tests/qemuxml2argvdata/{disk-cdrom-network-https.xml => disk-cdrom-network.xml} (52%) diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-ftp.args b/tests/qemuxml2argvdata/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-x86_64 \ --name QEMUGuest1 \ --S \ --machine pc-1.2,accel=kvm,usb=off,dump-guest-core=off \ --m 1024 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --boot d \ --usb \ --drive file=ftp://host.name:21/url/path/file.iso,format=raw,if=none,\ -id=drive-ide0-1-0,media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml b/tests/qemuxml2argvdata/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 @@ -<domain type='kvm'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc-1.2'>hvm</type> - <boot dev='cdrom'/> - </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='network' device='cdrom'> - <driver name='qemu' type='raw'/> - <source protocol='ftp' name='/url/path/file.iso'> - <host name='host.name' port='21'/> - </source> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <controller type='ide' index='0'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-ftps.args b/tests/qemuxml2argvdata/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-x86_64 \ --name QEMUGuest1 \ --S \ --machine pc-1.2,accel=kvm,usb=off,dump-guest-core=off \ --m 1024 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --boot d \ --usb \ --drive file=ftps://host.name:990/url/path/file.iso,format=raw,if=none,\ -id=drive-ide0-1-0,media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml b/tests/qemuxml2argvdata/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 @@ -<domain type='kvm'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc-1.2'>hvm</type> - <boot dev='cdrom'/> - </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='network' device='cdrom'> - <driver name='qemu' type='raw'/> - <source protocol='ftps' name='/url/path/file.iso'> - <host name='host.name' port='990'/> - </source> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <controller type='ide' index='0'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-http.args b/tests/qemuxml2argvdata/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-x86_64 \ --name QEMUGuest1 \ --S \ --machine pc-1.2,accel=kvm,usb=off,dump-guest-core=off \ --m 1024 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --boot d \ --usb \ --drive file=http://host.name:80/url/path/file.iso,format=raw,if=none,\ -id=drive-ide0-1-0,media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-http.xml b/tests/qemuxml2argvdata/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 @@ -<domain type='kvm'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc-1.2'>hvm</type> - <boot dev='cdrom'/> - </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='network' device='cdrom'> - <driver name='qemu' type='raw'/> - <source protocol='http' name='/url/path/file.iso'> - <host name='host.name' port='80'/> - </source> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <controller type='ide' index='0'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-tftp.args b/tests/qemuxml2argvdata/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-x86_64 \ --name QEMUGuest1 \ --S \ --machine pc-1.2,accel=kvm,usb=off,dump-guest-core=off \ --m 1024 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --boot d \ --usb \ --drive file=tftp://host.name:69/url/path/file.iso,format=raw,if=none,\ -id=drive-ide0-1-0,media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-tftp.xml b/tests/qemuxml2argvdata/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 @@ -<domain type='kvm'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc-1.2'>hvm</type> - <boot dev='cdrom'/> - </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='network' device='cdrom'> - <driver name='qemu' type='raw'/> - <source protocol='tftp' name='/url/path/file.iso'> - <host name='host.name' port='69'/> - </source> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <controller type='ide' index='0'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-https.args b/tests/qemuxml2argvdata/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=ftp://host.name:21/url/path/file.iso,format=raw,if=none,\ +id=drive-ide0-0-0,media=cdrom,readonly=on \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-drive file=ftps://host.name:990/url/path/file.iso,format=raw,if=none,\ +id=drive-ide0-0-1,media=cdrom,readonly=on \ +-device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -drive file=https://host.name:443/url/path/file.iso,format=raw,if=none,\ id=drive-ide0-1-0,media=cdrom,readonly=on \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +-drive file=tftp://host.name:69/url/path/file.iso,format=raw,if=none,\ +id=drive-ide0-1-1,media=cdrom,readonly=on \ +-device ide-drive,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-https.xml b/tests/qemuxml2argvdata/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 @@ <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='network' device='cdrom'> + <driver name='qemu' type='raw'/> + <source protocol='ftp' name='/url/path/file.iso'> + <host name='host.name' port='21'/> + </source> + <target dev='hda' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='network' device='cdrom'> + <driver name='qemu' type='raw'/> + <source protocol='ftps' name='/url/path/file.iso'> + <host name='host.name' port='990'/> + </source> + <target dev='hdb' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> <disk type='network' device='cdrom'> <driver name='qemu' type='raw'/> <source protocol='https' name='/url/path/file.iso'> @@ -28,6 +46,15 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> + <disk type='network' device='cdrom'> + <driver name='qemu' type='raw'/> + <source protocol='tftp' name='/url/path/file.iso'> + <host name='host.name' port='69'/> + </source> + <target dev='hdd' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='1'/> + </disk> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <controller type='ide' index='0'/> 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); -- 2.16.2
On Thu, Jul 19, 2018 at 05:50:57PM +0200, Peter Krempa wrote:
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 <pkrempa@redhat.com> --- 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 => disk-cdrom-network.args} | 9 ++++++ ...om-network-https.xml => 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 => disk-cdrom-network.args} (58%) rename tests/qemuxml2argvdata/{disk-cdrom-network-https.xml => disk-cdrom-network.xml} (52%)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Test empty cdroms along with cdroms with medium. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- 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/qemuxml2argvdata/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive if=none,id=drive-ide0-1-0,media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty.xml b/tests/qemuxml2argvdata/disk-cdrom-empty.xml deleted file mode 100644 index 7de5a6ebf5..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-empty.xml +++ /dev/null @@ -1,36 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='file' device='cdrom'> - <driver name='qemu' type='raw'/> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-cdrom.args b/tests/qemuxml2argvdata/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=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-1-0,media=cdrom,\ readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 +-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +-drive if=none,id=drive-ide0-1-1,media=cdrom,readonly=on \ +-device ide-drive,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-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 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <target dev='hdd' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='1'/> + </disk> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> 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/qemuxml2xmloutdata/disk-cdrom-empty.xml deleted file mode 100644 index 26ce476557..0000000000 --- a/tests/qemuxml2xmloutdata/disk-cdrom-empty.xml +++ /dev/null @@ -1,40 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='file' device='cdrom'> - <driver name='qemu' type='raw'/> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-cdrom.xml b/tests/qemuxml2xmloutdata/disk-cdrom.xml index 163ce88f19..e96c94097a 100644 --- a/tests/qemuxml2xmloutdata/disk-cdrom.xml +++ b/tests/qemuxml2xmloutdata/disk-cdrom.xml @@ -27,6 +27,12 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <target dev='hdd' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='1'/> + </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> 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); -- 2.16.2
On Thu, Jul 19, 2018 at 05:50:58PM +0200, Peter Krempa wrote:
Test empty cdroms along with cdroms with medium.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- 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
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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.args 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=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc-1.2,accel=kvm,usb=off,dump-guest-core=off \ +-m 1024 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-drive file=ftp://host.name:21/url/path/file.iso,format=raw,if=none,\ +id=drive-ide0-0-0,readonly=on \ +-device ide-cd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ +-drive file=ftps://host.name:990/url/path/file.iso,format=raw,if=none,\ +id=drive-ide0-0-1,readonly=on \ +-device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ +-drive file=https://host.name:443/url/path/file.iso,format=raw,if=none,\ +id=drive-ide0-1-0,readonly=on \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +-drive file=tftp://host.name:69/url/path/file.iso,format=raw,if=none,\ +id=drive-ide0-1-1,readonly=on \ +-device ide-cd,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args b/tests/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=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name guest=test,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-test/master-key.aes \ +-machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \ +-m 1024 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 3fa02811-7832-34bd-004d-1ff56a9286ff \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot menu=on,strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-drive file=/var/lib/libvirt/images/f14.img,format=qcow2,if=none,\ +id=drive-virtio-disk0 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ +id=virtio-disk0,bootindex=2 \ +-drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,format=raw,if=none,\ +id=drive-ide0-1-0,readonly=on \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ +-drive if=none,id=drive-ide0-1-1,readonly=on \ +-device ide-cd,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args b/tests/qemuxml2argvdata/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=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ +-drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +-drive if=none,id=drive-ide0-1-1,readonly=on \ +-device ide-cd,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on 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); -- 2.16.2
On Thu, Jul 19, 2018 at 05:50:59PM +0200, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
This test also excercises options of 'discard'. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name guest=test,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-test/master-key.aes \ +-machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \ +-m 1024 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 92d7a226-cfae-425b-a6d3-00bbf9ec5c9e \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot menu=on,strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-drive file=/var/lib/libvirt/images/f14.img,format=qcow2,if=none,\ +id=drive-virtio-disk0,discard=unmap,detect-zeroes=unmap \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ +id=virtio-disk0,bootindex=2 \ +-drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,format=raw,if=none,\ +id=drive-ide0-1-0,readonly=on,discard=ignore,detect-zeroes=on \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on 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, -- 2.16.2
On Thu, Jul 19, 2018 at 05:51:00PM +0200, Peter Krempa wrote:
This test also excercises options of 'discard'.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- 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/qemuxml2argvdata/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=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\ +cache=none,aio=native \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1,\ +write-cache=on \ +-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,\ +readonly=on,aio=threads \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on 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", -- 2.16.2
On Thu, Jul 19, 2018 at 05:51:01PM +0200, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- 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
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
We'll agregate testing of all cache modes in this test later on. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...k-write-cache.x86_64-2.6.0.args => disk-cache.x86_64-2.6.0.args} | 0 ...k-write-cache.x86_64-2.7.0.args => disk-cache.x86_64-2.7.0.args} | 0 ...write-cache.x86_64-latest.args => disk-cache.x86_64-latest.args} | 0 tests/qemuxml2argvdata/{disk-write-cache.xml => 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 => disk-cache.x86_64-2.6.0.args} (100%) rename tests/qemuxml2argvdata/{disk-write-cache.x86_64-2.7.0.args => disk-cache.x86_64-2.7.0.args} (100%) rename tests/qemuxml2argvdata/{disk-write-cache.x86_64-latest.args => disk-cache.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{disk-write-cache.xml => disk-cache.xml} (100%) diff --git a/tests/qemuxml2argvdata/disk-write-cache.x86_64-2.6.0.args b/tests/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/tests/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/tests/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/qemuxml2argvdata/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); -- 2.16.2
On Thu, Jul 19, 2018 at 05:51:02PM +0200, Peter Krempa wrote:
We'll agregate testing of all cache modes in this test later on.
aggregate
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...k-write-cache.x86_64-2.6.0.args => disk-cache.x86_64-2.6.0.args} | 0 ...k-write-cache.x86_64-2.7.0.args => disk-cache.x86_64-2.7.0.args} | 0 ...write-cache.x86_64-latest.args => disk-cache.x86_64-latest.args} | 0 tests/qemuxml2argvdata/{disk-write-cache.xml => 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 => disk-cache.x86_64-2.6.0.args} (100%) rename tests/qemuxml2argvdata/{disk-write-cache.x86_64-2.7.0.args => disk-cache.x86_64-2.7.0.args} (100%) rename tests/qemuxml2argvdata/{disk-write-cache.x86_64-latest.args => disk-cache.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{disk-write-cache.xml => disk-cache.xml} (100%)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- 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/qemuxml2argvdata/disk-cache.args new file mode 100644 index 0000000000..ee2f79a99f --- /dev/null +++ b/tests/qemuxml2argvdata/disk-cache.args @@ -0,0 +1,38 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-machine pc-i440fx-2.6,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot c \ +-device lsi,id=scsi0,bus=pci.0,addr=0x3 \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\ +cache=writeback \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-scsi0-0-0,\ +cache=none \ +-device scsi-disk,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-virtio-disk0,\ +cache=writethrough \ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ +id=virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-usb-disk1,\ +cache=directsync \ +-device usb-storage,bus=usb.0,port=1,drive=drive-usb-disk1,id=usb-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/qemuxml2xmloutdata/disk-cache.xml new file mode 100644 index 0000000000..4c2a196ac0 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-cache.xml @@ -0,0 +1,54 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc-i440fx-2.6'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='qcow2' cache='writeback'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='block' device='disk'> + <driver name='qemu' type='qcow2' cache='none'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='block' device='disk'> + <driver name='qemu' type='qcow2' cache='writethrough'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <disk type='block' device='disk'> + <driver name='qemu' type='qcow2' cache='directsync'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sdb' bus='usb'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <controller type='scsi' index='0' model='lsilogic'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </controller> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> 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); -- 2.16.2
On Thu, Jul 19, 2018 at 05:51:03PM +0200, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- 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
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Move the 'unsafe' cache test into 'disk-cache' and remove all the individual cases for one cache mode each. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- 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/qemuxml2argvdata/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\ -cache=directsync \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,\ -media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 diff --git a/tests/qemuxml2argvdata/disk-cache-directsync.xml b/tests/qemuxml2argvdata/disk-cache-directsync.xml deleted file mode 100644 index e5b2ad3182..0000000000 --- a/tests/qemuxml2argvdata/disk-cache-directsync.xml +++ /dev/null @@ -1,37 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='directsync'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='cdrom'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest2'/> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-cache-unsafe.args b/tests/qemuxml2argvdata/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\ -cache=unsafe \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,\ -media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 diff --git a/tests/qemuxml2argvdata/disk-cache-unsafe.xml b/tests/qemuxml2argvdata/disk-cache-unsafe.xml deleted file mode 100644 index 61ca1dee2e..0000000000 --- a/tests/qemuxml2argvdata/disk-cache-unsafe.xml +++ /dev/null @@ -1,37 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='unsafe'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='cdrom'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest2'/> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-cache-v2-none.args b/tests/qemuxml2argvdata/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\ -cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,\ -media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 diff --git a/tests/qemuxml2argvdata/disk-cache-v2-none.xml b/tests/qemuxml2argvdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='none'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='cdrom'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest2'/> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-cache-v2-wb.args b/tests/qemuxml2argvdata/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\ -cache=writeback \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,\ -media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 diff --git a/tests/qemuxml2argvdata/disk-cache-v2-wb.xml b/tests/qemuxml2argvdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='writeback'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='cdrom'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest2'/> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-cache-v2-wt.args b/tests/qemuxml2argvdata/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\ -cache=writethrough \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,\ -media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 diff --git a/tests/qemuxml2argvdata/disk-cache-v2-wt.xml b/tests/qemuxml2argvdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='writethrough'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='cdrom'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest2'/> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-cache.args b/tests/qemuxml2argvdata/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=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\ cache=writeback \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-1,\ +cache=unsafe \ +-device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-scsi0-0-0,\ cache=none \ -device scsi-disk,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args b/tests/qemuxml2argvdata/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=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\ cache=writeback \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ +-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-1,\ +cache=unsafe \ +-device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-scsi0-0-0,\ cache=none \ -device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args b/tests/qemuxml2argvdata/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=writeback \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1,\ write-cache=on \ +-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-1,\ +cache=unsafe \ +-device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,\ +write-cache=on \ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-scsi0-0-0,\ cache=none \ -device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0,\ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args b/tests/qemuxml2argvdata/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=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ cache=writeback \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1,\ write-cache=on \ +-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-1,\ +cache=unsafe \ +-device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,\ +write-cache=on \ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-scsi0-0-0,\ cache=none \ -device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-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 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> + <disk type='block' device='disk'> + <driver name='qemu' type='qcow2' cache='unsafe'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hdb' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> <disk type='block' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source dev='/dev/HostVG/QEMUGuest1'/> 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/qemuxml2xmloutdata/disk-cache-directsync.xml deleted file mode 100644 index 2f9c64e440..0000000000 --- a/tests/qemuxml2xmloutdata/disk-cache-directsync.xml +++ /dev/null @@ -1,41 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='directsync'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='cdrom'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest2'/> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-cache-unsafe.xml b/tests/qemuxml2xmloutdata/disk-cache-unsafe.xml deleted file mode 100644 index 2091402d8e..0000000000 --- a/tests/qemuxml2xmloutdata/disk-cache-unsafe.xml +++ /dev/null @@ -1,41 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='unsafe'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='cdrom'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest2'/> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-cache-v2-none.xml b/tests/qemuxml2xmloutdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='none'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='cdrom'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest2'/> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-cache-v2-wb.xml b/tests/qemuxml2xmloutdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='writeback'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='cdrom'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest2'/> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-cache-v2-wt.xml b/tests/qemuxml2xmloutdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='writethrough'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='cdrom'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest2'/> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-cache.xml b/tests/qemuxml2xmloutdata/disk-cache.xml index 4c2a196ac0..cba4067f0d 100644 --- a/tests/qemuxml2xmloutdata/disk-cache.xml +++ b/tests/qemuxml2xmloutdata/disk-cache.xml @@ -20,6 +20,12 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> + <disk type='block' device='disk'> + <driver name='qemu' type='qcow2' cache='unsafe'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hdb' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> <disk type='block' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source dev='/dev/HostVG/QEMUGuest1'/> 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); -- 2.16.2
On Thu, Jul 19, 2018 at 05:51:04PM +0200, Peter Krempa wrote:
Move the 'unsafe' cache test into 'disk-cache' and remove all the individual cases for one cache mode each.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- 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
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Move various different iSCSI configuration into one test file. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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/qemuxml2argvdata/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ -6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=none,\ -id=drive-virtio-disk0 \ --device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ -id=virtio-disk0 \ --drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ -6000/iqn.1992-01.com.example%3Astorage/2,format=raw,if=none,\ -id=drive-virtio-disk1 \ --device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ -id=virtio-disk1 diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-auth.xml b/tests/qemuxml2argvdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <auth username='myname'> - <secret type='iscsi' usage='mycluster_myname'/> - </auth> - <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'> - <host name='example.org' port='6000'/> - </source> - <target dev='vda' bus='virtio'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <auth username='myname'> - <secret type='iscsi' usage='mycluster_myname'/> - </auth> - <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'> - <host name='example.org' port='6000'/> - </source> - <target dev='vdb' bus='virtio'/> - </disk> - <controller type='usb' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-lun.args b/tests/qemuxml2argvdata/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ --usb \ --drive file=iscsi://example.org:3260/iqn.1992-01.com.example/0,format=raw,\ -if=none,id=drive-scsi0-0-0-0 \ --device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ -drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-lun.xml b/tests/qemuxml2argvdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='network' device='lun'> - <driver name='qemu' type='raw'/> - <source protocol='iscsi' name='iqn.1992-01.com.example'> - <host name='example.org' port='3260'/> - </source> - <target dev='sda' bus='scsi'/> - </disk> - <controller type='usb' index='0'/> - <controller type='scsi' index='0' model='virtio-scsi'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.args b/tests/qemuxml2argvdata/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=scsi0,bus=pci.0,addr=0x3 \ -usb \ -drive file=iscsi://example.org:6000/iqn.1992-01.com.example/0,format=raw,\ if=none,id=drive-virtio-disk0 \ --device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ id=virtio-disk0 \ -drive file=iscsi://example.org:6000/iqn.1992-01.com.example/1,format=raw,\ if=none,id=drive-virtio-disk1 \ --device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ -id=virtio-disk1 +-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,\ +id=virtio-disk1 \ +-drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ +6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=none,\ +id=drive-virtio-disk2 \ +-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,\ +id=virtio-disk2 \ +-drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ +6000/iqn.1992-01.com.example%3Astorage/2,format=raw,if=none,\ +id=drive-virtio-disk3 \ +-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk3,\ +id=virtio-disk3 \ +-drive file=iscsi://example.org:3260/iqn.1992-01.com.example/0,format=raw,\ +if=none,id=drive-scsi0-0-0-0 \ +-device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ +drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.xml b/tests/qemuxml2argvdata/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 @@ </source> <target dev='vdb' bus='virtio'/> </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'> + <host name='example.org' port='6000'/> + </source> + <target dev='vdc' bus='virtio'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'> + <host name='example.org' port='6000'/> + </source> + <target dev='vdd' bus='virtio'/> + </disk> + <disk type='network' device='lun'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example'> + <host name='example.org' port='3260'/> + </source> + <target dev='sda' bus='scsi'/> + </disk> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> + <controller type='scsi' index='0' model='virtio-scsi'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <memballoon model='none'/> 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_BLOCK); 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/qemuxml2xmloutdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <auth username='myname'> - <secret type='iscsi' usage='mycluster_myname'/> - </auth> - <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'> - <host name='example.org' port='6000'/> - </source> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <auth username='myname'> - <secret type='iscsi' usage='mycluster_myname'/> - </auth> - <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'> - <host name='example.org' port='6000'/> - </source> - <target dev='vdb' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml b/tests/qemuxml2xmloutdata/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 @@ <host name='example.org' port='6000'/> </source> <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> @@ -28,12 +28,45 @@ <host name='example.org' port='6000'/> </source> <target dev='vdb' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'> + <host name='example.org' port='6000'/> + </source> + <target dev='vdc' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'> + <host name='example.org' port='6000'/> + </source> + <target dev='vdd' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </disk> + <disk type='network' device='lun'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/0'> + <host name='example.org' port='3260'/> + </source> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='pci' index='0' model='pci-root'/> + <controller type='scsi' index='0' model='virtio-scsi'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </controller> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <memballoon model='none'/> 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); -- 2.16.2
On Thu, Jul 19, 2018 at 05:51:05PM +0200, Peter Krempa wrote:
Move various different iSCSI configuration into one test file.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \ +-drive file.driver=iscsi,file.portal=example.org:6000,\ +file.target=iqn.1992-01.com.example,file.lun=0,file.transport=tcp,format=raw,\ +if=none,id=drive-virtio-disk0 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ +id=virtio-disk0,bootindex=1 \ +-drive file.driver=iscsi,file.portal=example.org:6000,\ +file.target=iqn.1992-01.com.example,file.lun=1,file.transport=tcp,format=raw,\ +if=none,id=drive-virtio-disk1 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ +id=virtio-disk1 \ +-object secret,id=virtio-disk2-secret0,\ +data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ +-drive file.driver=iscsi,file.portal=example.org:6000,\ +file.target=iqn.1992-01.com.example:storage,file.lun=1,file.transport=tcp,\ +file.user=myname,file.password-secret=virtio-disk2-secret0,format=raw,if=none,\ +id=drive-virtio-disk2 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,\ +id=virtio-disk2 \ +-object secret,id=virtio-disk3-secret0,\ +data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ +-drive file.driver=iscsi,file.portal=example.org:6000,\ +file.target=iqn.1992-01.com.example:storage,file.lun=2,file.transport=tcp,\ +file.user=myname,file.password-secret=virtio-disk3-secret0,format=raw,if=none,\ +id=drive-virtio-disk3 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,\ +id=virtio-disk3 \ +-drive file.driver=iscsi,file.portal=example.org:3260,\ +file.target=iqn.1992-01.com.example,file.lun=0,file.transport=tcp,format=raw,\ +if=none,id=drive-scsi0-0-0-0 \ +-device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ +drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on 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_BLOCK); + 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); -- 2.16.2
On Thu, Jul 19, 2018 at 05:51:06PM +0200, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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.xml 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/qemuxml2argvdata/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=nbd:example.org:6000:exportname=bar,format=raw,if=none,\ -id=drive-virtio-disk0 \ --device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ -id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/disk-network-nbd-export.xml b/tests/qemuxml2argvdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <source protocol='nbd' name='bar'> - <host name='example.org' port='6000'/> - </source> - <target dev='vda' bus='virtio'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-network-nbd-ipv6-export.args b/tests/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive 'file=nbd://[::1]:6000/bar,format=raw,if=none,id=drive-virtio-disk0' \ --device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ -id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/disk-network-nbd-ipv6-export.xml b/tests/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <source protocol='nbd' name='bar'> - <host name='::1' port='6000'/> - </source> - <target dev='vda' bus='virtio'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-network-nbd-ipv6.args b/tests/qemuxml2argvdata/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive 'file=nbd://[::1]:6000,format=raw,if=none,id=drive-virtio-disk0' \ --device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ -id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/disk-network-nbd-ipv6.xml b/tests/qemuxml2argvdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <source protocol='nbd'> - <host name='::1' port='6000'/> - </source> - <target dev='vda' bus='virtio'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-network-nbd-unix.args b/tests/qemuxml2argvdata/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=nbd:unix:/var/run/nbdsock:exportname=bar,format=raw,if=none,\ -id=drive-virtio-disk0 \ --device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ -id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/disk-network-nbd-unix.xml b/tests/qemuxml2argvdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <source protocol='nbd' name='bar'> - <host transport='unix' socket='/var/run/nbdsock'/> - </source> - <target dev='vda' bus='virtio'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-network-nbd.args b/tests/qemuxml2argvdata/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=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -drive file=nbd:example.org:6000,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ -id=virtio-disk0 +id=virtio-disk0 \ +-drive file=nbd:example.org:6000:exportname=bar,format=raw,if=none,\ +id=drive-virtio-disk1 \ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ +id=virtio-disk1 \ +-drive 'file=nbd://[::1]:6000,format=raw,if=none,id=drive-virtio-disk2' \ +-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,\ +id=virtio-disk2 \ +-drive 'file=nbd://[::1]:6000/bar,format=raw,if=none,id=drive-virtio-disk3' \ +-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,\ +id=virtio-disk3 \ +-drive file=nbd:unix:/var/run/nbdsock:exportname=bar,format=raw,if=none,\ +id=drive-virtio-disk4 \ +-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk4,\ +id=virtio-disk4 diff --git a/tests/qemuxml2argvdata/disk-network-nbd.xml b/tests/qemuxml2argvdata/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 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='nbd'> @@ -27,6 +21,34 @@ </source> <target dev='vda' bus='virtio'/> </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='nbd' name='bar'> + <host name='example.org' port='6000'/> + </source> + <target dev='vdb' bus='virtio'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='nbd'> + <host name='::1' port='6000'/> + </source> + <target dev='vdc' bus='virtio'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='nbd' name='bar'> + <host name='::1' port='6000'/> + </source> + <target dev='vdd' bus='virtio'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='nbd' name='bar'> + <host transport='unix' socket='/var/run/nbdsock'/> + </source> + <target dev='vde' bus='virtio'/> + </disk> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> 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_BLOCK); 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/qemuxml2xmloutdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <source protocol='nbd' name='bar'> - <host name='example.org' port='6000'/> - </source> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-network-nbd-ipv6-export.xml b/tests/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <source protocol='nbd' name='bar'> - <host name='::1' port='6000'/> - </source> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-network-nbd-ipv6.xml b/tests/qemuxml2xmloutdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <source protocol='nbd'> - <host name='::1' port='6000'/> - </source> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-network-nbd-unix.xml b/tests/qemuxml2xmloutdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <source protocol='nbd' name='bar'> - <host transport='unix' socket='/var/run/nbdsock'/> - </source> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-network-nbd.xml b/tests/qemuxml2xmloutdata/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 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='nbd'> @@ -28,6 +22,38 @@ <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='nbd' name='bar'> + <host name='example.org' port='6000'/> + </source> + <target dev='vdb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='nbd'> + <host name='::1' port='6000'/> + </source> + <target dev='vdc' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='nbd' name='bar'> + <host name='::1' port='6000'/> + </source> + <target dev='vdd' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='nbd' name='bar'> + <host transport='unix' socket='/var/run/nbdsock'/> + </source> + <target dev='vde' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> 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); -- 2.16.2
On Thu, Jul 19, 2018 at 05:51:07PM +0200, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-network-nbd-ipv6.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-network-nbd-unix.xml
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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.args diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args b/tests/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=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-drive file=nbd:example.org:6000,format=raw,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,\ +id=virtio-disk0,bootindex=1 \ +-drive file=nbd:example.org:6000:exportname=bar,format=raw,if=none,\ +id=drive-virtio-disk1 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,\ +id=virtio-disk1 \ +-drive 'file=nbd://[::1]:6000,format=raw,if=none,id=drive-virtio-disk2' \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk2,\ +id=virtio-disk2 \ +-drive 'file=nbd://[::1]:6000/bar,format=raw,if=none,id=drive-virtio-disk3' \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk3,\ +id=virtio-disk3 \ +-drive file=nbd:unix:/var/run/nbdsock:exportname=bar,format=raw,if=none,\ +id=drive-virtio-disk4 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk4,\ +id=virtio-disk4 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on 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_BLOCK); DO_TEST_CAPS_LATEST("disk-network-iscsi"); DO_TEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-invalid", NONE); -- 2.16.2
On Thu, Jul 19, 2018 at 05:51:08PM +0200, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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.args
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
The xml2argv variant was unused. The xml2xml variant is redundant in other tests for RBD. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -CEPH_ARGS=-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=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --drive file=rbd:pool/image,format=raw,if=virtio \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuxml2argvdata/disk-network-rbd-ceph-env.xml b/tests/qemuxml2argvdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <source protocol='rbd' name='pool/image'> - <host name='mon1.example.org' port='6321'/> - <host name='mon2.example.org' port='6322'/> - <host name='mon3.example.org' port='6322'/> - </source> - <target dev='vda' bus='virtio'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> 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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <source protocol='rbd' name='pool/image'> - <host name='mon1.example.org' port='6321'/> - <host name='mon2.example.org' port='6322'/> - <host name='mon3.example.org' port='6322'/> - </source> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> 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); -- 2.16.2
On Thu, Jul 19, 2018 at 05:51:09PM +0200, Peter Krempa wrote:
The xml2argv variant was unused. The xml2xml variant is redundant in other tests for RBD.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
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 <pkrempa@redhat.com> --- .../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.args create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args 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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --object secret,id=masterKey0,format=raw,\ -file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --object secret,id=virtio-disk0-secret0,\ -data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ --drive 'file=rbd:pool/image:id=myname:auth_supported=cephx\;none:\ -mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:\ -6322,file.password-secret=virtio-disk0-secret0,format=raw,if=none,\ -id=drive-virtio-disk0' \ --device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ -id=virtio-disk0 \ --object secret,id=scsi0-0-0-0-secret0,\ -data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ --drive 'file=rbd:pool/image:id=myname:auth_supported=cephx\;none:\ -mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:\ -6322,file.password-secret=scsi0-0-0-0-secret0,format=raw,if=none,\ -id=drive-scsi0-0-0-0,cache=none' \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ -drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 diff --git a/tests/qemuxml2argvdata/disk-network-rbd-auth-AES.xml b/tests/qemuxml2argvdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <auth username='myname'> - <secret type='ceph' usage='mycluster_myname'/> - </auth> - <source protocol='rbd' name='pool/image'> - <host name='mon1.example.org' port='6321'/> - <host name='mon2.example.org' port='6322'/> - <host name='mon3.example.org' port='6322'/> - </source> - <target dev='vda' bus='virtio'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw' cache='none'/> - <auth username='myname'> - <secret type='ceph' usage='mycluster_myname'/> - </auth> - <source protocol='rbd' name='pool/image'> - <host name='mon1.example.org' port='6321'/> - <host name='mon2.example.org' port='6322'/> - <host name='mon3.example.org' port='6322'/> - </source> - <target bus='scsi' dev='sda'/> - </disk> - <controller type='usb' index='0'/> - <controller type='scsi' index='0' model='virtio-scsi'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-network-rbd-auth.args b/tests/qemuxml2argvdata/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive 'file=rbd:pool/image:id=myname:\ -key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:\ -auth_supported=cephx\;none:mon_host=mon1.example.org\:6321\;mon2.example.org\:\ -6322\;mon3.example.org\:6322,format=raw,if=none,id=drive-virtio-disk0' \ --device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ -id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/disk-network-rbd-auth.xml b/tests/qemuxml2argvdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <auth username='myname'> - <secret type='ceph' usage='mycluster_myname'/> - </auth> - <source protocol='rbd' name='pool/image'> - <host name='mon1.example.org' port='6321'/> - <host name='mon2.example.org' port='6322'/> - <host name='mon3.example.org' port='6322'/> - </source> - <target dev='vda' bus='virtio'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-network-rbd-ipv6.args b/tests/qemuxml2argvdata/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive 'file=rbd:pool/image:auth_supported=none:mon_host=[\:\:1]\:\ -6321\;example.org\:6789\;[ffff\:1234\:567\:abc\:\:0f]\:6322\;[2001\:db8\:\:\ -ff00\:42\:8329]\:6322,format=raw,if=none,id=drive-virtio-disk0' \ --device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ -id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/disk-network-rbd-ipv6.xml b/tests/qemuxml2argvdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <source protocol='rbd' name='pool/image'> - <host name='::1' port='6321'/> - <host name='example.org' port='6789'/> - <host name='ffff:1234:567:abc::0f' port='6322'/> - <host name='2001:db8::ff00:42:8329' port='6322'/> - </source> - <target dev='vda' bus='virtio'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-network-rbd.args b/tests/qemuxml2argvdata/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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive 'file=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\:\ -6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,\ -id=drive-virtio-disk0' \ --device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ -id=virtio-disk0 \ --drive file=rbd:pool/image@asdf:auth_supported=none,format=raw,if=none,\ -id=drive-virtio-disk1 \ --device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ -id=virtio-disk1 \ --drive 'file=rbd:pool/image@foo:auth_supported=none:mon_host=mon1.example.org\:\ -6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,\ -id=drive-virtio-disk2' \ --device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,\ -id=virtio-disk2 \ --drive file=rbd:pool/image@foo:auth_supported=none:conf=/blah/test.conf,\ -format=raw,if=none,id=drive-virtio-disk3 \ --device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,\ -id=virtio-disk3 diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args b/tests/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=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-machine pc-i440fx-2.5,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-drive 'file=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\:\ +6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,\ +id=drive-virtio-disk0' \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,\ +id=virtio-disk0,bootindex=1 \ +-drive file=rbd:pool/image@asdf:auth_supported=none,format=raw,if=none,\ +id=drive-virtio-disk1 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,\ +id=virtio-disk1 \ +-drive 'file=rbd:pool/image@foo:auth_supported=none:mon_host=mon1.example.org\:\ +6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,\ +id=drive-virtio-disk2' \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk2,\ +id=virtio-disk2 \ +-drive file=rbd:pool/image@foo:auth_supported=none:conf=/blah/test.conf,\ +format=raw,if=none,id=drive-virtio-disk3 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk3,\ +id=virtio-disk3 \ +-drive 'file=rbd:pool/image:id=myname:\ +key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:\ +auth_supported=cephx\;none:mon_host=mon1.example.org\:6321\;mon2.example.org\:\ +6322\;mon3.example.org\:6322,format=raw,if=none,id=drive-virtio-disk4' \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk4,\ +id=virtio-disk4 \ +-drive 'file=rbd:pool/image:auth_supported=none:mon_host=[\:\:1]\:\ +6321\;example.org\:6789\;[ffff\:1234\:567\:abc\:\:0f]\:6322\;[2001\:db8\:\:\ +ff00\:42\:8329]\:6322,format=raw,if=none,id=drive-virtio-disk5' \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x7,drive=drive-virtio-disk5,\ +id=virtio-disk5 \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args b/tests/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=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-drive 'file=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\:\ +6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,\ +id=drive-virtio-disk0' \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,\ +id=virtio-disk0,bootindex=1 \ +-drive file=rbd:pool/image@asdf:auth_supported=none,format=raw,if=none,\ +id=drive-virtio-disk1 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,\ +id=virtio-disk1 \ +-drive 'file=rbd:pool/image@foo:auth_supported=none:mon_host=mon1.example.org\:\ +6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,\ +id=drive-virtio-disk2' \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk2,\ +id=virtio-disk2 \ +-drive file=rbd:pool/image@foo:auth_supported=none:conf=/blah/test.conf,\ +format=raw,if=none,id=drive-virtio-disk3 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk3,\ +id=virtio-disk3 \ +-object secret,id=virtio-disk4-secret0,\ +data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ +-drive 'file=rbd:pool/image:id=myname:auth_supported=cephx\;none:\ +mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:\ +6322,file.password-secret=virtio-disk4-secret0,format=raw,if=none,\ +id=drive-virtio-disk4' \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk4,\ +id=virtio-disk4 \ +-drive 'file=rbd:pool/image:auth_supported=none:mon_host=[\:\:1]\:\ +6321\;example.org\:6789\;[ffff\:1234\:567\:abc\:\:0f]\:6322\;[2001\:db8\:\:\ +ff00\:42\:8329]\:6322,format=raw,if=none,id=drive-virtio-disk5' \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x7,drive=drive-virtio-disk5,\ +id=virtio-disk5 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/disk-network-rbd.xml b/tests/qemuxml2argvdata/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 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='rbd' name='pool/image'> @@ -54,6 +48,28 @@ </source> <target dev='vdd' bus='virtio'/> </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='ceph' usage='mycluster_myname'/> + </auth> + <source protocol='rbd' name='pool/image'> + <host name='mon1.example.org' port='6321'/> + <host name='mon2.example.org' port='6322'/> + <host name='mon3.example.org' port='6322'/> + </source> + <target dev='vde' bus='virtio'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='rbd' name='pool/image'> + <host name='::1' port='6321'/> + <host name='example.org' port='6789'/> + <host name='ffff:1234:567:abc::0f' port='6322'/> + <host name='2001:db8::ff00:42:8329' port='6322'/> + </source> + <target dev='vdf' bus='virtio'/> + </disk> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> 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 = 1; DO_TEST("disk-network-tlsx509", QEMU_CAPS_VXHS, diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd-auth.xml b/tests/qemuxml2xmloutdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <auth username='myname'> - <secret type='ceph' usage='mycluster_myname'/> - </auth> - <source protocol='rbd' name='pool/image'> - <host name='mon1.example.org' port='6321'/> - <host name='mon2.example.org' port='6322'/> - <host name='mon3.example.org' port='6322'/> - </source> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd-ipv6.xml b/tests/qemuxml2xmloutdata/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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <source protocol='rbd' name='pool/image'> - <host name='::1' port='6321'/> - <host name='example.org' port='6789'/> - <host name='ffff:1234:567:abc::0f' port='6322'/> - <host name='2001:db8::ff00:42:8329' port='6322'/> - </source> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd.xml b/tests/qemuxml2xmloutdata/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 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='rbd' name='pool/image'> @@ -58,6 +52,30 @@ <target dev='vdd' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='ceph' usage='mycluster_myname'/> + </auth> + <source protocol='rbd' name='pool/image'> + <host name='mon1.example.org' port='6321'/> + <host name='mon2.example.org' port='6322'/> + <host name='mon3.example.org' port='6322'/> + </source> + <target dev='vde' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='rbd' name='pool/image'> + <host name='::1' port='6321'/> + <host name='example.org' port='6789'/> + <host name='ffff:1234:567:abc::0f' port='6322'/> + <host name='2001:db8::ff00:42:8329' port='6322'/> + </source> + <target dev='vdf' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> + </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> 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); -- 2.16.2
On Thu, Jul 19, 2018 at 05:51:10PM +0200, Peter Krempa wrote:
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 <pkrempa@redhat.com> --- .../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.args create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args delete mode 100644 tests/qemuxml2xmloutdata/disk-network-rbd-auth.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-network-rbd-ipv6.xml
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
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 <pkrempa@redhat.com> --- 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=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-1 \ --device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive file=/tmp/data.img,format=raw,if=none,id=drive-ide0-1-0 \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --drive file=/tmp/logs.img,format=raw,if=none,id=drive-ide0-1-1 \ --device ide-drive,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-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 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest2'/> - <target dev='hdb' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='1'/> - </disk> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='/tmp/data.img'/> - <target dev='hdc' bus='ide'/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='/tmp/logs.img'/> - <target dev='hdd' bus='ide'/> - <address type='drive' controller='0' bus='1' target='0' unit='1'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> 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/qemuxml2xmloutdata/disk-many.xml deleted file mode 100644 index b7a971e51d..0000000000 --- a/tests/qemuxml2xmloutdata/disk-many.xml +++ /dev/null @@ -1,52 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest2'/> - <target dev='hdb' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='1'/> - </disk> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='/tmp/data.img'/> - <target dev='hdc' bus='ide'/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='/tmp/logs.img'/> - <target dev='hdd' bus='ide'/> - <address type='drive' controller='0' bus='1' target='0' unit='1'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> 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); -- 2.16.2
s/disks/disk/ On Thu, Jul 19, 2018 at 05:51:11PM +0200, Peter Krempa wrote:
We have several cases when a VM has multiple disks in the test files so having another one without any interresting configuration is not
interesting
necessary.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- 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
wow, many disk, such test Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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.args 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=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ +-drive file=/dev/fd0,format=raw,if=none,id=drive-fdc0-0-0 \ +-global isa-fdc.driveA=drive-fdc0-0-0 \ +-drive file=/tmp/firmware.img,format=raw,if=none,id=drive-fdc0-0-1 \ +-global isa-fdc.driveB=drive-fdc0-0-1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args b/tests/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=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-drive file=fat:floppy:/var/somefiles,if=none,id=drive-fdc0-0-0,readonly=on \ +-global isa-fdc.driveA=drive-fdc0-0-0 \ +-global isa-fdc.bootindexA=1 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on 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); -- 2.16.2
On Thu, Jul 19, 2018 at 05:51:12PM +0200, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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.args
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ +-drive file=/dev/sr0,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on 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=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0,\ +cache=none \ +-device ide-hd,bus=ide.0,unit=0,share-rw=on,drive=drive-ide0-0-0,id=ide0-0-0,\ +bootindex=1,write-cache=on,serial=XYZXYZXYZYXXYZYZYXYZY \ +-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,\ +readonly=on \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on 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); -- 2.16.2
On Thu, Jul 19, 2018 at 05:51:13PM +0200, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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-latest.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=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-drive file=gluster://example.org:6000/Volume1/Image,file.debug=4,format=raw,\ +if=none,id=drive-virtio-disk0 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,\ +id=virtio-disk0,bootindex=1 \ +-drive 'file=gluster+unix:///Volume2/Image?socket=/path/to/sock,file.debug=4,\ +format=raw,if=none,id=drive-virtio-disk1' \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,\ +id=virtio-disk1 \ +-drive file.driver=gluster,file.volume=Volume3,file.path=Image.qcow2,\ +file.server.0.type=tcp,file.server.0.host=example.org,file.server.0.port=6000,\ +file.server.1.type=tcp,file.server.1.host=example.org,file.server.1.port=24007,\ +file.server.2.type=unix,file.server.2.socket=/path/to/sock,file.debug=4,\ +format=qcow2,if=none,id=drive-virtio-disk2 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk2,\ +id=virtio-disk2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on 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); -- 2.16.2
On Thu, Jul 19, 2018 at 05:51:14PM +0200, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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-latest.args
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args 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=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-drive file=/dev/HostVG/QEMU,,Guest,,,,1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ +-drive file=sheepdog:example.org:6000:image,,with,,commas,format=raw,if=none,\ +id=drive-virtio-disk0 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,\ +id=virtio-disk0 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on 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 = 1; -- 2.16.2
On Thu, Jul 19, 2018 at 05:51:15PM +0200, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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-latest.args
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
'disk-network-source-auth' and 'disk-netowrk-tlsx509' Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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-latest.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=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-object secret,id=virtio-disk0-secret0,\ +data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ +-drive file.driver=iscsi,file.portal=example.org:6000,\ +file.target=iqn.1992-01.com.example:storage,file.lun=1,file.transport=tcp,\ +file.user=myname,file.password-secret=virtio-disk0-secret0,format=raw,if=none,\ +id=drive-virtio-disk0 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,\ +id=virtio-disk0,bootindex=1 \ +-object secret,id=virtio-disk1-secret0,\ +data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ +-drive 'file=rbd:pool/image:id=myname:auth_supported=cephx\;none:\ +mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:\ +6322,file.password-secret=virtio-disk1-secret0,format=raw,if=none,\ +id=drive-virtio-disk1' \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,\ +id=virtio-disk1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on 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=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-cpu qemu32 \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-object tls-creds-x509,id=objvirtio-disk0_tls0,dir=/etc/pki/libvirt-vxhs/dummy,\ +,path,endpoint=client,verify-peer=yes \ +-drive file.driver=vxhs,file.tls-creds=objvirtio-disk0_tls0,\ +file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,\ +file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\ +id=drive-virtio-disk0,cache=none \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ +id=virtio-disk0,bootindex=1,write-cache=on,\ +serial=eb90327c-8302-4725-9e1b-4e85ed4dc251 \ +-object tls-creds-x509,id=objvirtio-disk1_tls0,dir=/etc/pki/libvirt-vxhs/dummy,\ +,path,endpoint=client,verify-peer=yes \ +-drive file.driver=vxhs,file.tls-creds=objvirtio-disk1_tls0,\ +file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc252,\ +file.server.host=192.168.0.2,file.server.port=9999,format=raw,if=none,\ +id=drive-virtio-disk1,cache=none \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,\ +id=virtio-disk1,write-cache=on,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252 \ +-drive file.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc253,\ +file.server.host=192.168.0.3,file.server.port=9999,format=raw,if=none,\ +id=drive-virtio-disk2,cache=none \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,\ +id=virtio-disk2,write-cache=on,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252 \ +-object tls-creds-x509,id=objvirtio-disk3_tls0,dir=/etc/pki/libvirt-nbd/dummy,,\ +path,endpoint=client,verify-peer=yes \ +-drive file.driver=nbd,file.server.type=inet,file.server.host=example.com,\ +file.server.port=1234,file.tls-creds=objvirtio-disk3_tls0,format=raw,if=none,\ +id=drive-virtio-disk3,cache=none \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x7,drive=drive-virtio-disk3,\ +id=virtio-disk3,write-cache=on \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on 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 = 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 = 0; VIR_FREE(driver.config->vxhsTLSx509certdir); DO_TEST("disk-no-boot", -- 2.16.2
On Thu, Jul 19, 2018 at 05:51:16PM +0200, Peter Krempa wrote:
'disk-network-source-auth' and 'disk-netowrk-tlsx509'
network
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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-latest.args
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
participants (2)
-
Ján Tomko -
Peter Krempa