8:02 a.m.
This series cleans up disk related tests and ensures that all use real
capabilities.
This is preparation for an upcoming RFC patch adding real caps test for
everything.
Peter Krempa (20):
testCompareXMLToArgv: Avoid use of uninitialized 'monitor_chr'
testQemuInfoInitArgs: Report error if path to 'latest' caps for an
arch is NULL
qemuxml2argvtest: Remove 'boot-strict' case
qemuxml2argvtest: Agregate all 'disk'-related test cases
qemuxml2argvtest: Remove fake caps versions of disk tests we have a
versioned test for
qemuxml2argvtest: Remove negative case for 'luks-disks-source-qcow2'
qemuxml2argvtest: Remove 'disk-usb-nosupport' case
qemuxml2argvtest: Convert encrypted disk test cases to
DO_TEST_CAPS_LATEST
qemuxml2argvtest: Use DO_TEST_CAPS_LATEST_PARSE_ERROR for disk cases
qemuxml2argvtest: Use real caps for all disk frontend property tests
qemuxml2argvtest: Replace 'disk-network-iscsi' by the more
comprehensive 'disk-network-iscsi-modern'
qemuxml2argvtest: Merge 'disk-iscsi' case into 'disk-cache'
qemuxml2argvtest: Modernize 'disk-network-rbd-no-colon' case
qemuxml2argvtest: Modernize outstanding disk-backend related tests
qemuxml2argvtest: Modernize 'disk-floppy-pseries' case
qemuxml2argvtest: Modernize s390x disk tests
tests: qemu: Remove 'virtio-ccw' machine type from fake capabilities
qemuxml2argvtest: Use versioned ("4.1.0") capabilities for pre
'-audiodev' cases
qemuxml2argvtest: Pin old-style '-no-reboot' usage to qemu-5.2
qemuxml2argvtest: remove 'fs9p' cases with fake capabilities.
.../qemuhotplug-base-ccw-live+ccw-virtio.xml | 2 +-
...ith-2-ccw-virtio+ccw-virtio-1-explicit.xml | 2 +-
...with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 2 +-
...otplug-base-ccw-live-with-2-ccw-virtio.xml | 2 +-
...-with-ccw-virtio+ccw-virtio-2-explicit.xml | 2 +-
...-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 2 +-
...uhotplug-base-ccw-live-with-ccw-virtio.xml | 2 +-
.../qemuhotplug-base-ccw-live.xml | 2 +-
...args => audio-alsa-best.x86_64-4.1.0.args} | 9 +-
...l.err => audio-alsa-full.x86_64-4.1.0.err} | 0
...s => audio-alsa-minimal.x86_64-4.1.0.args} | 9 +-
...=> audio-coreaudio-best.x86_64-4.1.0.args} | 9 +-
... => audio-coreaudio-full.x86_64-4.1.0.err} | 0
...audio-coreaudio-minimal.x86_64-4.1.0.args} | 9 +-
...udio-default-nographics.x86_64-4.1.0.args} | 9 +-
...args => audio-file-best.x86_64-4.1.0.args} | 9 +-
...l.err => audio-file-full.x86_64-4.1.0.err} | 0
...s => audio-file-minimal.x86_64-4.1.0.args} | 9 +-
...l.err => audio-jack-full.x86_64-4.1.0.err} | 0
...rr => audio-jack-minimal.x86_64-4.1.0.err} | 0
...r => audio-many-backends.x86_64-4.1.0.err} | 0
...args => audio-none-best.x86_64-4.1.0.args} | 9 +-
...l.err => audio-none-full.x86_64-4.1.0.err} | 0
...s => audio-none-minimal.x86_64-4.1.0.args} | 9 +-
....args => audio-oss-best.x86_64-4.1.0.args} | 9 +-
...ll.err => audio-oss-full.x86_64-4.1.0.err} | 0
...gs => audio-oss-minimal.x86_64-4.1.0.args} | 9 +-
...> audio-pulseaudio-best.x86_64-4.1.0.args} | 9 +-
...=> audio-pulseaudio-full.x86_64-4.1.0.err} | 0
...udio-pulseaudio-minimal.x86_64-4.1.0.args} | 9 +-
....args => audio-sdl-best.x86_64-4.1.0.args} | 9 +-
...ll.err => audio-sdl-full.x86_64-4.1.0.err} | 0
...gs => audio-sdl-minimal.x86_64-4.1.0.args} | 9 +-
...rgs => audio-spice-best.x86_64-4.1.0.args} | 9 +-
....err => audio-spice-full.x86_64-4.1.0.err} | 0
... => audio-spice-minimal.x86_64-4.1.0.args} | 9 +-
.../qemuxml2argvdata/balloon-ccw-deflate.args | 2 +-
.../qemuxml2argvdata/balloon-ccw-deflate.xml | 2 +-
tests/qemuxml2argvdata/boot-strict.args | 48 ----
tests/qemuxml2argvdata/boot-strict.xml | 66 -----
.../qemuxml2argvdata/console-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/console-virtio-ccw.xml | 2 +-
...> disk-address-conflict.x86_64-latest.err} | 0
tests/qemuxml2argvdata/disk-aio.args | 34 ---
tests/qemuxml2argvdata/disk-blockio.args | 34 ---
.../disk-blockio.x86_64-latest.args | 39 +++
tests/qemuxml2argvdata/disk-boot-cdrom.args | 33 ---
.../disk-boot-cdrom.x86_64-latest.args | 38 +++
tests/qemuxml2argvdata/disk-boot-disk.args | 33 ---
.../disk-boot-disk.x86_64-latest.args | 38 +++
.../disk-cache.x86_64-2.12.0.args | 2 +-
.../disk-cache.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-cache.xml | 2 +-
.../qemuxml2argvdata/disk-cdrom-network.args | 35 ---
tests/qemuxml2argvdata/disk-cdrom-tray.args | 36 ---
tests/qemuxml2argvdata/disk-cdrom.args | 37 ---
tests/qemuxml2argvdata/disk-copy_on_read.args | 37 ---
...device-lun-type-invalid.x86_64-latest.err} | 0
tests/qemuxml2argvdata/disk-error-policy.args | 35 ---
...dc-incompatible-address.x86_64-latest.err} | 0
...r => disk-floppy-pseries.ppc64-latest.err} | 0
tests/qemuxml2argvdata/disk-floppy-tray.args | 36 ---
.../disk-floppy-tray.x86_64-latest.args | 42 +++
tests/qemuxml2argvdata/disk-floppy.args | 35 ---
...cow.err => disk-fmt-cow.x86_64-latest.err} | 0
...dir.err => disk-fmt-dir.x86_64-latest.err} | 0
...iso.err => disk-fmt-iso.x86_64-latest.err} | 0
...w.args => disk-fmt-qcow.x86_64-4.1.0.args} | 9 +-
.../disk-fmt-qcow.x86_64-latest.args | 38 +++
tests/qemuxml2argvdata/disk-geometry.args | 32 ---
.../disk-geometry.x86_64-latest.args | 36 +++
...v-scsi-address-conflict.x86_64-latest.err} | 0
...de-incompatible-address.x86_64-latest.err} | 0
tests/qemuxml2argvdata/disk-ide-split.args | 34 ---
.../disk-ide-split.x86_64-latest.args | 39 +++
tests/qemuxml2argvdata/disk-ide-wwn.args | 32 ---
.../disk-ide-wwn.x86_64-latest.args | 36 +++
tests/qemuxml2argvdata/disk-ioeventfd.args | 37 ---
.../disk-ioeventfd.x86_64-latest.args | 42 +++
tests/qemuxml2argvdata/disk-iscsi.args | 31 ---
tests/qemuxml2argvdata/disk-iscsi.xml | 28 --
...-missing-target-invalid.x86_64-latest.err} | 0
.../disk-network-gluster.args | 35 ---
...auth-secrettype-invalid.x86_64-latest.err} | 0
...i-auth-wrong-secrettype.x86_64-latest.err} | 0
.../disk-network-iscsi-modern.args | 47 ----
.../disk-network-iscsi-modern.xml | 88 ------
.../qemuxml2argvdata/disk-network-iscsi.args | 42 ---
.../disk-network-iscsi.x86_64-2.12.0.args | 5 +
.../disk-network-iscsi.x86_64-latest.args | 31 ++-
tests/qemuxml2argvdata/disk-network-iscsi.xml | 25 +-
tests/qemuxml2argvdata/disk-network-nbd.args | 39 ---
...isk-network-rbd-no-colon.x86_64-4.1.0.err} | 0
...sk-network-rbd-no-colon.x86_64-latest.args | 39 +++
.../disk-network-sheepdog.args | 33 ---
...etwork-source-auth-both.x86_64-latest.err} | 0
.../disk-network-source-auth.args | 38 ---
tests/qemuxml2argvdata/disk-network-vxhs.args | 32 ---
tests/qemuxml2argvdata/disk-no-boot.args | 36 ---
.../disk-no-boot.x86_64-latest.args | 42 +++
tests/qemuxml2argvdata/disk-order.args | 38 ---
.../disk-order.x86_64-latest.args | 45 +++
.../qemuxml2argvdata/disk-readonly-disk.args | 34 ---
...rr => disk-same-targets.x86_64-latest.err} | 0
tests/qemuxml2argvdata/disk-sata-device.args | 33 ---
.../disk-sata-device.x86_64-latest.args | 37 +++
...ta-incompatible-address.x86_64-latest.err} | 0
.../disk-scsi-disk-split.args | 42 ---
.../disk-scsi-disk-split.x86_64-latest.args | 49 ++++
...si-disk-vpd-build-error.x86_64-latest.err} | 0
.../qemuxml2argvdata/disk-scsi-disk-vpd.args | 36 ---
.../disk-scsi-disk-vpd.x86_64-latest.args | 41 +++
.../qemuxml2argvdata/disk-scsi-disk-wwn.args | 36 ---
.../disk-scsi-disk-wwn.x86_64-latest.args | 41 +++
...si-incompatible-address.x86_64-latest.err} | 0
.../disk-scsi-lun-passthrough.args | 36 ---
...sk-scsi-lun-passthrough.x86_64-latest.args | 41 +++
tests/qemuxml2argvdata/disk-serial.args | 35 ---
.../disk-serial.x86_64-latest.args | 40 +++
...err => disk-shared-qcow.x86_64-latest.err} | 0
tests/qemuxml2argvdata/disk-snapshot.args | 36 ---
.../disk-snapshot.x86_64-latest.args | 42 +++
...> disk-source-pool-mode.x86_64-4.1.0.args} | 9 +-
.../disk-source-pool-mode.x86_64-latest.args | 45 +++
...rgs => disk-source-pool.x86_64-4.1.0.args} | 13 +-
.../disk-source-pool.x86_64-latest.args | 46 +++
.../disk-usb-device-removable.args | 34 ---
...sk-usb-device-removable.x86_64-latest.args | 39 +++
tests/qemuxml2argvdata/disk-usb-device.args | 34 ---
.../disk-usb-device.x86_64-latest.args | 39 +++
tests/qemuxml2argvdata/disk-usb-nosupport.err | 1 -
tests/qemuxml2argvdata/disk-usb-nosupport.xml | 35 ---
...pci.err => disk-usb-pci.x86_64-latest.err} | 0
.../disk-virtio-ccw-many.args | 36 ---
.../disk-virtio-ccw-many.s390x-latest.args | 43 +++
.../qemuxml2argvdata/disk-virtio-ccw-many.xml | 2 +-
tests/qemuxml2argvdata/disk-virtio-ccw.args | 32 ---
.../disk-virtio-ccw.s390x-latest.args | 37 +++
tests/qemuxml2argvdata/disk-virtio-ccw.xml | 2 +-
.../disk-virtio-s390-zpci.args | 31 ---
.../disk-virtio-s390-zpci.s390x-latest.args | 35 +++
tests/qemuxml2argvdata/disk-virtio.args | 37 ---
.../disk-virtio.x86_64-latest.args | 44 +++
...=> encrypted-disk-usage.x86_64-4.1.0.args} | 11 +-
.../encrypted-disk-usage.x86_64-latest.args | 37 +++
....args => encrypted-disk.x86_64-4.1.0.args} | 11 +-
.../encrypted-disk.x86_64-latest.args | 37 +++
tests/qemuxml2argvdata/event_idx.args | 37 ---
.../event_idx.x86_64-latest.args | 42 +++
tests/qemuxml2argvdata/floppy-drive-fat.args | 33 ---
tests/qemuxml2argvdata/fs9p-ccw.args | 36 ---
tests/qemuxml2argvdata/fs9p.args | 34 ---
.../hostdev-scsi-vhost-scsi-ccw.args | 2 +-
.../hostdev-scsi-vhost-scsi-ccw.xml | 2 +-
...-drive-address-conflict.x86_64-latest.err} | 0
.../iothreads-disk-virtio-ccw.args | 2 +-
.../iothreads-disk-virtio-ccw.xml | 2 +-
...rr => luks-disk-invalid.x86_64-latest.err} | 0
... luks-disks-source-both.x86_64-latest.err} | 0
.../luks-disks-source-qcow2.err | 1 -
...gs => luks-disks-source.x86_64-4.1.0.args} | 17 +-
.../luks-disks-source.x86_64-latest.args | 54 ++++
...isks.args => luks-disks.x86_64-4.1.0.args} | 11 +-
.../luks-disks.x86_64-latest.args | 41 +++
tests/qemuxml2argvdata/misc-no-reboot.args | 31 ---
.../misc-no-reboot.x86_64-5.2.0.args | 35 +++
tests/qemuxml2argvdata/net-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/net-virtio-ccw.xml | 2 +-
.../non-x86_64-timer-error.err | 2 +-
.../non-x86_64-timer-error.xml | 2 +-
tests/qemuxml2argvdata/virtio-lun.args | 37 ---
.../virtio-lun.x86_64-latest.args | 42 +++
tests/qemuxml2argvdata/virtio-rng-ccw.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-ccw.xml | 2 +-
tests/qemuxml2argvtest.c | 261 +++++++-----------
.../disk-cache.x86_64-2.12.0.xml | 2 +-
.../disk-cache.x86_64-latest.xml | 2 +-
.../qemuxml2xmloutdata/disk-network-iscsi.xml | 25 ++
.../hostdev-scsi-vhost-scsi-ccw.xml | 2 +-
.../iothreads-disk-virtio-ccw.xml | 2 +-
tests/testutilsqemu.c | 8 +-
181 files changed, 1726 insertions(+), 2164 deletions(-)
rename tests/qemuxml2argvdata/{audio-alsa-best.args =>
audio-alsa-best.x86_64-4.1.0.args} (81%)
rename tests/qemuxml2argvdata/{audio-alsa-full.err =>
audio-alsa-full.x86_64-4.1.0.err} (100%)
rename tests/qemuxml2argvdata/{audio-alsa-minimal.args =>
audio-alsa-minimal.x86_64-4.1.0.args} (75%)
rename tests/qemuxml2argvdata/{audio-coreaudio-best.args =>
audio-coreaudio-best.x86_64-4.1.0.args} (81%)
rename tests/qemuxml2argvdata/{audio-coreaudio-full.err =>
audio-coreaudio-full.x86_64-4.1.0.err} (100%)
rename tests/qemuxml2argvdata/{audio-coreaudio-minimal.args =>
audio-coreaudio-minimal.x86_64-4.1.0.args} (75%)
rename tests/qemuxml2argvdata/{audio-default-nographics.args =>
audio-default-nographics.x86_64-4.1.0.args} (75%)
rename tests/qemuxml2argvdata/{audio-file-best.args =>
audio-file-best.x86_64-4.1.0.args} (81%)
rename tests/qemuxml2argvdata/{audio-file-full.err =>
audio-file-full.x86_64-4.1.0.err} (100%)
rename tests/qemuxml2argvdata/{audio-file-minimal.args =>
audio-file-minimal.x86_64-4.1.0.args} (75%)
rename tests/qemuxml2argvdata/{audio-jack-full.err =>
audio-jack-full.x86_64-4.1.0.err} (100%)
rename tests/qemuxml2argvdata/{audio-jack-minimal.err =>
audio-jack-minimal.x86_64-4.1.0.err} (100%)
rename tests/qemuxml2argvdata/{audio-many-backends.err =>
audio-many-backends.x86_64-4.1.0.err} (100%)
rename tests/qemuxml2argvdata/{audio-none-best.args =>
audio-none-best.x86_64-4.1.0.args} (80%)
rename tests/qemuxml2argvdata/{audio-none-full.err =>
audio-none-full.x86_64-4.1.0.err} (100%)
rename tests/qemuxml2argvdata/{audio-none-minimal.args =>
audio-none-minimal.x86_64-4.1.0.args} (75%)
rename tests/qemuxml2argvdata/{audio-oss-best.args =>
audio-oss-best.x86_64-4.1.0.args} (82%)
rename tests/qemuxml2argvdata/{audio-oss-full.err => audio-oss-full.x86_64-4.1.0.err}
(100%)
rename tests/qemuxml2argvdata/{audio-oss-minimal.args =>
audio-oss-minimal.x86_64-4.1.0.args} (75%)
rename tests/qemuxml2argvdata/{audio-pulseaudio-best.args =>
audio-pulseaudio-best.x86_64-4.1.0.args} (82%)
rename tests/qemuxml2argvdata/{audio-pulseaudio-full.err =>
audio-pulseaudio-full.x86_64-4.1.0.err} (100%)
rename tests/qemuxml2argvdata/{audio-pulseaudio-minimal.args =>
audio-pulseaudio-minimal.x86_64-4.1.0.args} (75%)
rename tests/qemuxml2argvdata/{audio-sdl-best.args =>
audio-sdl-best.x86_64-4.1.0.args} (81%)
rename tests/qemuxml2argvdata/{audio-sdl-full.err => audio-sdl-full.x86_64-4.1.0.err}
(100%)
rename tests/qemuxml2argvdata/{audio-sdl-minimal.args =>
audio-sdl-minimal.x86_64-4.1.0.args} (75%)
rename tests/qemuxml2argvdata/{audio-spice-best.args =>
audio-spice-best.x86_64-4.1.0.args} (80%)
rename tests/qemuxml2argvdata/{audio-spice-full.err =>
audio-spice-full.x86_64-4.1.0.err} (100%)
rename tests/qemuxml2argvdata/{audio-spice-minimal.args =>
audio-spice-minimal.x86_64-4.1.0.args} (75%)
delete mode 100644 tests/qemuxml2argvdata/boot-strict.args
delete mode 100644 tests/qemuxml2argvdata/boot-strict.xml
rename tests/qemuxml2argvdata/{disk-address-conflict.err =>
disk-address-conflict.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/disk-aio.args
delete mode 100644 tests/qemuxml2argvdata/disk-blockio.args
create mode 100644 tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-boot-cdrom.args
create mode 100644 tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-boot-disk.args
create mode 100644 tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom.args
delete mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.args
rename tests/qemuxml2argvdata/{disk-device-lun-type-invalid.err =>
disk-device-lun-type-invalid.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/disk-error-policy.args
rename tests/qemuxml2argvdata/{disk-fdc-incompatible-address.err =>
disk-fdc-incompatible-address.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{disk-floppy-pseries.err =>
disk-floppy-pseries.ppc64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/disk-floppy-tray.args
create mode 100644 tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-floppy.args
rename tests/qemuxml2argvdata/{disk-fmt-cow.err => disk-fmt-cow.x86_64-latest.err}
(100%)
rename tests/qemuxml2argvdata/{disk-fmt-dir.err => disk-fmt-dir.x86_64-latest.err}
(100%)
rename tests/qemuxml2argvdata/{disk-fmt-iso.err => disk-fmt-iso.x86_64-latest.err}
(100%)
rename tests/qemuxml2argvdata/{disk-fmt-qcow.args => disk-fmt-qcow.x86_64-4.1.0.args}
(77%)
create mode 100644 tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-geometry.args
create mode 100644 tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args
rename tests/qemuxml2argvdata/{disk-hostdev-scsi-address-conflict.err =>
disk-hostdev-scsi-address-conflict.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{disk-ide-incompatible-address.err =>
disk-ide-incompatible-address.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/disk-ide-split.args
create mode 100644 tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-ide-wwn.args
create mode 100644 tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-ioeventfd.args
create mode 100644 tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-iscsi.args
delete mode 100644 tests/qemuxml2argvdata/disk-iscsi.xml
rename tests/qemuxml2argvdata/{disk-missing-target-invalid.err =>
disk-missing-target-invalid.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/disk-network-gluster.args
rename tests/qemuxml2argvdata/{disk-network-iscsi-auth-secrettype-invalid.err =>
disk-network-iscsi-auth-secrettype-invalid.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{disk-network-iscsi-auth-wrong-secrettype.err =>
disk-network-iscsi-auth-wrong-secrettype.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi-modern.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi-modern.xml
delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd.args
rename tests/qemuxml2argvdata/{disk-network-rbd-no-colon.err =>
disk-network-rbd-no-colon.x86_64-4.1.0.err} (100%)
create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.args
rename tests/qemuxml2argvdata/{disk-network-source-auth-both.err =>
disk-network-source-auth-both.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-vxhs.args
delete mode 100644 tests/qemuxml2argvdata/disk-no-boot.args
create mode 100644 tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-order.args
create mode 100644 tests/qemuxml2argvdata/disk-order.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.args
rename tests/qemuxml2argvdata/{disk-same-targets.err =>
disk-same-targets.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/disk-sata-device.args
create mode 100644 tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args
rename tests/qemuxml2argvdata/{disk-sata-incompatible-address.err =>
disk-sata-incompatible-address.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-split.args
create mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args
rename tests/qemuxml2argvdata/{disk-scsi-disk-vpd-build-error.err =>
disk-scsi-disk-vpd-build-error.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
create mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
create mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args
rename tests/qemuxml2argvdata/{disk-scsi-incompatible-address.err =>
disk-scsi-incompatible-address.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
create mode 100644 tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-serial.args
create mode 100644 tests/qemuxml2argvdata/disk-serial.x86_64-latest.args
rename tests/qemuxml2argvdata/{disk-shared-qcow.err =>
disk-shared-qcow.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/disk-snapshot.args
create mode 100644 tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args
rename tests/qemuxml2argvdata/{disk-source-pool-mode.args =>
disk-source-pool-mode.x86_64-4.1.0.args} (84%)
create mode 100644 tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.args
rename tests/qemuxml2argvdata/{disk-source-pool.args =>
disk-source-pool.x86_64-4.1.0.args} (73%)
create mode 100644 tests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-usb-device-removable.args
create mode 100644 tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-usb-device.args
create mode 100644 tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-usb-nosupport.err
delete mode 100644 tests/qemuxml2argvdata/disk-usb-nosupport.xml
rename tests/qemuxml2argvdata/{disk-usb-pci.err => disk-usb-pci.x86_64-latest.err}
(100%)
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-ccw-many.args
create mode 100644 tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-ccw.args
create mode 100644 tests/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-virtio.args
create mode 100644 tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args
rename tests/qemuxml2argvdata/{encrypted-disk-usage.args =>
encrypted-disk-usage.x86_64-4.1.0.args} (74%)
create mode 100644 tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args
rename tests/qemuxml2argvdata/{encrypted-disk.args =>
encrypted-disk.x86_64-4.1.0.args} (74%)
create mode 100644 tests/qemuxml2argvdata/encrypted-disk.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/event_idx.args
create mode 100644 tests/qemuxml2argvdata/event_idx.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.args
delete mode 100644 tests/qemuxml2argvdata/fs9p-ccw.args
delete mode 100644 tests/qemuxml2argvdata/fs9p.args
rename tests/qemuxml2argvdata/{hostdevs-drive-address-conflict.err =>
hostdevs-drive-address-conflict.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{luks-disk-invalid.err =>
luks-disk-invalid.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{luks-disks-source-both.err =>
luks-disks-source-both.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/luks-disks-source-qcow2.err
rename tests/qemuxml2argvdata/{luks-disks-source.args =>
luks-disks-source.x86_64-4.1.0.args} (80%)
create mode 100644 tests/qemuxml2argvdata/luks-disks-source.x86_64-latest.args
rename tests/qemuxml2argvdata/{luks-disks.args => luks-disks.x86_64-4.1.0.args} (77%)
create mode 100644 tests/qemuxml2argvdata/luks-disks.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/misc-no-reboot.args
create mode 100644 tests/qemuxml2argvdata/misc-no-reboot.x86_64-5.2.0.args
delete mode 100644 tests/qemuxml2argvdata/virtio-lun.args
create mode 100644 tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args
--
2.31.1
8:02 a.m.
New subject: [PATCH 01/20] testCompareXMLToArgv: Avoid use of uninitialized 'monitor_chr'
Failure of 'testQemuInfoInitArgs' jumps over the initialization of
'monitor_chr' via memset, which leads to a crash.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvtest.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index f0cfca014c..675537b05d 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -642,14 +642,14 @@ testCompareXMLToArgv(const void *data)
virArch arch = VIR_ARCH_NONE;
g_autoptr(virIdentity) sysident = virIdentityGetSystem();
+ memset(&monitor_chr, 0, sizeof(monitor_chr));
+
if (testQemuInfoInitArgs((struct testQemuInfo *) info) < 0)
goto cleanup;
if (info->arch != VIR_ARCH_NONE && info->arch != VIR_ARCH_X86_64)
qemuTestSetHostArch(&driver, info->arch);
- memset(&monitor_chr, 0, sizeof(monitor_chr));
-
if (!(conn = virGetConnect()))
goto cleanup;
--
2.31.1
8:02 a.m.
New subject: [PATCH 02/20] testQemuInfoInitArgs: Report error if path to 'latest' caps for an arch is NULL
When looking up the 'latest' caps they might not be present. Report an
error instead of crashing.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/testutilsqemu.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 164d601613..505c66b818 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -772,6 +772,12 @@ testQemuInfoInitArgs(struct testQemuInfo *info)
if (STREQ(info->args.capsver, "latest")) {
capsfile = g_strdup(virHashLookup(info->conf->capslatest,
info->args.capsarch));
+
+ if (!capsfile) {
+ fprintf(stderr, "'latest' caps for '%s' were not
found\n", info->args.capsarch);
+ return -1;
+ }
+
stripmachinealiases = true;
} else {
capsfile = g_strdup_printf("%s/caps_%s.%s.xml",
--
2.31.1
8:02 a.m.
New subject: [PATCH 03/20] qemuxml2argvtest: Remove 'boot-strict' case
It's identical to 'boot-order'.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/boot-strict.args | 48 ------------------
tests/qemuxml2argvdata/boot-strict.xml | 66 -------------------------
tests/qemuxml2argvtest.c | 2 -
3 files changed, 116 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/boot-strict.args
delete mode 100644 tests/qemuxml2argvdata/boot-strict.xml
diff --git a/tests/qemuxml2argvdata/boot-strict.args
b/tests/qemuxml2argvdata/boot-strict.args
deleted file mode 100644
index 90d3770117..0000000000
--- a/tests/qemuxml2argvdata/boot-strict.args
+++ /dev/null
@@ -1,48 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--drive file=/tmp/vda.img,format=raw,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=3
\
--drive file=/tmp/vdb.img,format=raw,if=none,id=drive-virtio-disk1 \
--device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
--drive file=/dev/HostVG/hda,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 \
--drive file=/dev/HostVG/hdb,format=raw,if=none,id=drive-ide0-0-1 \
--device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
--drive file=/dev/HostVG/hdc,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 file=/dev/fd0,format=raw,if=none,id=drive-fdc0-0-0 \
--drive file=/dev/fd1,format=raw,if=none,id=drive-fdc0-0-1 \
--global isa-fdc.driveA=drive-fdc0-0-0 \
--global isa-fdc.bootindexA=4 \
--global isa-fdc.driveB=drive-fdc0-0-1 \
--netdev user,id=hostnet0 \
--device
virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x2,bootindex=2
\
--netdev user,id=hostnet1 \
--device virtio-net-pci,netdev=hostnet1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,addr=0x3
\
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-strict.xml
b/tests/qemuxml2argvdata/boot-strict.xml
deleted file mode 100644
index 959acfb4ca..0000000000
--- a/tests/qemuxml2argvdata/boot-strict.xml
+++ /dev/null
@@ -1,66 +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='cdrom'/>
- <boot dev='network'/>
- <boot dev='hd'/>
- <boot dev='fd'/>
- </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-i386</emulator>
- <disk type='file' device='disk'>
- <source file='/tmp/vdb.img'/>
- <target dev='vdb' bus='virtio'/>
- </disk>
- <disk type='block' device='disk'>
- <source dev='/dev/HostVG/hdb'/>
- <target dev='hdb' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='1'/>
- </disk>
- <disk type='block' device='disk'>
- <source dev='/dev/HostVG/hda'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='disk'>
- <source file='/tmp/vda.img'/>
- <target dev='vda' bus='virtio'/>
- </disk>
- <disk type='block' device='cdrom'>
- <source dev='/dev/HostVG/hdc'/>
- <target dev='hdc' bus='ide'/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <disk type='block' device='floppy'>
- <source dev='/dev/fd1'/>
- <target dev='fdb' bus='fdc'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='1'/>
- </disk>
- <disk type='block' device='floppy'>
- <source dev='/dev/fd0'/>
- <target dev='fda' bus='fdc'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <controller type='usb' index='0'/>
- <controller type='fdc' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='user'>
- <mac address='00:11:22:33:44:11'/>
- <model type='virtio'/>
- </interface>
- <interface type='user'>
- <mac address='00:11:22:33:44:22'/>
- <model type='virtio'/>
- </interface>
- <memballoon model='none'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 675537b05d..cca0542b32 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1078,8 +1078,6 @@ mymain(void)
QEMU_CAPS_VIRTIO_BLK_SCSI);
DO_TEST("boot-complex",
QEMU_CAPS_VIRTIO_BLK_SCSI);
- DO_TEST("boot-strict",
- QEMU_CAPS_VIRTIO_BLK_SCSI);
/* Simplest possible <audio>, all supported with ENV */
DO_TEST_NOCAPS("audio-none-minimal");
--
2.31.1
8:02 a.m.
New subject: [PATCH 04/20] qemuxml2argvtest: Agregate all 'disk'-related test cases
There were a few disk-related test cases spread around in the test
invocation calls. Move them together with disk tests and move one
irrelevant case away from the disk test block.
Note that there are still a few tests having 'disk' in the name but they
belong to different groups mostly.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvtest.c | 50 +++++++++++++++++++++-------------------
1 file changed, 26 insertions(+), 24 deletions(-)
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index cca0542b32..d0a73aee1c 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1290,6 +1290,9 @@ mymain(void)
DO_TEST_CAPS_LATEST("hugepages-memaccess3");
DO_TEST_CAPS_LATEST("hugepages-nvdimm");
DO_TEST_NOCAPS("nosharepages");
+
+ DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW);
+
DO_TEST_NOCAPS("disk-cdrom");
DO_TEST_CAPS_VER("disk-cdrom", "2.12.0");
DO_TEST_CAPS_LATEST("disk-cdrom");
@@ -1317,7 +1320,6 @@ mymain(void)
DO_TEST("disk-virtio-ccw", QEMU_CAPS_CCW);
DO_TEST("disk-virtio-ccw-many", QEMU_CAPS_CCW);
DO_TEST("disk-virtio-s390-zpci", QEMU_CAPS_DEVICE_ZPCI, QEMU_CAPS_CCW);
- DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW);
DO_TEST("disk-order", QEMU_CAPS_VIRTIO_BLK_SCSI);
DO_TEST_CAPS_LATEST("disk-virtio-queues");
DO_TEST_NOCAPS("disk-boot-disk");
@@ -1468,6 +1470,29 @@ mymain(void)
DO_TEST_CAPS_ARCH_VER("disk-arm-virtio-sd", "aarch64",
"4.0.0");
DO_TEST_CAPS_ARCH_LATEST("disk-arm-virtio-sd", "aarch64");
+ DO_TEST("encrypted-disk", QEMU_CAPS_QCOW2_LUKS);
+ DO_TEST("encrypted-disk-usage", QEMU_CAPS_QCOW2_LUKS);
+ DO_TEST_NOCAPS("luks-disks");
+ DO_TEST_NOCAPS("luks-disks-source");
+ DO_TEST_PARSE_ERROR_NOCAPS("luks-disks-source-qcow2");
+ DO_TEST("luks-disks-source-qcow2", QEMU_CAPS_QCOW2_LUKS);
+ DO_TEST_CAPS_VER("luks-disks-source-qcow2", "5.2.0");
+ DO_TEST_CAPS_LATEST("luks-disks-source-qcow2");
+ DO_TEST_PARSE_ERROR_NOCAPS("luks-disk-invalid");
+ DO_TEST_PARSE_ERROR_NOCAPS("luks-disks-source-both");
+
+ DO_TEST_NOCAPS("disk-ide-split");
+ DO_TEST("disk-ide-wwn",
+ QEMU_CAPS_IDE_DRIVE_WWN,
+ QEMU_CAPS_SCSI_DISK_WWN);
+
+ DO_TEST_NOCAPS("disk-geometry");
+ DO_TEST("disk-blockio", QEMU_CAPS_BLOCKIO);
+
+ DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "2.12.0");
+ DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0");
+ DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations");
+
DO_TEST("graphics-egl-headless",
QEMU_CAPS_DEVICE_CIRRUS_VGA,
QEMU_CAPS_EGL_HEADLESS);
@@ -2104,17 +2129,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("cpu-translation");
qemuTestSetHostCPU(&driver, driver.hostarch, NULL);
- DO_TEST("encrypted-disk", QEMU_CAPS_QCOW2_LUKS);
- DO_TEST("encrypted-disk-usage", QEMU_CAPS_QCOW2_LUKS);
- DO_TEST_NOCAPS("luks-disks");
- DO_TEST_NOCAPS("luks-disks-source");
- DO_TEST_PARSE_ERROR_NOCAPS("luks-disks-source-qcow2");
- DO_TEST("luks-disks-source-qcow2", QEMU_CAPS_QCOW2_LUKS);
- DO_TEST_CAPS_VER("luks-disks-source-qcow2", "5.2.0");
- DO_TEST_CAPS_LATEST("luks-disks-source-qcow2");
- DO_TEST_PARSE_ERROR_NOCAPS("luks-disk-invalid");
- DO_TEST_PARSE_ERROR_NOCAPS("luks-disks-source-both");
-
DO_TEST_NOCAPS("memtune");
DO_TEST_NOCAPS("memtune-unlimited");
DO_TEST_NOCAPS("blkiotune");
@@ -2433,14 +2447,6 @@ mymain(void)
QEMU_CAPS_DEVICE_VIRTIO_MMIO);
DO_TEST_PARSE_ERROR_NOCAPS("mach-virt-serial-invalid-machine");
- DO_TEST_NOCAPS("disk-ide-split");
- DO_TEST("disk-ide-wwn",
- QEMU_CAPS_IDE_DRIVE_WWN,
- QEMU_CAPS_SCSI_DISK_WWN);
-
- DO_TEST_NOCAPS("disk-geometry");
- DO_TEST("disk-blockio", QEMU_CAPS_BLOCKIO);
-
DO_TEST("video-device-pciaddr-default",
QEMU_CAPS_KVM,
QEMU_CAPS_VNC,
@@ -3410,10 +3416,6 @@ mymain(void)
QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4,
QEMU_CAPS_ICH9_USB_EHCI1);
- DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "2.12.0");
- DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0");
- DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations");
-
DO_TEST_CAPS_LATEST("tseg-explicit-size");
DO_TEST_CAPS_LATEST_PARSE_ERROR("tseg-i440fx");
DO_TEST_CAPS_LATEST_PARSE_ERROR("tseg-invalid-size");
--
2.31.1
8:02 a.m.
New subject: [PATCH 05/20] qemuxml2argvtest: Remove fake caps versions of disk tests we have a versioned test for
Many disk-related test case have both a fake capability version and one
tied to qemu-2.12. Remove all of those fake caps tests as we have
coverage.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/disk-aio.args | 34 ---------------
.../qemuxml2argvdata/disk-cdrom-network.args | 35 ----------------
tests/qemuxml2argvdata/disk-cdrom-tray.args | 36 ----------------
tests/qemuxml2argvdata/disk-cdrom.args | 37 ----------------
tests/qemuxml2argvdata/disk-copy_on_read.args | 37 ----------------
tests/qemuxml2argvdata/disk-error-policy.args | 35 ----------------
tests/qemuxml2argvdata/disk-floppy.args | 35 ----------------
.../disk-network-gluster.args | 35 ----------------
.../qemuxml2argvdata/disk-network-iscsi.args | 42 -------------------
tests/qemuxml2argvdata/disk-network-nbd.args | 39 -----------------
.../disk-network-sheepdog.args | 33 ---------------
.../disk-network-source-auth.args | 38 -----------------
tests/qemuxml2argvdata/disk-network-vxhs.args | 32 --------------
.../qemuxml2argvdata/disk-readonly-disk.args | 34 ---------------
tests/qemuxml2argvdata/floppy-drive-fat.args | 33 ---------------
tests/qemuxml2argvtest.c | 19 ---------
16 files changed, 554 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/disk-aio.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom.args
delete mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.args
delete mode 100644 tests/qemuxml2argvdata/disk-error-policy.args
delete mode 100644 tests/qemuxml2argvdata/disk-floppy.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-gluster.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-vxhs.args
delete mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.args
delete mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.args
diff --git a/tests/qemuxml2argvdata/disk-aio.args b/tests/qemuxml2argvdata/disk-aio.args
deleted file mode 100644
index ae4cff74d5..0000000000
--- a/tests/qemuxml2argvdata/disk-aio.args
+++ /dev/null
@@ -1,34 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--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 \
--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 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.args
b/tests/qemuxml2argvdata/disk-cdrom-network.args
deleted file mode 100644
index ccac24c97d..0000000000
--- a/tests/qemuxml2argvdata/disk-cdrom-network.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-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=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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--usb \
--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?test=val,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 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.args
b/tests/qemuxml2argvdata/disk-cdrom-tray.args
deleted file mode 100644
index 07db6e00c8..0000000000
--- a/tests/qemuxml2argvdata/disk-cdrom-tray.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-test \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
-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,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,path=/tmp/lib/domain--1-test/monitor.sock,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot menu=on,strict=on \
--usb \
--drive file=/var/lib/libvirt/images/f14.img,format=qcow2,if=none,id=drive-virtio-disk0 \
--device
virtio-blk-pci,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 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-cdrom.args
b/tests/qemuxml2argvdata/disk-cdrom.args
deleted file mode 100644
index cbb1075a57..0000000000
--- a/tests/qemuxml2argvdata/disk-cdrom.args
+++ /dev/null
@@ -1,37 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--drive file=/dev/cdrom,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 \
--drive file=/root/boot.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 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 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.args
b/tests/qemuxml2argvdata/disk-copy_on_read.args
deleted file mode 100644
index ef676d6358..0000000000
--- a/tests/qemuxml2argvdata/disk-copy_on_read.args
+++ /dev/null
@@ -1,37 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-test \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
-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,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,path=/tmp/lib/domain--1-test/monitor.sock,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot menu=on,strict=on \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
--usb \
--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 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-error-policy.args
b/tests/qemuxml2argvdata/disk-error-policy.args
deleted file mode 100644
index 6004e0d697..0000000000
--- a/tests/qemuxml2argvdata/disk-error-policy.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--drive
file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,werror=stop,rerror=stop,cache=none
\
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--drive
file=/dev/HostVG/QEMUGuest2,format=qcow2,if=none,id=drive-ide0-0-1,werror=enospc,cache=none
\
--device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
--drive
file=/dev/HostVG/QEMUGuest3,format=qcow2,if=none,id=drive-ide0-1-0,werror=report,rerror=ignore,cache=none
\
--device ide-hd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-floppy.args
b/tests/qemuxml2argvdata/disk-floppy.args
deleted file mode 100644
index ee14ec4c89..0000000000
--- a/tests/qemuxml2argvdata/disk-floppy.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--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 \
--drive file=/tmp/firmware.img,format=raw,if=none,id=drive-fdc0-0-1 \
--global isa-fdc.driveA=drive-fdc0-0-0 \
--global isa-fdc.driveB=drive-fdc0-0-1 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-network-gluster.args
b/tests/qemuxml2argvdata/disk-network-gluster.args
deleted file mode 100644
index 2fe2b9fa20..0000000000
--- a/tests/qemuxml2argvdata/disk-network-gluster.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--drive
file=gluster://example.org:6000/Volume1/Image,file.debug=4,format=raw,if=none,id=drive-virtio-disk0
\
--device
virtio-blk-pci,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,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,bus=pci.0,addr=0x4,drive=drive-virtio-disk2,id=virtio-disk2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.args
b/tests/qemuxml2argvdata/disk-network-iscsi.args
deleted file mode 100644
index e63f2f073f..0000000000
--- a/tests/qemuxml2argvdata/disk-network-iscsi.args
+++ /dev/null
@@ -1,42 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
--usb \
--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,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,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
--object
secret,id=virtio-disk2-auth-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-auth-secret0,format=raw,if=none,id=drive-virtio-disk2
\
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,id=virtio-disk2 \
--object
secret,id=virtio-disk3-auth-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-auth-secret0,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.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 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-network-nbd.args
b/tests/qemuxml2argvdata/disk-network-nbd.args
deleted file mode 100644
index d25a7dcfcd..0000000000
--- a/tests/qemuxml2argvdata/disk-network-nbd.args
+++ /dev/null
@@ -1,39 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--drive file=nbd:example.org:6000,format=raw,if=none,id=drive-virtio-disk0 \
--device
virtio-blk-pci,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,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,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,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,bus=pci.0,addr=0x6,drive=drive-virtio-disk4,id=virtio-disk4 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.args
b/tests/qemuxml2argvdata/disk-network-sheepdog.args
deleted file mode 100644
index ee27a562f4..0000000000
--- a/tests/qemuxml2argvdata/disk-network-sheepdog.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--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,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.args
b/tests/qemuxml2argvdata/disk-network-source-auth.args
deleted file mode 100644
index 0a040ac4ea..0000000000
--- a/tests/qemuxml2argvdata/disk-network-source-auth.args
+++ /dev/null
@@ -1,38 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--object
secret,id=virtio-disk0-auth-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-auth-secret0,format=raw,if=none,id=drive-virtio-disk0
\
--device
virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--object
secret,id=virtio-disk1-auth-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-auth-secret0,format=raw,if=none,id=drive-virtio-disk1'
\
--device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,id=virtio-disk1 \
--object
secret,id=virtio-disk2-auth-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
--drive
'file=rbd:pool/image2:id=myname:auth_supported=cephx\;none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,file.password-secret=virtio-disk2-auth-secret0,format=raw,if=none,id=drive-virtio-disk2'
\
--device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk2,id=virtio-disk2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-network-vxhs.args
b/tests/qemuxml2argvdata/disk-network-vxhs.args
deleted file mode 100644
index d376318b98..0000000000
--- a/tests/qemuxml2argvdata/disk-network-vxhs.args
+++ /dev/null
@@ -1,32 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--drive
file.driver=vxhs,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,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251
\
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.args
b/tests/qemuxml2argvdata/disk-readonly-disk.args
deleted file mode 100644
index 4dc2f301ff..0000000000
--- a/tests/qemuxml2argvdata/disk-readonly-disk.args
+++ /dev/null
@@ -1,34 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--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 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.args
b/tests/qemuxml2argvdata/floppy-drive-fat.args
deleted file mode 100644
index 75ae7ee959..0000000000
--- a/tests/qemuxml2argvdata/floppy-drive-fat.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--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 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index d0a73aee1c..ce618a2f22 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1293,20 +1293,15 @@ mymain(void)
DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW);
- DO_TEST_NOCAPS("disk-cdrom");
DO_TEST_CAPS_VER("disk-cdrom", "2.12.0");
DO_TEST_CAPS_LATEST("disk-cdrom");
DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid");
DO_TEST_CAPS_LATEST("disk-cdrom-bus-other");
DO_TEST_NOCAPS("disk-iscsi");
- DO_TEST("disk-cdrom-network", QEMU_CAPS_KVM);
DO_TEST_CAPS_VER("disk-cdrom-network", "2.12.0");
DO_TEST_CAPS_LATEST("disk-cdrom-network");
- DO_TEST("disk-cdrom-tray",
- QEMU_CAPS_VIRTIO_TX_ALG);
DO_TEST_CAPS_VER("disk-cdrom-tray", "2.12.0");
DO_TEST_CAPS_LATEST("disk-cdrom-tray");
- DO_TEST_NOCAPS("disk-floppy");
DO_TEST_CAPS_VER("disk-floppy", "2.12.0");
DO_TEST_CAPS_LATEST("disk-floppy");
DO_TEST_CAPS_VER("disk-floppy-q35-2_9", "2.12.0");
@@ -1324,10 +1319,8 @@ mymain(void)
DO_TEST_CAPS_LATEST("disk-virtio-queues");
DO_TEST_NOCAPS("disk-boot-disk");
DO_TEST_NOCAPS("disk-boot-cdrom");
- DO_TEST_NOCAPS("floppy-drive-fat");
DO_TEST_CAPS_VER("floppy-drive-fat", "2.12.0");
DO_TEST_CAPS_LATEST("floppy-drive-fat");
- DO_TEST_NOCAPS("disk-readonly-disk");
DO_TEST_CAPS_VER("disk-readonly-disk", "2.12.0");
DO_TEST_CAPS_LATEST("disk-readonly-disk");
DO_TEST_NOCAPS("disk-fmt-qcow");
@@ -1337,7 +1330,6 @@ mymain(void)
DO_TEST_CAPS_VER("disk-shared", "2.12.0");
DO_TEST_CAPS_LATEST("disk-shared");
DO_TEST_PARSE_ERROR_NOCAPS("disk-shared-qcow");
- DO_TEST_NOCAPS("disk-error-policy");
DO_TEST_CAPS_VER("disk-error-policy", "2.12.0");
DO_TEST_CAPS_LATEST("disk-error-policy");
DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x",
"2.12.0");
@@ -1347,10 +1339,8 @@ mymain(void)
DO_TEST_CAPS_LATEST("disk-metadata-cache");
DO_TEST_CAPS_ARCH_VER_PARSE_ERROR("disk-transient", "x86_64",
"4.1.0");
DO_TEST_CAPS_LATEST("disk-transient");
- DO_TEST_NOCAPS("disk-network-nbd");
DO_TEST_CAPS_VER("disk-network-nbd", "2.12.0");
DO_TEST_CAPS_LATEST("disk-network-nbd");
- DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_SCSI_BLOCK);
DO_TEST("disk-network-iscsi-modern",
QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_SCSI_BLOCK);
@@ -1359,20 +1349,15 @@ mymain(void)
DO_TEST_PARSE_ERROR_NOCAPS("disk-network-iscsi-auth-secrettype-invalid");
DO_TEST_PARSE_ERROR_NOCAPS("disk-network-iscsi-auth-wrong-secrettype");
DO_TEST_PARSE_ERROR_NOCAPS("disk-network-source-auth-both");
- DO_TEST("disk-network-gluster",
- QEMU_CAPS_GLUSTER_DEBUG_LEVEL);
DO_TEST_CAPS_VER("disk-network-gluster", "2.12.0");
DO_TEST_CAPS_LATEST("disk-network-gluster");
DO_TEST_CAPS_VER("disk-network-rbd", "2.12.0");
DO_TEST_CAPS_LATEST("disk-network-rbd");
DO_TEST_FAILURE_NOCAPS("disk-network-rbd-no-colon");
- DO_TEST_NOCAPS("disk-network-sheepdog");
DO_TEST_CAPS_VER("disk-network-sheepdog", "2.12.0");
DO_TEST_CAPS_VER("disk-network-sheepdog", "6.0.0");
- DO_TEST_NOCAPS("disk-network-source-auth");
DO_TEST_CAPS_VER("disk-network-source-auth", "2.12.0");
DO_TEST_CAPS_LATEST("disk-network-source-auth");
- DO_TEST("disk-network-vxhs", QEMU_CAPS_VXHS);
DO_TEST_CAPS_LATEST("disk-network-nfs");
driver.config->vxhsTLS = 1;
driver.config->nbdTLSx509secretUUID =
g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea");
@@ -1412,7 +1397,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("controller-virtio-scsi");
DO_TEST("disk-sata-device",
QEMU_CAPS_ICH9_AHCI);
- DO_TEST_NOCAPS("disk-aio");
DO_TEST_CAPS_VER("disk-aio", "2.12.0");
DO_TEST_CAPS_LATEST("disk-aio");
DO_TEST_CAPS_LATEST("disk-aio-io_uring");
@@ -1422,9 +1406,6 @@ mymain(void)
QEMU_CAPS_VIRTIO_IOEVENTFD,
QEMU_CAPS_VIRTIO_TX_ALG,
QEMU_CAPS_VIRTIO_BLK_SCSI);
- DO_TEST("disk-copy_on_read",
- QEMU_CAPS_VIRTIO_TX_ALG,
- QEMU_CAPS_VIRTIO_BLK_SCSI);
DO_TEST_CAPS_VER("disk-copy_on_read", "2.12.0");
DO_TEST_CAPS_LATEST("disk-copy_on_read");
DO_TEST_CAPS_VER("disk-discard", "4.1.0");
--
2.31.1
8:02 a.m.
New subject: [PATCH 06/20] qemuxml2argvtest: Remove negative case for 'luks-disks-source-qcow2'
Currently we no longer support qemus which would miss the necessary
capability, thus the test can't be converted to DO_TEST_CAPS_LATEST.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/luks-disks-source-qcow2.err | 1 -
tests/qemuxml2argvtest.c | 1 -
2 files changed, 2 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/luks-disks-source-qcow2.err
diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.err
b/tests/qemuxml2argvdata/luks-disks-source-qcow2.err
deleted file mode 100644
index 3c9f70a04a..0000000000
--- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: LUKS encrypted QCOW2 images are not supported by this QEMU
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index ce618a2f22..6ec486bdfc 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1455,7 +1455,6 @@ mymain(void)
DO_TEST("encrypted-disk-usage", QEMU_CAPS_QCOW2_LUKS);
DO_TEST_NOCAPS("luks-disks");
DO_TEST_NOCAPS("luks-disks-source");
- DO_TEST_PARSE_ERROR_NOCAPS("luks-disks-source-qcow2");
DO_TEST("luks-disks-source-qcow2", QEMU_CAPS_QCOW2_LUKS);
DO_TEST_CAPS_VER("luks-disks-source-qcow2", "5.2.0");
DO_TEST_CAPS_LATEST("luks-disks-source-qcow2");
--
2.31.1
8:02 a.m.
New subject: [PATCH 07/20] qemuxml2argvtest: Remove 'disk-usb-nosupport' case
In effor to convert all test cases to real capability testing, this
test doesn't make sense any more as even the oldest QEMU supported
supports USB storage.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/disk-usb-nosupport.err | 1 -
tests/qemuxml2argvdata/disk-usb-nosupport.xml | 35 -------------------
tests/qemuxml2argvtest.c | 1 -
3 files changed, 37 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/disk-usb-nosupport.err
delete mode 100644 tests/qemuxml2argvdata/disk-usb-nosupport.xml
diff --git a/tests/qemuxml2argvdata/disk-usb-nosupport.err
b/tests/qemuxml2argvdata/disk-usb-nosupport.err
deleted file mode 100644
index 87e8a9dec3..0000000000
--- a/tests/qemuxml2argvdata/disk-usb-nosupport.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: This QEMU doesn't support '-device usb-storage'
diff --git a/tests/qemuxml2argvdata/disk-usb-nosupport.xml
b/tests/qemuxml2argvdata/disk-usb-nosupport.xml
deleted file mode 100644
index b88ecf1935..0000000000
--- a/tests/qemuxml2argvdata/disk-usb-nosupport.xml
+++ /dev/null
@@ -1,35 +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-i386</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='disk'>
- <driver name='qemu' type='raw'/>
- <source file='/tmp/usbdisk.img'/>
- <target dev='sda' bus='usb'/>
- </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 6ec486bdfc..fa58c7d0ef 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1376,7 +1376,6 @@ mymain(void)
DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid",
QEMU_CAPS_VIRTIO_SCSI);
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-attaching-partition-nosupport");
- DO_TEST_PARSE_ERROR_NOCAPS("disk-usb-nosupport");
DO_TEST("disk-usb-device",
QEMU_CAPS_DEVICE_USB_STORAGE);
DO_TEST("disk-usb-device-removable",
--
2.31.1
8:02 a.m.
New subject: [PATCH 08/20] qemuxml2argvtest: Convert encrypted disk test cases to DO_TEST_CAPS_LATEST
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...=> encrypted-disk-usage.x86_64-4.1.0.args} | 11 ++--
.../encrypted-disk-usage.x86_64-latest.args | 37 +++++++++++++
....args => encrypted-disk.x86_64-4.1.0.args} | 11 ++--
.../encrypted-disk.x86_64-latest.args | 37 +++++++++++++
...rr => luks-disk-invalid.x86_64-latest.err} | 0
... luks-disks-source-both.x86_64-latest.err} | 0
...gs => luks-disks-source.x86_64-4.1.0.args} | 17 +++---
.../luks-disks-source.x86_64-latest.args | 54 +++++++++++++++++++
...isks.args => luks-disks.x86_64-4.1.0.args} | 11 ++--
.../luks-disks.x86_64-latest.args | 41 ++++++++++++++
tests/qemuxml2argvtest.c | 17 +++---
11 files changed, 206 insertions(+), 30 deletions(-)
rename tests/qemuxml2argvdata/{encrypted-disk-usage.args =>
encrypted-disk-usage.x86_64-4.1.0.args} (74%)
create mode 100644 tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args
rename tests/qemuxml2argvdata/{encrypted-disk.args =>
encrypted-disk.x86_64-4.1.0.args} (74%)
create mode 100644 tests/qemuxml2argvdata/encrypted-disk.x86_64-latest.args
rename tests/qemuxml2argvdata/{luks-disk-invalid.err =>
luks-disk-invalid.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{luks-disks-source-both.err =>
luks-disks-source-both.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{luks-disks-source.args =>
luks-disks-source.x86_64-4.1.0.args} (80%)
create mode 100644 tests/qemuxml2argvdata/luks-disks-source.x86_64-latest.args
rename tests/qemuxml2argvdata/{luks-disks.args => luks-disks.x86_64-4.1.0.args} (77%)
create mode 100644 tests/qemuxml2argvdata/luks-disks.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.args
b/tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-4.1.0.args
similarity index 74%
rename from tests/qemuxml2argvdata/encrypted-disk-usage.args
rename to tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-4.1.0.args
index 7e28fe8d2b..d93ee8bdcc 100644
--- a/tests/qemuxml2argvdata/encrypted-disk-usage.args
+++ b/tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-4.1.0.args
@@ -11,23 +11,24 @@ QEMU_AUDIO_DRV=none \
-name guest=encryptdisk,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-encryptdisk/master-key.aes \
--machine pc,accel=tcg,usb=off,dump-guest-core=off \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
-display none \
-no-user-config \
-nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-object
secret,id=virtio-disk0-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-drive
file=/storage/guest_disks/encryptdisk,encrypt.format=luks,encrypt.key-secret=virtio-disk0-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk0
\
--device
virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,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/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args
b/tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args
new file mode 100644
index 0000000000..943b442478
--- /dev/null
+++ b/tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args
@@ -0,0 +1,37 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-encryptdisk \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-encryptdisk/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-encryptdisk/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=encryptdisk,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-encryptdisk/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 1024 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-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
'{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}'
\
+-blockdev
'{"driver":"file","filename":"/storage/guest_disks/encryptdisk","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","encrypt":{"format":"luks","key-secret":"libvirt-1-format-encryption-secret0"},"file":"libvirt-1-storage"}'
\
+-device
virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
+-audiodev id=audio1,driver=none \
+-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/qemuxml2argvdata/encrypted-disk.args
b/tests/qemuxml2argvdata/encrypted-disk.x86_64-4.1.0.args
similarity index 74%
rename from tests/qemuxml2argvdata/encrypted-disk.args
rename to tests/qemuxml2argvdata/encrypted-disk.x86_64-4.1.0.args
index c850f3afaf..d4e33f3084 100644
--- a/tests/qemuxml2argvdata/encrypted-disk.args
+++ b/tests/qemuxml2argvdata/encrypted-disk.x86_64-4.1.0.args
@@ -11,23 +11,24 @@ QEMU_AUDIO_DRV=none \
-name guest=encryptdisk,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-encryptdisk/master-key.aes \
--machine pc,accel=tcg,usb=off,dump-guest-core=off \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
-display none \
-no-user-config \
-nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-object
secret,id=virtio-disk0-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-drive
file=/storage/guest_disks/encryptdisk,encrypt.format=luks,encrypt.key-secret=virtio-disk0-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk0
\
--device
virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=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/encrypted-disk.x86_64-latest.args
b/tests/qemuxml2argvdata/encrypted-disk.x86_64-latest.args
new file mode 100644
index 0000000000..901ea75a00
--- /dev/null
+++ b/tests/qemuxml2argvdata/encrypted-disk.x86_64-latest.args
@@ -0,0 +1,37 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-encryptdisk \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-encryptdisk/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-encryptdisk/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=encryptdisk,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-encryptdisk/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 1024 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-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
'{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}'
\
+-blockdev
'{"driver":"file","filename":"/storage/guest_disks/encryptdisk","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","encrypt":{"format":"luks","key-secret":"libvirt-1-format-encryption-secret0"},"file":"libvirt-1-storage"}'
\
+-device
virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
+-audiodev id=audio1,driver=none \
+-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/luks-disk-invalid.err
b/tests/qemuxml2argvdata/luks-disk-invalid.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/luks-disk-invalid.err
rename to tests/qemuxml2argvdata/luks-disk-invalid.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/luks-disks-source-both.err
b/tests/qemuxml2argvdata/luks-disks-source-both.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/luks-disks-source-both.err
rename to tests/qemuxml2argvdata/luks-disks-source-both.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/luks-disks-source.args
b/tests/qemuxml2argvdata/luks-disks-source.x86_64-4.1.0.args
similarity index 80%
rename from tests/qemuxml2argvdata/luks-disks-source.args
rename to tests/qemuxml2argvdata/luks-disks-source.x86_64-4.1.0.args
index 4d056da220..fa5cf48bae 100644
--- a/tests/qemuxml2argvdata/luks-disks-source.args
+++ b/tests/qemuxml2argvdata/luks-disks-source.x86_64-4.1.0.args
@@ -13,34 +13,35 @@ QEMU_AUDIO_DRV=none \
-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-encryptdisk/master-key.aes \
-machine pc-i440fx-2.1,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
-display none \
-no-user-config \
-nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-object
secret,id=virtio-disk0-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-drive
file=/storage/guest_disks/encryptdisk,key-secret=virtio-disk0-encryption-secret0,format=luks,if=none,id=drive-virtio-disk0
\
--device
virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1
\
-object
secret,id=virtio-disk1-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-drive
file=/storage/guest_disks/encryptdisk2,key-secret=virtio-disk1-encryption-secret0,format=luks,if=none,id=drive-virtio-disk1
\
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
+-device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
-object
secret,id=virtio-disk2-auth-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-object
secret,id=virtio-disk2-encryption-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-auth-secret0,key-secret=virtio-disk2-encryption-secret0,format=luks,if=none,id=drive-virtio-disk2
\
--device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk2,id=virtio-disk2 \
+-device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk2,id=virtio-disk2 \
-object
secret,id=virtio-disk3-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-drive
file.driver=iscsi,file.portal=iscsi.example.com:3260,file.target=demo-target,file.lun=3,file.transport=tcp,key-secret=virtio-disk3-encryption-secret0,format=luks,if=none,id=drive-virtio-disk3
\
--device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,id=virtio-disk3 \
+-device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,id=virtio-disk3 \
-object
secret,id=virtio-disk4-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-drive
'file=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,key-secret=virtio-disk4-encryption-secret0,format=luks,if=none,id=drive-virtio-disk4'
\
--device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk4,id=virtio-disk4 \
+-device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x7,drive=drive-virtio-disk4,id=virtio-disk4 \
-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/qemuxml2argvdata/luks-disks-source.x86_64-latest.args
b/tests/qemuxml2argvdata/luks-disks-source.x86_64-latest.args
new file mode 100644
index 0000000000..67ecf0ea95
--- /dev/null
+++ b/tests/qemuxml2argvdata/luks-disks-source.x86_64-latest.args
@@ -0,0 +1,54 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-encryptdisk \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-encryptdisk/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-encryptdisk/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=encryptdisk,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-encryptdisk/master-key.aes"}'
\
+-machine pc-i440fx-2.1,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 1024 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-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
'{"qom-type":"secret","id":"libvirt-5-format-encryption-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}'
\
+-blockdev
'{"driver":"file","filename":"/storage/guest_disks/encryptdisk","node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-5-format","read-only":false,"driver":"luks","key-secret":"libvirt-5-format-encryption-secret0","file":"libvirt-5-storage"}'
\
+-device
virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-5-format,id=virtio-disk0,bootindex=1 \
+-object
'{"qom-type":"secret","id":"libvirt-4-format-encryption-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}'
\
+-blockdev
'{"driver":"file","filename":"/storage/guest_disks/encryptdisk2","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-4-format","read-only":false,"driver":"luks","key-secret":"libvirt-4-format-encryption-secret0","file":"libvirt-4-storage"}'
\
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-4-format,id=virtio-disk1 \
+-object
'{"qom-type":"secret","id":"libvirt-3-storage-auth-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}'
\
+-object
'{"qom-type":"secret","id":"libvirt-3-format-encryption-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}'
\
+-blockdev
'{"driver":"iscsi","portal":"example.org:6000","target":"iqn.1992-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","password-secret":"libvirt-3-storage-auth-secret0","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-3-format","read-only":false,"driver":"luks","key-secret":"libvirt-3-format-encryption-secret0","file":"libvirt-3-storage"}'
\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-3-format,id=virtio-disk2 \
+-object
'{"qom-type":"secret","id":"libvirt-2-format-encryption-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}'
\
+-blockdev
'{"driver":"iscsi","portal":"iscsi.example.com:3260","target":"demo-target","lun":3,"transport":"tcp","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"luks","key-secret":"libvirt-2-format-encryption-secret0","file":"libvirt-2-storage"}'
\
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=libvirt-2-format,id=virtio-disk3 \
+-object
'{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}'
\
+-blockdev
'{"driver":"rbd","pool":"pool","image":"image","server":[{"host":"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"},{"host":"mon3.example.org","port":"6322"}],"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"luks","key-secret":"libvirt-1-format-encryption-secret0","file":"libvirt-1-storage"}'
\
+-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=libvirt-1-format,id=virtio-disk4 \
+-audiodev id=audio1,driver=none \
+-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/qemuxml2argvdata/luks-disks.args
b/tests/qemuxml2argvdata/luks-disks.x86_64-4.1.0.args
similarity index 77%
rename from tests/qemuxml2argvdata/luks-disks.args
rename to tests/qemuxml2argvdata/luks-disks.x86_64-4.1.0.args
index 1cd04329e6..bf0eee7cae 100644
--- a/tests/qemuxml2argvdata/luks-disks.args
+++ b/tests/qemuxml2argvdata/luks-disks.x86_64-4.1.0.args
@@ -13,24 +13,25 @@ QEMU_AUDIO_DRV=none \
-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-encryptdisk/master-key.aes \
-machine pc-i440fx-2.1,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
-display none \
-no-user-config \
-nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-object
secret,id=virtio-disk0-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-drive
file=/storage/guest_disks/encryptdisk,key-secret=virtio-disk0-encryption-secret0,format=luks,if=none,id=drive-virtio-disk0
\
--device
virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1
\
-object
secret,id=virtio-disk1-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-drive
file=/storage/guest_disks/encryptdisk2,key-secret=virtio-disk1-encryption-secret0,format=luks,if=none,id=drive-virtio-disk1
\
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
+-device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
-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/qemuxml2argvdata/luks-disks.x86_64-latest.args
b/tests/qemuxml2argvdata/luks-disks.x86_64-latest.args
new file mode 100644
index 0000000000..c9db60c736
--- /dev/null
+++ b/tests/qemuxml2argvdata/luks-disks.x86_64-latest.args
@@ -0,0 +1,41 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-encryptdisk \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-encryptdisk/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-encryptdisk/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=encryptdisk,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-encryptdisk/master-key.aes"}'
\
+-machine pc-i440fx-2.1,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 1024 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-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
'{"qom-type":"secret","id":"libvirt-2-format-encryption-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}'
\
+-blockdev
'{"driver":"file","filename":"/storage/guest_disks/encryptdisk","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"luks","key-secret":"libvirt-2-format-encryption-secret0","file":"libvirt-2-storage"}'
\
+-device
virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-2-format,id=virtio-disk0,bootindex=1 \
+-object
'{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}'
\
+-blockdev
'{"driver":"file","filename":"/storage/guest_disks/encryptdisk2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"luks","key-secret":"libvirt-1-format-encryption-secret0","file":"libvirt-1-storage"}'
\
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-1-format,id=virtio-disk1 \
+-audiodev id=audio1,driver=none \
+-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 fa58c7d0ef..39de7656e7 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1450,15 +1450,18 @@ mymain(void)
DO_TEST_CAPS_ARCH_VER("disk-arm-virtio-sd", "aarch64",
"4.0.0");
DO_TEST_CAPS_ARCH_LATEST("disk-arm-virtio-sd", "aarch64");
- DO_TEST("encrypted-disk", QEMU_CAPS_QCOW2_LUKS);
- DO_TEST("encrypted-disk-usage", QEMU_CAPS_QCOW2_LUKS);
- DO_TEST_NOCAPS("luks-disks");
- DO_TEST_NOCAPS("luks-disks-source");
- DO_TEST("luks-disks-source-qcow2", QEMU_CAPS_QCOW2_LUKS);
+ DO_TEST_CAPS_VER("encrypted-disk", "4.1.0");
+ DO_TEST_CAPS_LATEST("encrypted-disk");
+ DO_TEST_CAPS_VER("encrypted-disk-usage", "4.1.0");
+ DO_TEST_CAPS_LATEST("encrypted-disk-usage");
+ DO_TEST_CAPS_VER("luks-disks", "4.1.0");
+ DO_TEST_CAPS_LATEST("luks-disks");
+ DO_TEST_CAPS_VER("luks-disks-source", "4.1.0");
+ DO_TEST_CAPS_LATEST("luks-disks-source");
DO_TEST_CAPS_VER("luks-disks-source-qcow2", "5.2.0");
DO_TEST_CAPS_LATEST("luks-disks-source-qcow2");
- DO_TEST_PARSE_ERROR_NOCAPS("luks-disk-invalid");
- DO_TEST_PARSE_ERROR_NOCAPS("luks-disks-source-both");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("luks-disk-invalid");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("luks-disks-source-both");
DO_TEST_NOCAPS("disk-ide-split");
DO_TEST("disk-ide-wwn",
--
2.31.1
8:02 a.m.
New subject: [PATCH 09/20] qemuxml2argvtest: Use DO_TEST_CAPS_LATEST_PARSE_ERROR for disk cases
Convert all the disk-related negative cases to use 'latest'
capabilities. The checks are mostly related to validation so using
real capabilities doesn't influence the outcome.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...> disk-address-conflict.x86_64-latest.err} | 0
...device-lun-type-invalid.x86_64-latest.err} | 0
...dc-incompatible-address.x86_64-latest.err} | 0
...cow.err => disk-fmt-cow.x86_64-latest.err} | 0
...dir.err => disk-fmt-dir.x86_64-latest.err} | 0
...iso.err => disk-fmt-iso.x86_64-latest.err} | 0
...v-scsi-address-conflict.x86_64-latest.err} | 0
...de-incompatible-address.x86_64-latest.err} | 0
...-missing-target-invalid.x86_64-latest.err} | 0
...auth-secrettype-invalid.x86_64-latest.err} | 0
...i-auth-wrong-secrettype.x86_64-latest.err} | 0
...etwork-source-auth-both.x86_64-latest.err} | 0
...rr => disk-same-targets.x86_64-latest.err} | 0
...ta-incompatible-address.x86_64-latest.err} | 0
...si-disk-vpd-build-error.x86_64-latest.err} | 0
...si-incompatible-address.x86_64-latest.err} | 0
...err => disk-shared-qcow.x86_64-latest.err} | 0
...pci.err => disk-usb-pci.x86_64-latest.err} | 0
...-drive-address-conflict.x86_64-latest.err} | 0
tests/qemuxml2argvtest.c | 48 ++++++++-----------
20 files changed, 19 insertions(+), 29 deletions(-)
rename tests/qemuxml2argvdata/{disk-address-conflict.err =>
disk-address-conflict.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{disk-device-lun-type-invalid.err =>
disk-device-lun-type-invalid.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{disk-fdc-incompatible-address.err =>
disk-fdc-incompatible-address.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{disk-fmt-cow.err => disk-fmt-cow.x86_64-latest.err}
(100%)
rename tests/qemuxml2argvdata/{disk-fmt-dir.err => disk-fmt-dir.x86_64-latest.err}
(100%)
rename tests/qemuxml2argvdata/{disk-fmt-iso.err => disk-fmt-iso.x86_64-latest.err}
(100%)
rename tests/qemuxml2argvdata/{disk-hostdev-scsi-address-conflict.err =>
disk-hostdev-scsi-address-conflict.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{disk-ide-incompatible-address.err =>
disk-ide-incompatible-address.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{disk-missing-target-invalid.err =>
disk-missing-target-invalid.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{disk-network-iscsi-auth-secrettype-invalid.err =>
disk-network-iscsi-auth-secrettype-invalid.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{disk-network-iscsi-auth-wrong-secrettype.err =>
disk-network-iscsi-auth-wrong-secrettype.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{disk-network-source-auth-both.err =>
disk-network-source-auth-both.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{disk-same-targets.err =>
disk-same-targets.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{disk-sata-incompatible-address.err =>
disk-sata-incompatible-address.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{disk-scsi-disk-vpd-build-error.err =>
disk-scsi-disk-vpd-build-error.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{disk-scsi-incompatible-address.err =>
disk-scsi-incompatible-address.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{disk-shared-qcow.err =>
disk-shared-qcow.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{disk-usb-pci.err => disk-usb-pci.x86_64-latest.err}
(100%)
rename tests/qemuxml2argvdata/{hostdevs-drive-address-conflict.err =>
hostdevs-drive-address-conflict.x86_64-latest.err} (100%)
diff --git a/tests/qemuxml2argvdata/disk-address-conflict.err
b/tests/qemuxml2argvdata/disk-address-conflict.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/disk-address-conflict.err
rename to tests/qemuxml2argvdata/disk-address-conflict.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/disk-device-lun-type-invalid.err
b/tests/qemuxml2argvdata/disk-device-lun-type-invalid.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/disk-device-lun-type-invalid.err
rename to tests/qemuxml2argvdata/disk-device-lun-type-invalid.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/disk-fdc-incompatible-address.err
b/tests/qemuxml2argvdata/disk-fdc-incompatible-address.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/disk-fdc-incompatible-address.err
rename to tests/qemuxml2argvdata/disk-fdc-incompatible-address.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/disk-fmt-cow.err
b/tests/qemuxml2argvdata/disk-fmt-cow.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/disk-fmt-cow.err
rename to tests/qemuxml2argvdata/disk-fmt-cow.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/disk-fmt-dir.err
b/tests/qemuxml2argvdata/disk-fmt-dir.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/disk-fmt-dir.err
rename to tests/qemuxml2argvdata/disk-fmt-dir.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/disk-fmt-iso.err
b/tests/qemuxml2argvdata/disk-fmt-iso.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/disk-fmt-iso.err
rename to tests/qemuxml2argvdata/disk-fmt-iso.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.err
b/tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.err
rename to tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/disk-ide-incompatible-address.err
b/tests/qemuxml2argvdata/disk-ide-incompatible-address.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/disk-ide-incompatible-address.err
rename to tests/qemuxml2argvdata/disk-ide-incompatible-address.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/disk-missing-target-invalid.err
b/tests/qemuxml2argvdata/disk-missing-target-invalid.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/disk-missing-target-invalid.err
rename to tests/qemuxml2argvdata/disk-missing-target-invalid.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid.err
b/tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid.err
rename to
tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.err
b/tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.err
rename to
tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/disk-network-source-auth-both.err
b/tests/qemuxml2argvdata/disk-network-source-auth-both.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/disk-network-source-auth-both.err
rename to tests/qemuxml2argvdata/disk-network-source-auth-both.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/disk-same-targets.err
b/tests/qemuxml2argvdata/disk-same-targets.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/disk-same-targets.err
rename to tests/qemuxml2argvdata/disk-same-targets.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/disk-sata-incompatible-address.err
b/tests/qemuxml2argvdata/disk-sata-incompatible-address.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/disk-sata-incompatible-address.err
rename to tests/qemuxml2argvdata/disk-sata-incompatible-address.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.err
b/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.err
rename to tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/disk-scsi-incompatible-address.err
b/tests/qemuxml2argvdata/disk-scsi-incompatible-address.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/disk-scsi-incompatible-address.err
rename to tests/qemuxml2argvdata/disk-scsi-incompatible-address.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/disk-shared-qcow.err
b/tests/qemuxml2argvdata/disk-shared-qcow.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/disk-shared-qcow.err
rename to tests/qemuxml2argvdata/disk-shared-qcow.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/disk-usb-pci.err
b/tests/qemuxml2argvdata/disk-usb-pci.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/disk-usb-pci.err
rename to tests/qemuxml2argvdata/disk-usb-pci.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/hostdevs-drive-address-conflict.err
b/tests/qemuxml2argvdata/hostdevs-drive-address-conflict.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/hostdevs-drive-address-conflict.err
rename to tests/qemuxml2argvdata/hostdevs-drive-address-conflict.x86_64-latest.err
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 39de7656e7..823270966e 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1324,12 +1324,12 @@ mymain(void)
DO_TEST_CAPS_VER("disk-readonly-disk", "2.12.0");
DO_TEST_CAPS_LATEST("disk-readonly-disk");
DO_TEST_NOCAPS("disk-fmt-qcow");
- DO_TEST_PARSE_ERROR_NOCAPS("disk-fmt-cow");
- DO_TEST_PARSE_ERROR_NOCAPS("disk-fmt-dir");
- DO_TEST_PARSE_ERROR_NOCAPS("disk-fmt-iso");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-cow");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-dir");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-iso");
DO_TEST_CAPS_VER("disk-shared", "2.12.0");
DO_TEST_CAPS_LATEST("disk-shared");
- DO_TEST_PARSE_ERROR_NOCAPS("disk-shared-qcow");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-shared-qcow");
DO_TEST_CAPS_VER("disk-error-policy", "2.12.0");
DO_TEST_CAPS_LATEST("disk-error-policy");
DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x",
"2.12.0");
@@ -1346,9 +1346,9 @@ mymain(void)
QEMU_CAPS_SCSI_BLOCK);
DO_TEST_CAPS_VER("disk-network-iscsi", "2.12.0");
DO_TEST_CAPS_LATEST("disk-network-iscsi");
- DO_TEST_PARSE_ERROR_NOCAPS("disk-network-iscsi-auth-secrettype-invalid");
- DO_TEST_PARSE_ERROR_NOCAPS("disk-network-iscsi-auth-wrong-secrettype");
- DO_TEST_PARSE_ERROR_NOCAPS("disk-network-source-auth-both");
+
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-invalid");
+
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-wrong-secrettype");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-source-auth-both");
DO_TEST_CAPS_VER("disk-network-gluster", "2.12.0");
DO_TEST_CAPS_LATEST("disk-network-gluster");
DO_TEST_CAPS_VER("disk-network-rbd", "2.12.0");
@@ -1373,16 +1373,14 @@ mymain(void)
DO_TEST_NOCAPS("disk-no-boot");
DO_TEST_CAPS_LATEST("disk-nvme");
DO_TEST_CAPS_LATEST("disk-vhostuser");
- DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid",
- QEMU_CAPS_VIRTIO_SCSI);
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-device-lun-type-invalid");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-attaching-partition-nosupport");
DO_TEST("disk-usb-device",
QEMU_CAPS_DEVICE_USB_STORAGE);
DO_TEST("disk-usb-device-removable",
QEMU_CAPS_DEVICE_USB_STORAGE,
QEMU_CAPS_USB_STORAGE_REMOVABLE);
- DO_TEST_PARSE_ERROR("disk-usb-pci",
- QEMU_CAPS_DEVICE_USB_STORAGE);
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-usb-pci");
DO_TEST_CAPS_LATEST("disk-scsi");
DO_TEST_CAPS_LATEST("disk-scsi-device-auto");
DO_TEST("disk-scsi-disk-split",
@@ -1391,8 +1389,7 @@ mymain(void)
QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN);
DO_TEST("disk-scsi-disk-vpd",
QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN);
- DO_TEST_PARSE_ERROR("disk-scsi-disk-vpd-build-error",
- QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN);
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-disk-vpd-build-error");
DO_TEST_CAPS_LATEST("controller-virtio-scsi");
DO_TEST("disk-sata-device",
QEMU_CAPS_ICH9_AHCI);
@@ -1412,16 +1409,11 @@ mymain(void)
DO_TEST_CAPS_VER("disk-detect-zeroes", "2.12.0");
DO_TEST_CAPS_LATEST("disk-detect-zeroes");
DO_TEST_NOCAPS("disk-snapshot");
- DO_TEST_PARSE_ERROR("disk-same-targets",
- QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_USB_STORAGE);
- DO_TEST_PARSE_ERROR("disk-missing-target-invalid", QEMU_CAPS_SCSI_LSI);
- DO_TEST_PARSE_ERROR("disk-address-conflict",
- QEMU_CAPS_ICH9_AHCI);
- DO_TEST_PARSE_ERROR("disk-hostdev-scsi-address-conflict",
- QEMU_CAPS_VIRTIO_SCSI);
- DO_TEST_PARSE_ERROR("hostdevs-drive-address-conflict",
- QEMU_CAPS_VIRTIO_SCSI);
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-same-targets");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-missing-target-invalid");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-address-conflict");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-hostdev-scsi-address-conflict");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdevs-drive-address-conflict");
DO_TEST("event_idx",
QEMU_CAPS_VIRTIO_BLK_EVENT_IDX,
QEMU_CAPS_VIRTIO_NET_EVENT_IDX,
@@ -1433,12 +1425,10 @@ mymain(void)
QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("disk-serial",
QEMU_CAPS_KVM);
- DO_TEST_PARSE_ERROR_NOCAPS("disk-fdc-incompatible-address");
- DO_TEST_PARSE_ERROR_NOCAPS("disk-ide-incompatible-address");
- DO_TEST_PARSE_ERROR("disk-sata-incompatible-address",
- QEMU_CAPS_ICH9_AHCI);
- DO_TEST_PARSE_ERROR("disk-scsi-incompatible-address",
- QEMU_CAPS_VIRTIO_SCSI);
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fdc-incompatible-address");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-ide-incompatible-address");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-sata-incompatible-address");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-incompatible-address");
DO_TEST_CAPS_VER("disk-backing-chains-index", "2.12.0");
DO_TEST_CAPS_LATEST("disk-backing-chains-index");
DO_TEST_CAPS_VER("disk-backing-chains-noindex", "2.12.0");
--
2.31.1
8:02 a.m.
New subject: [PATCH 10/20] qemuxml2argvtest: Use real caps for all disk frontend property tests
Cases for covering disk frontend properties can be converted to
DO_TEST_CAPS_LATEST without any need for intermediate capabilities.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/disk-blockio.args | 34 ----------
.../disk-blockio.x86_64-latest.args | 39 +++++++++++
tests/qemuxml2argvdata/disk-boot-cdrom.args | 33 ----------
.../disk-boot-cdrom.x86_64-latest.args | 38 +++++++++++
tests/qemuxml2argvdata/disk-boot-disk.args | 33 ----------
.../disk-boot-disk.x86_64-latest.args | 38 +++++++++++
tests/qemuxml2argvdata/disk-floppy-tray.args | 36 -----------
.../disk-floppy-tray.x86_64-latest.args | 42 ++++++++++++
tests/qemuxml2argvdata/disk-geometry.args | 32 ----------
.../disk-geometry.x86_64-latest.args | 36 +++++++++++
tests/qemuxml2argvdata/disk-ide-split.args | 34 ----------
.../disk-ide-split.x86_64-latest.args | 39 +++++++++++
tests/qemuxml2argvdata/disk-ide-wwn.args | 32 ----------
.../disk-ide-wwn.x86_64-latest.args | 36 +++++++++++
tests/qemuxml2argvdata/disk-ioeventfd.args | 37 -----------
.../disk-ioeventfd.x86_64-latest.args | 42 ++++++++++++
tests/qemuxml2argvdata/disk-no-boot.args | 36 -----------
.../disk-no-boot.x86_64-latest.args | 42 ++++++++++++
tests/qemuxml2argvdata/disk-order.args | 38 -----------
.../disk-order.x86_64-latest.args | 45 +++++++++++++
tests/qemuxml2argvdata/disk-sata-device.args | 33 ----------
.../disk-sata-device.x86_64-latest.args | 37 +++++++++++
.../disk-scsi-disk-split.args | 42 ------------
.../disk-scsi-disk-split.x86_64-latest.args | 49 ++++++++++++++
.../qemuxml2argvdata/disk-scsi-disk-vpd.args | 36 -----------
.../disk-scsi-disk-vpd.x86_64-latest.args | 41 ++++++++++++
.../qemuxml2argvdata/disk-scsi-disk-wwn.args | 36 -----------
.../disk-scsi-disk-wwn.x86_64-latest.args | 41 ++++++++++++
.../disk-scsi-lun-passthrough.args | 36 -----------
...sk-scsi-lun-passthrough.x86_64-latest.args | 41 ++++++++++++
tests/qemuxml2argvdata/disk-serial.args | 35 ----------
.../disk-serial.x86_64-latest.args | 40 ++++++++++++
tests/qemuxml2argvdata/disk-snapshot.args | 36 -----------
.../disk-snapshot.x86_64-latest.args | 42 ++++++++++++
.../disk-usb-device-removable.args | 34 ----------
...sk-usb-device-removable.x86_64-latest.args | 39 +++++++++++
tests/qemuxml2argvdata/disk-usb-device.args | 34 ----------
.../disk-usb-device.x86_64-latest.args | 39 +++++++++++
tests/qemuxml2argvdata/disk-virtio.args | 37 -----------
.../disk-virtio.x86_64-latest.args | 44 +++++++++++++
tests/qemuxml2argvdata/event_idx.args | 37 -----------
.../event_idx.x86_64-latest.args | 42 ++++++++++++
tests/qemuxml2argvdata/virtio-lun.args | 37 -----------
.../virtio-lun.x86_64-latest.args | 42 ++++++++++++
tests/qemuxml2argvtest.c | 64 +++++++------------
45 files changed, 916 insertions(+), 820 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/disk-blockio.args
create mode 100644 tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-boot-cdrom.args
create mode 100644 tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-boot-disk.args
create mode 100644 tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-floppy-tray.args
create mode 100644 tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-geometry.args
create mode 100644 tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-ide-split.args
create mode 100644 tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-ide-wwn.args
create mode 100644 tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-ioeventfd.args
create mode 100644 tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-no-boot.args
create mode 100644 tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-order.args
create mode 100644 tests/qemuxml2argvdata/disk-order.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-sata-device.args
create mode 100644 tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-split.args
create mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
create mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
create mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
create mode 100644 tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-serial.args
create mode 100644 tests/qemuxml2argvdata/disk-serial.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-snapshot.args
create mode 100644 tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-usb-device-removable.args
create mode 100644 tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-usb-device.args
create mode 100644 tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-virtio.args
create mode 100644 tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/event_idx.args
create mode 100644 tests/qemuxml2argvdata/event_idx.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/virtio-lun.args
create mode 100644 tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/disk-blockio.args
b/tests/qemuxml2argvdata/disk-blockio.args
deleted file mode 100644
index 7b7fc0b822..0000000000
--- a/tests/qemuxml2argvdata/disk-blockio.args
+++ /dev/null
@@ -1,34 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--drive file=/dev/HostVG/QEMUGuest1,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=/tmp/idedisk.img,format=raw,if=none,id=drive-ide0-0-2 \
--device
ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,bootindex=1,logical_block_size=512,physical_block_size=512
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args
new file mode 100644
index 0000000000..aae77afd82
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args
@@ -0,0 +1,39 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":true,"driver":"raw","file":"libvirt-2-storage"}'
\
+-device ide-cd,bus=ide.0,unit=1,drive=libvirt-2-format,id=ide0-0-1 \
+-blockdev
'{"driver":"file","filename":"/tmp/idedisk.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device
ide-hd,bus=ide.0,unit=2,drive=libvirt-1-format,id=ide0-0-2,bootindex=1,logical_block_size=512,physical_block_size=512
\
+-audiodev id=audio1,driver=none \
+-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-boot-cdrom.args
b/tests/qemuxml2argvdata/disk-boot-cdrom.args
deleted file mode 100644
index ad07fbe21f..0000000000
--- a/tests/qemuxml2argvdata/disk-boot-cdrom.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--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 \
--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,bootindex=1 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args
new file mode 100644
index 0000000000..64238ed75f
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args
@@ -0,0 +1,38 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}'
\
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-2-format,id=ide0-0-0 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \
+-audiodev id=audio1,driver=none \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-boot-disk.args
b/tests/qemuxml2argvdata/disk-boot-disk.args
deleted file mode 100644
index f889e1748e..0000000000
--- a/tests/qemuxml2argvdata/disk-boot-disk.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--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/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 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args
new file mode 100644
index 0000000000..f5f2740023
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args
@@ -0,0 +1,38 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}'
\
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-2-format,id=ide0-0-0,bootindex=1 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0 \
+-audiodev id=audio1,driver=none \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.args
b/tests/qemuxml2argvdata/disk-floppy-tray.args
deleted file mode 100644
index 2e9a88a031..0000000000
--- a/tests/qemuxml2argvdata/disk-floppy-tray.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--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 \
--drive if=none,id=drive-fdc0-0-1 \
--global isa-fdc.driveA=drive-fdc0-0-0 \
--global isa-fdc.driveB=drive-fdc0-0-1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args
new file mode 100644
index 0000000000..17166a1e8b
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args
@@ -0,0 +1,42 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-3-format","read-only":false,"driver":"raw","file":"libvirt-3-storage"}'
\
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-3-format,id=ide0-0-0,bootindex=1 \
+-blockdev
'{"driver":"host_device","filename":"/dev/fd0","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}'
\
+-device floppy,unit=0,drive=libvirt-2-format,id=fdc0-0-0 \
+-blockdev
'{"driver":"file","filename":"/tmp/firmware.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device floppy,unit=1,drive=libvirt-1-format,id=fdc0-0-1 \
+-audiodev id=audio1,driver=none \
+-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-geometry.args
b/tests/qemuxml2argvdata/disk-geometry.args
deleted file mode 100644
index e657864647..0000000000
--- a/tests/qemuxml2argvdata/disk-geometry.args
+++ /dev/null
@@ -1,32 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--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,cyls=16383,heads=16,secs=63,bios-chs-trans=lba
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args
new file mode 100644
index 0000000000..84ecde34c1
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args
@@ -0,0 +1,36 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device
ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,cyls=16383,heads=16,secs=63,bios-chs-trans=lba
\
+-audiodev id=audio1,driver=none \
+-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-ide-split.args
b/tests/qemuxml2argvdata/disk-ide-split.args
deleted file mode 100644
index 68c6c6200d..0000000000
--- a/tests/qemuxml2argvdata/disk-ide-split.args
+++ /dev/null
@@ -1,34 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--drive file=/dev/HostVG/QEMUGuest1,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=/tmp/idedisk.img,format=raw,if=none,id=drive-ide0-0-2 \
--device ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args
new file mode 100644
index 0000000000..3f139fd340
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args
@@ -0,0 +1,39 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":true,"driver":"raw","file":"libvirt-2-storage"}'
\
+-device ide-cd,bus=ide.0,unit=1,drive=libvirt-2-format,id=ide0-0-1 \
+-blockdev
'{"driver":"file","filename":"/tmp/idedisk.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device ide-hd,bus=ide.0,unit=2,drive=libvirt-1-format,id=ide0-0-2,bootindex=1 \
+-audiodev id=audio1,driver=none \
+-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-ide-wwn.args
b/tests/qemuxml2argvdata/disk-ide-wwn.args
deleted file mode 100644
index 20096e04b8..0000000000
--- a/tests/qemuxml2argvdata/disk-ide-wwn.args
+++ /dev/null
@@ -1,32 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1 \
--device
ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,bootindex=1,wwn=0x5000c50015ea71ad,serial=WD-WMAP9A966149
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args
new file mode 100644
index 0000000000..9a74262c15
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args
@@ -0,0 +1,36 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device
ide-hd,bus=ide.0,unit=1,drive=libvirt-1-format,id=ide0-0-1,bootindex=1,wwn=0x5000c50015ea71ad,serial=WD-WMAP9A966149
\
+-audiodev id=audio1,driver=none \
+-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-ioeventfd.args
b/tests/qemuxml2argvdata/disk-ioeventfd.args
deleted file mode 100644
index 8928d43ba9..0000000000
--- a/tests/qemuxml2argvdata/disk-ioeventfd.args
+++ /dev/null
@@ -1,37 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-test \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
-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,accel=tcg,usb=off,dump-guest-core=off \
--m 1024 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid 8c273d77-39b0-47c4-9714-6dddcad56b88 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot menu=on,strict=on \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
--usb \
--drive file=/var/lib/libvirt/images/f14.img,format=qcow2,if=none,id=drive-virtio-disk0 \
--device
virtio-blk-pci,ioeventfd=on,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,ioeventfd=off,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 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args
new file mode 100644
index 0000000000..136bf314d9
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args
@@ -0,0 +1,42 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=test,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 1024 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 8c273d77-39b0-47c4-9714-6dddcad56b88 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-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 \
+-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"qcow2","file":"libvirt-2-storage"}'
\
+-device
virtio-blk-pci,ioeventfd=on,bus=pci.0,addr=0x4,drive=libvirt-2-format,id=virtio-disk0,bootindex=2
\
+-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \
+-netdev user,id=hostnet0 \
+-device
virtio-net-pci,tx=bh,ioeventfd=off,netdev=hostnet0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x2
\
+-audiodev id=audio1,driver=none \
+-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/qemuxml2argvdata/disk-no-boot.args
b/tests/qemuxml2argvdata/disk-no-boot.args
deleted file mode 100644
index 2c0bca03a5..0000000000
--- a/tests/qemuxml2argvdata/disk-no-boot.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--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=2 \
--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,bootindex=1 \
--drive file=/dev/fd0,format=raw,if=none,id=drive-fdc0-0-0 \
--global isa-fdc.driveA=drive-fdc0-0-0 \
--global isa-fdc.bootindexA=3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args
new file mode 100644
index 0000000000..5721d691cb
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args
@@ -0,0 +1,42 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-global isa-fdc.bootindexA=3 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-3-format","read-only":false,"driver":"raw","file":"libvirt-3-storage"}'
\
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-3-format,id=ide0-0-0,bootindex=2 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":true,"driver":"raw","file":"libvirt-2-storage"}'
\
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-2-format,id=ide0-1-0,bootindex=1 \
+-blockdev
'{"driver":"host_device","filename":"/dev/fd0","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device floppy,unit=0,drive=libvirt-1-format,id=fdc0-0-0 \
+-audiodev id=audio1,driver=none \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-order.args
b/tests/qemuxml2argvdata/disk-order.args
deleted file mode 100644
index 89d06cc8b1..0000000000
--- a/tests/qemuxml2argvdata/disk-order.args
+++ /dev/null
@@ -1,38 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--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/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 \
--drive file=/tmp/data.img,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 \
--drive file=/tmp/logs.img,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 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-order.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-order.x86_64-latest.args
new file mode 100644
index 0000000000..1138d27ab5
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-order.x86_64-latest.args
@@ -0,0 +1,45 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-4-format","read-only":false,"driver":"raw","file":"libvirt-4-storage"}'
\
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-4-format,id=ide0-0-0,bootindex=1 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-3-format","read-only":true,"driver":"raw","file":"libvirt-3-storage"}'
\
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-3-format,id=ide0-1-0 \
+-blockdev
'{"driver":"file","filename":"/tmp/data.img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}'
\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-2-format,id=virtio-disk0 \
+-blockdev
'{"driver":"file","filename":"/tmp/logs.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-1-format,id=virtio-disk1 \
+-audiodev id=audio1,driver=none \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-sata-device.args
b/tests/qemuxml2argvdata/disk-sata-device.args
deleted file mode 100644
index 64d1f8d3cf..0000000000
--- a/tests/qemuxml2argvdata/disk-sata-device.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device ahci,id=sata0,bus=pci.0,addr=0x2 \
--usb \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
--device ide-hd,bus=sata0.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args
new file mode 100644
index 0000000000..f1d236e8a5
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args
@@ -0,0 +1,37 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 ahci,id=sata0,bus=pci.0,addr=0x2 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device ide-hd,bus=sata0.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \
+-audiodev id=audio1,driver=none \
+-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/qemuxml2argvdata/disk-scsi-disk-split.args
b/tests/qemuxml2argvdata/disk-scsi-disk-split.args
deleted file mode 100644
index 86d0b33f33..0000000000
--- a/tests/qemuxml2argvdata/disk-scsi-disk-split.args
+++ /dev/null
@@ -1,42 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
--device lsi,id=scsi1,bus=pci.0,addr=0x3 \
--device lsi,id=scsi2,bus=pci.0,addr=0x4 \
--device virtio-scsi-pci,id=scsi3,bus=pci.0,addr=0x5 \
--usb \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-1-0,readonly=on \
--device
scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,id=scsi0-0-1-0 \
--drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi0-0-0-0,readonly=on \
--device
scsi-cd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 \
--drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-0-1 \
--device
scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=1,drive=drive-scsi0-0-0-1,id=scsi0-0-0-1,bootindex=1
\
--drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-1-1 \
--device
scsi-hd,bus=scsi0.0,channel=0,scsi-id=1,lun=1,drive=drive-scsi0-0-1-1,id=scsi0-0-1-1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args
new file mode 100644
index 0000000000..9682fab58c
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args
@@ -0,0 +1,49 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-device lsi,id=scsi1,bus=pci.0,addr=0x3 \
+-device lsi,id=scsi2,bus=pci.0,addr=0x4 \
+-device virtio-scsi-pci,id=scsi3,bus=pci.0,addr=0x5 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-4-format","read-only":true,"driver":"raw","file":"libvirt-4-storage"}'
\
+-device
scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,device_id=drive-scsi0-0-1-0,drive=libvirt-4-format,id=scsi0-0-1-0
\
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-3-format","read-only":true,"driver":"raw","file":"libvirt-3-storage"}'
\
+-device
scsi-cd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,device_id=drive-scsi0-0-0-0,drive=libvirt-3-format,id=scsi0-0-0-0
\
+-blockdev
'{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}'
\
+-device
scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=1,device_id=drive-scsi0-0-0-1,drive=libvirt-2-format,id=scsi0-0-0-1,bootindex=1
\
+-blockdev
'{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device
scsi-hd,bus=scsi0.0,channel=0,scsi-id=1,lun=1,device_id=drive-scsi0-0-1-1,drive=libvirt-1-format,id=scsi0-0-1-1
\
+-audiodev id=audio1,driver=none \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
deleted file mode 100644
index ba3989c96f..0000000000
--- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
--device lsi,id=scsi1,bus=pci.0,addr=0x3 \
--usb \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-0-0,readonly=on \
--device
scsi-cd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,vendor=SEAGATE,product=ST3146707LC
\
--drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi1-0-0,readonly=on \
--device
'scsi-hd,bus=scsi1.0,scsi-id=0,drive=drive-scsi1-0-0,id=scsi1-0-0,bootindex=1,vendor=SEA
GATE,product=ST67 807GD' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args
new file mode 100644
index 0000000000..df46dd53e0
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args
@@ -0,0 +1,41 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-device lsi,id=scsi1,bus=pci.0,addr=0x3 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":true,"driver":"raw","file":"libvirt-2-storage"}'
\
+-device
scsi-cd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,device_id=drive-scsi0-0-0-0,drive=libvirt-2-format,id=scsi0-0-0-0,vendor=SEAGATE,product=ST3146707LC
\
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device
'scsi-hd,bus=scsi1.0,scsi-id=0,device_id=drive-scsi1-0-0,drive=libvirt-1-format,id=scsi1-0-0,bootindex=1,vendor=SEA
GATE,product=ST67 807GD' \
+-audiodev id=audio1,driver=none \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
deleted file mode 100644
index f1c428bbc7..0000000000
--- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
--device lsi,id=scsi1,bus=pci.0,addr=0x3 \
--usb \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-1-0,readonly=on \
--device
scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,id=scsi0-0-1-0,wwn=0x5000c50015ea71ac,serial=WD-WMAP9A966149
\
--drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi0-0-0-0 \
--device
scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1,wwn=0x5000c50015ea71ad
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args
new file mode 100644
index 0000000000..7648bfdc4e
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args
@@ -0,0 +1,41 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-device lsi,id=scsi1,bus=pci.0,addr=0x3 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":true,"driver":"raw","file":"libvirt-2-storage"}'
\
+-device
scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,device_id=WD-WMAP9A966149,drive=libvirt-2-format,id=scsi0-0-1-0,wwn=0x5000c50015ea71ac,serial=WD-WMAP9A966149
\
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device
scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,device_id=drive-scsi0-0-0-0,drive=libvirt-1-format,id=scsi0-0-0-0,bootindex=1,wwn=0x5000c50015ea71ad
\
+-audiodev id=audio1,driver=none \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
deleted file mode 100644
index 0652c0be0f..0000000000
--- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
--device lsi,id=scsi1,bus=pci.0,addr=0x3 \
--usb \
--drive file=/dev/HostVG/QEMUGuest1,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,bootindex=1
\
--drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi0-0-1-1 \
--device
scsi-block,bus=scsi0.0,channel=0,scsi-id=1,lun=1,drive=drive-scsi0-0-1-1,id=scsi0-0-1-1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args
new file mode 100644
index 0000000000..59b7115e6b
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args
@@ -0,0 +1,41 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-device lsi,id=scsi1,bus=pci.0,addr=0x3 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}'
\
+-device
scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=libvirt-2-format,id=scsi0-0-0-0,bootindex=1
\
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device
scsi-block,bus=scsi0.0,channel=0,scsi-id=1,lun=1,drive=libvirt-1-format,id=scsi0-0-1-1 \
+-audiodev id=audio1,driver=none \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-serial.args
b/tests/qemuxml2argvdata/disk-serial.args
deleted file mode 100644
index c68fb2ac72..0000000000
--- a/tests/qemuxml2argvdata/disk-serial.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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=kvm,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=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1 \
--device
'ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,bootindex=1,serial=\ \
WD-WMAP9A966149' \
--drive file=/dev/HostVG/AllSerialChars,format=raw,if=none,id=drive-ide0-0-2 \
--device
'ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,serial=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_\
.+' \
--drive file=/some/file,format=raw,if=sd,index=0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-serial.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-serial.x86_64-latest.args
new file mode 100644
index 0000000000..4700f0fb3c
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-serial.x86_64-latest.args
@@ -0,0 +1,40 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}'
\
+-device
'ide-hd,bus=ide.0,unit=1,drive=libvirt-2-format,id=ide0-0-1,bootindex=1,serial=\ \
WD-WMAP9A966149' \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/AllSerialChars","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device
'ide-hd,bus=ide.0,unit=2,drive=libvirt-1-format,id=ide0-0-2,serial=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_\
.+' \
+-drive file=/some/file,format=raw,if=sd,index=0 \
+-audiodev id=audio1,driver=none \
+-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-snapshot.args
b/tests/qemuxml2argvdata/disk-snapshot.args
deleted file mode 100644
index 08f7679b7b..0000000000
--- a/tests/qemuxml2argvdata/disk-snapshot.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--drive file=/dev/HostVG/QEMUGuest3,format=qcow2,if=none,id=drive-ide0-2-0,cache=none \
--device ide-hd,bus=ide.2,unit=0,drive=drive-ide0-2-0,id=ide0-2-0 \
--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 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args
new file mode 100644
index 0000000000..c400de452f
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args
@@ -0,0 +1,42 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-3-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-3-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-3-storage"}'
\
+-device
ide-hd,bus=ide.0,unit=0,drive=libvirt-3-format,id=ide0-0-0,bootindex=1,write-cache=on \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest3","node-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-2-storage"}'
\
+-device ide-hd,bus=ide.2,unit=0,drive=libvirt-2-format,id=ide0-2-0,write-cache=on \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0 \
+-audiodev id=audio1,driver=none \
+-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-usb-device-removable.args
b/tests/qemuxml2argvdata/disk-usb-device-removable.args
deleted file mode 100644
index 33229a5662..0000000000
--- a/tests/qemuxml2argvdata/disk-usb-device-removable.args
+++ /dev/null
@@ -1,34 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--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=/tmp/usbdisk.img,format=raw,if=none,id=drive-usb-disk0 \
--device usb-storage,bus=usb.0,port=1,drive=drive-usb-disk0,id=usb-disk0,removable=on \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args
new file mode 100644
index 0000000000..0b26bb35a0
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args
@@ -0,0 +1,39 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}'
\
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-2-format,id=ide0-0-0,bootindex=1 \
+-blockdev
'{"driver":"file","filename":"/tmp/usbdisk.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device usb-storage,bus=usb.0,port=1,drive=libvirt-1-format,id=usb-disk0,removable=on \
+-audiodev id=audio1,driver=none \
+-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-usb-device.args
b/tests/qemuxml2argvdata/disk-usb-device.args
deleted file mode 100644
index 5c5403daba..0000000000
--- a/tests/qemuxml2argvdata/disk-usb-device.args
+++ /dev/null
@@ -1,34 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--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=/tmp/usbdisk.img,format=raw,if=none,id=drive-usb-disk0 \
--device usb-storage,bus=usb.0,port=1,drive=drive-usb-disk0,id=usb-disk0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args
new file mode 100644
index 0000000000..673d32e855
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args
@@ -0,0 +1,39 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}'
\
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-2-format,id=ide0-0-0,bootindex=1 \
+-blockdev
'{"driver":"file","filename":"/tmp/usbdisk.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device usb-storage,bus=usb.0,port=1,drive=libvirt-1-format,id=usb-disk0,removable=off \
+-audiodev id=audio1,driver=none \
+-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-virtio.args
b/tests/qemuxml2argvdata/disk-virtio.args
deleted file mode 100644
index fef4e3f34e..0000000000
--- a/tests/qemuxml2argvdata/disk-virtio.args
+++ /dev/null
@@ -1,37 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--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/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 \
--drive file=/tmp/data.img,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0 \
--drive file=/tmp/logs.img,format=raw,if=none,id=drive-virtio-disk1 \
--device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,id=virtio-disk1 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args
new file mode 100644
index 0000000000..0848b46ae7
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args
@@ -0,0 +1,44 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-4-format","read-only":false,"driver":"raw","file":"libvirt-4-storage"}'
\
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-4-format,id=ide0-0-0,bootindex=1 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-3-format","read-only":true,"driver":"raw","file":"libvirt-3-storage"}'
\
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-3-format,id=ide0-1-0 \
+-blockdev
'{"driver":"file","filename":"/tmp/data.img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}'
\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-2-format,id=virtio-disk0 \
+-blockdev
'{"driver":"file","filename":"/tmp/logs.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-1-format,id=virtio-disk1 \
+-audiodev id=audio1,driver=none \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/event_idx.args
b/tests/qemuxml2argvdata/event_idx.args
deleted file mode 100644
index 3c568e8354..0000000000
--- a/tests/qemuxml2argvdata/event_idx.args
+++ /dev/null
@@ -1,37 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-test \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
-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,accel=tcg,usb=off,dump-guest-core=off \
--m 1024 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot menu=on,strict=on \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
--usb \
--drive file=/var/lib/libvirt/images/f14.img,format=qcow2,if=none,id=drive-virtio-disk0 \
--device
virtio-blk-pci,event_idx=on,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,event_idx=off,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 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/event_idx.x86_64-latest.args
b/tests/qemuxml2argvdata/event_idx.x86_64-latest.args
new file mode 100644
index 0000000000..f8fb992920
--- /dev/null
+++ b/tests/qemuxml2argvdata/event_idx.x86_64-latest.args
@@ -0,0 +1,42 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=test,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 1024 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-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 \
+-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"qcow2","file":"libvirt-2-storage"}'
\
+-device
virtio-blk-pci,event_idx=on,bus=pci.0,addr=0x4,drive=libvirt-2-format,id=virtio-disk0,bootindex=2
\
+-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \
+-netdev user,id=hostnet0 \
+-device
virtio-net-pci,event_idx=off,netdev=hostnet0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x2
\
+-audiodev id=audio1,driver=none \
+-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/qemuxml2argvdata/virtio-lun.args
b/tests/qemuxml2argvdata/virtio-lun.args
deleted file mode 100644
index 56597da601..0000000000
--- a/tests/qemuxml2argvdata/virtio-lun.args
+++ /dev/null
@@ -1,37 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-test \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
-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,accel=tcg,usb=off,dump-guest-core=off \
--m 1024 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot menu=on,strict=on \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
--usb \
--drive file=/dev/sdfake,format=raw,if=none,id=drive-virtio-disk0 \
--device
virtio-blk-pci,scsi=on,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=2
\
--drive file=/dev/sdfake2,format=raw,if=none,id=drive-virtio-disk1 \
--device
virtio-blk-pci,scsi=on,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
--netdev user,id=hostnet0 \
--device virtio-net-pci,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 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args
b/tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args
new file mode 100644
index 0000000000..e66502ea4e
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args
@@ -0,0 +1,42 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=test,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 1024 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-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 \
+-blockdev
'{"driver":"host_device","filename":"/dev/sdfake","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}'
\
+-device
virtio-blk-pci,scsi=on,bus=pci.0,addr=0x4,drive=libvirt-2-format,id=virtio-disk0,bootindex=2
\
+-blockdev
'{"driver":"host_device","filename":"/dev/sdfake2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device virtio-blk-pci,scsi=on,bus=pci.0,addr=0x5,drive=libvirt-1-format,id=virtio-disk1
\
+-netdev user,id=hostnet0 \
+-device
virtio-net-pci,event_idx=off,netdev=hostnet0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x2
\
+-audiodev id=audio1,driver=none \
+-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 823270966e..6d860fab95 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1310,15 +1310,15 @@ mymain(void)
DO_TEST_CAPS_LATEST("disk-floppy-q35-2_11");
DO_TEST_FAILURE("disk-floppy-pseries",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
- DO_TEST_NOCAPS("disk-floppy-tray");
- DO_TEST_NOCAPS("disk-virtio");
+ DO_TEST_CAPS_LATEST("disk-floppy-tray");
+ DO_TEST_CAPS_LATEST("disk-virtio");
DO_TEST("disk-virtio-ccw", QEMU_CAPS_CCW);
DO_TEST("disk-virtio-ccw-many", QEMU_CAPS_CCW);
DO_TEST("disk-virtio-s390-zpci", QEMU_CAPS_DEVICE_ZPCI, QEMU_CAPS_CCW);
- DO_TEST("disk-order", QEMU_CAPS_VIRTIO_BLK_SCSI);
+ DO_TEST_CAPS_LATEST("disk-order");
DO_TEST_CAPS_LATEST("disk-virtio-queues");
- DO_TEST_NOCAPS("disk-boot-disk");
- DO_TEST_NOCAPS("disk-boot-cdrom");
+ DO_TEST_CAPS_LATEST("disk-boot-disk");
+ DO_TEST_CAPS_LATEST("disk-boot-cdrom");
DO_TEST_CAPS_VER("floppy-drive-fat", "2.12.0");
DO_TEST_CAPS_LATEST("floppy-drive-fat");
DO_TEST_CAPS_VER("disk-readonly-disk", "2.12.0");
@@ -1370,61 +1370,44 @@ mymain(void)
DO_TEST_CAPS_LATEST("disk-network-http");
driver.config->vxhsTLS = 0;
VIR_FREE(driver.config->vxhsTLSx509certdir);
- DO_TEST_NOCAPS("disk-no-boot");
+ DO_TEST_CAPS_LATEST("disk-no-boot");
DO_TEST_CAPS_LATEST("disk-nvme");
DO_TEST_CAPS_LATEST("disk-vhostuser");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-device-lun-type-invalid");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-attaching-partition-nosupport");
- DO_TEST("disk-usb-device",
- QEMU_CAPS_DEVICE_USB_STORAGE);
- DO_TEST("disk-usb-device-removable",
- QEMU_CAPS_DEVICE_USB_STORAGE,
- QEMU_CAPS_USB_STORAGE_REMOVABLE);
+ DO_TEST_CAPS_LATEST("disk-usb-device");
+ DO_TEST_CAPS_LATEST("disk-usb-device-removable");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-usb-pci");
DO_TEST_CAPS_LATEST("disk-scsi");
DO_TEST_CAPS_LATEST("disk-scsi-device-auto");
- DO_TEST("disk-scsi-disk-split",
- QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI);
- DO_TEST("disk-scsi-disk-wwn",
- QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN);
- DO_TEST("disk-scsi-disk-vpd",
- QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN);
+ DO_TEST_CAPS_LATEST("disk-scsi-disk-split");
+ DO_TEST_CAPS_LATEST("disk-scsi-disk-wwn");
+ DO_TEST_CAPS_LATEST("disk-scsi-disk-vpd");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-disk-vpd-build-error");
DO_TEST_CAPS_LATEST("controller-virtio-scsi");
- DO_TEST("disk-sata-device",
- QEMU_CAPS_ICH9_AHCI);
+ DO_TEST_CAPS_LATEST("disk-sata-device");
DO_TEST_CAPS_VER("disk-aio", "2.12.0");
DO_TEST_CAPS_LATEST("disk-aio");
DO_TEST_CAPS_LATEST("disk-aio-io_uring");
DO_TEST_NOCAPS("disk-source-pool");
DO_TEST_NOCAPS("disk-source-pool-mode");
- DO_TEST("disk-ioeventfd",
- QEMU_CAPS_VIRTIO_IOEVENTFD,
- QEMU_CAPS_VIRTIO_TX_ALG,
- QEMU_CAPS_VIRTIO_BLK_SCSI);
+ DO_TEST_CAPS_LATEST("disk-ioeventfd");
DO_TEST_CAPS_VER("disk-copy_on_read", "2.12.0");
DO_TEST_CAPS_LATEST("disk-copy_on_read");
DO_TEST_CAPS_VER("disk-discard", "4.1.0");
DO_TEST_CAPS_LATEST("disk-discard");
DO_TEST_CAPS_VER("disk-detect-zeroes", "2.12.0");
DO_TEST_CAPS_LATEST("disk-detect-zeroes");
- DO_TEST_NOCAPS("disk-snapshot");
+ DO_TEST_CAPS_LATEST("disk-snapshot");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-same-targets");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-missing-target-invalid");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-address-conflict");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-hostdev-scsi-address-conflict");
DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdevs-drive-address-conflict");
- DO_TEST("event_idx",
- QEMU_CAPS_VIRTIO_BLK_EVENT_IDX,
- QEMU_CAPS_VIRTIO_NET_EVENT_IDX,
- QEMU_CAPS_VIRTIO_BLK_SCSI);
- DO_TEST("virtio-lun",
- QEMU_CAPS_VIRTIO_BLK_SCSI);
- DO_TEST("disk-scsi-lun-passthrough",
- QEMU_CAPS_SCSI_BLOCK,
- QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI);
- DO_TEST("disk-serial",
- QEMU_CAPS_KVM);
+ DO_TEST_CAPS_LATEST("event_idx");
+ DO_TEST_CAPS_LATEST("virtio-lun");
+ DO_TEST_CAPS_LATEST("disk-scsi-lun-passthrough");
+ DO_TEST_CAPS_LATEST("disk-serial");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fdc-incompatible-address");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-ide-incompatible-address");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-sata-incompatible-address");
@@ -1453,13 +1436,10 @@ mymain(void)
DO_TEST_CAPS_LATEST_PARSE_ERROR("luks-disk-invalid");
DO_TEST_CAPS_LATEST_PARSE_ERROR("luks-disks-source-both");
- DO_TEST_NOCAPS("disk-ide-split");
- DO_TEST("disk-ide-wwn",
- QEMU_CAPS_IDE_DRIVE_WWN,
- QEMU_CAPS_SCSI_DISK_WWN);
-
- DO_TEST_NOCAPS("disk-geometry");
- DO_TEST("disk-blockio", QEMU_CAPS_BLOCKIO);
+ DO_TEST_CAPS_LATEST("disk-ide-split");
+ DO_TEST_CAPS_LATEST("disk-ide-wwn");
+ DO_TEST_CAPS_LATEST("disk-geometry");
+ DO_TEST_CAPS_LATEST("disk-blockio");
DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "2.12.0");
DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0");
--
2.31.1
8:02 a.m.
New subject: [PATCH 11/20] qemuxml2argvtest: Replace 'disk-network-iscsi' by the more comprehensive 'disk-network-iscsi-modern'
Move the contents of 'disk-network-iscsi-modern' into
'disk-network-iscsi'
to reuse the name and also invocation with real capablities and remove
the leftovers.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../disk-network-iscsi-modern.args | 47 ----------
.../disk-network-iscsi-modern.xml | 88 -------------------
.../disk-network-iscsi.x86_64-2.12.0.args | 5 ++
.../disk-network-iscsi.x86_64-latest.args | 31 ++++---
tests/qemuxml2argvdata/disk-network-iscsi.xml | 25 +++++-
tests/qemuxml2argvtest.c | 3 -
.../qemuxml2xmloutdata/disk-network-iscsi.xml | 25 ++++++
7 files changed, 73 insertions(+), 151 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi-modern.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi-modern.xml
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
deleted file mode 100644
index c9060c0db6..0000000000
--- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
+++ /dev/null
@@ -1,47 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
--usb \
--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,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,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
--object
secret,id=virtio-disk2-auth-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-auth-secret0,format=raw,if=none,id=drive-virtio-disk2
\
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,id=virtio-disk2 \
--object
secret,id=virtio-disk3-auth-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-auth-secret0,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.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 \
--drive
file.driver=iscsi,file.portal=example.org:3260,file.target=iqn.1992-01.com.example:server,file.lun=0,file.transport=tcp,file.initiator-name=iqn.1992-01.com.example:client,format=raw,if=none,id=drive-scsi0-0-0-1
\
--device
scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=1,drive=drive-scsi0-0-0-1,id=scsi0-0-0-1 \
--object
secret,id=scsi0-0-0-2-auth-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
--drive
file.driver=iscsi,file.portal=example.org:3260,file.target=iqn.1992-01.com.example:server,file.lun=0,file.transport=tcp,file.user=myname,file.password-secret=scsi0-0-0-2-auth-secret0,file.initiator-name=iqn.1992-01.com.example:client,format=raw,if=none,id=drive-scsi0-0-0-2
\
--device
scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=2,drive=drive-scsi0-0-0-2,id=scsi0-0-0-2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml
b/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml
deleted file mode 100644
index 07bb457bfa..0000000000
--- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml
+++ /dev/null
@@ -1,88 +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-i386</emulator>
- <disk type='network' device='disk'>
- <driver name='qemu' type='raw'/>
- <source protocol='iscsi' name='iqn.1992-01.com.example'>
- <host name='example.org' port='6000'/>
- </source>
- <target dev='vda' bus='virtio'/>
- </disk>
- <disk type='network' device='disk'>
- <driver name='qemu' type='raw'/>
- <source protocol='iscsi' name='iqn.1992-01.com.example/1'>
- <host name='example.org' port='6000'/>
- </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>
- <disk type='network' device='lun'>
- <driver name='qemu' type='raw'/>
- <source protocol='iscsi'
name='iqn.1992-01.com.example:server/0'>
- <host name='example.org' port='3260'/>
- <initiator>
- <iqn name='iqn.1992-01.com.example:client'/>
- </initiator>
- </source>
- <target dev='sdb' bus='scsi'/>
- </disk>
- <disk type='network' device='lun'>
- <driver name='qemu' type='raw'/>
- <source protocol='iscsi'
name='iqn.1992-01.com.example:server/0'>
- <host name='example.org' port='3260'/>
- <initiator>
- <iqn name='iqn.1992-01.com.example:client'/>
- </initiator>
- <auth username='myname'>
- <secret type='iscsi' usage='mycluster_myname'/>
- </auth>
- </source>
- <target dev='sdc' 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'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
index ef4dd81ff8..92c27dc1b0 100644
--- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
@@ -39,5 +39,10 @@ QEMU_AUDIO_DRV=none \
-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 \
+-drive
file.driver=iscsi,file.portal=example.org:3260,file.target=iqn.1992-01.com.example:server,file.lun=0,file.transport=tcp,file.initiator-name=iqn.1992-01.com.example:client,format=raw,if=none,id=drive-scsi0-0-0-1
\
+-device
scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=1,drive=drive-scsi0-0-0-1,id=scsi0-0-0-1 \
+-object
secret,id=scsi0-0-0-2-auth-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
+-drive
file.driver=iscsi,file.portal=example.org:3260,file.target=iqn.1992-01.com.example:server,file.lun=0,file.transport=tcp,file.user=myname,file.password-secret=scsi0-0-0-2-auth-secret0,file.initiator-name=iqn.1992-01.com.example:client,format=raw,if=none,id=drive-scsi0-0-0-2
\
+-device
scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=2,drive=drive-scsi0-0-0-2,id=scsi0-0-0-2 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
index 84dbb97ecf..9fa6c5f259 100644
--- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
@@ -28,23 +28,30 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-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 \
--blockdev
'{"driver":"iscsi","portal":"example.org:6000","target":"iqn.1992-01.com.example","lun":0,"transport":"tcp","node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"driver":"iscsi","portal":"example.org:6000","target":"iqn.1992-01.com.example","lun":0,"transport":"tcp","node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-7-format","read-only":false,"driver":"raw","file":"libvirt-7-storage"}'
\
+-device
virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-7-format,id=virtio-disk0,bootindex=1 \
+-blockdev
'{"driver":"iscsi","portal":"example.org:6000","target":"iqn.1992-01.com.example","lun":1,"transport":"tcp","node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-6-format","read-only":false,"driver":"raw","file":"libvirt-6-storage"}'
\
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-6-format,id=virtio-disk1 \
+-object
'{"qom-type":"secret","id":"libvirt-5-storage-auth-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}'
\
+-blockdev
'{"driver":"iscsi","portal":"example.org:6000","target":"iqn.1992-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","password-secret":"libvirt-5-storage-auth-secret0","node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-5-format","read-only":false,"driver":"raw","file":"libvirt-5-storage"}'
\
--device
virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-5-format,id=virtio-disk0,bootindex=1 \
--blockdev
'{"driver":"iscsi","portal":"example.org:6000","target":"iqn.1992-01.com.example","lun":1,"transport":"tcp","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}'
\
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-5-format,id=virtio-disk2 \
+-object
'{"qom-type":"secret","id":"libvirt-4-storage-auth-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}'
\
+-blockdev
'{"driver":"iscsi","portal":"example.org:6000","target":"iqn.1992-01.com.example:storage","lun":2,"transport":"tcp","user":"myname","password-secret":"libvirt-4-storage-auth-secret0","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-4-format","read-only":false,"driver":"raw","file":"libvirt-4-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-4-format,id=virtio-disk1 \
--object
'{"qom-type":"secret","id":"libvirt-3-storage-auth-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}'
\
--blockdev
'{"driver":"iscsi","portal":"example.org:6000","target":"iqn.1992-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","password-secret":"libvirt-3-storage-auth-secret0","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}'
\
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=libvirt-4-format,id=virtio-disk3 \
+-blockdev
'{"driver":"iscsi","portal":"example.org:3260","target":"iqn.1992-01.com.example","lun":0,"transport":"tcp","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-3-format","read-only":false,"driver":"raw","file":"libvirt-3-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-3-format,id=virtio-disk2 \
--object
'{"qom-type":"secret","id":"libvirt-2-storage-auth-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}'
\
--blockdev
'{"driver":"iscsi","portal":"example.org:6000","target":"iqn.1992-01.com.example:storage","lun":2,"transport":"tcp","user":"myname","password-secret":"libvirt-2-storage-auth-secret0","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-device
scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=libvirt-3-format,id=scsi0-0-0-0 \
+-blockdev
'{"driver":"iscsi","portal":"example.org:3260","target":"iqn.1992-01.com.example:server","lun":0,"transport":"tcp","initiator-name":"iqn.1992-01.com.example:client","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x6,drive=libvirt-2-format,id=virtio-disk3 \
--blockdev
'{"driver":"iscsi","portal":"example.org:3260","target":"iqn.1992-01.com.example","lun":0,"transport":"tcp","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-device
scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=1,drive=libvirt-2-format,id=scsi0-0-0-1 \
+-object
'{"qom-type":"secret","id":"libvirt-1-storage-auth-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}'
\
+-blockdev
'{"driver":"iscsi","portal":"example.org:3260","target":"iqn.1992-01.com.example:server","lun":0,"transport":"tcp","user":"myname","password-secret":"libvirt-1-storage-auth-secret0","initiator-name":"iqn.1992-01.com.example:client","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device
scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=libvirt-1-format,id=scsi0-0-0-0 \
+-device
scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=2,drive=libvirt-1-format,id=scsi0-0-0-2 \
-audiodev id=audio1,driver=none \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.xml
b/tests/qemuxml2argvdata/disk-network-iscsi.xml
index 8a55f1b23b..07bb457bfa 100644
--- a/tests/qemuxml2argvdata/disk-network-iscsi.xml
+++ b/tests/qemuxml2argvdata/disk-network-iscsi.xml
@@ -29,7 +29,7 @@
<target dev='vdb' bus='virtio'/>
</disk>
<disk type='network' device='disk'>
- <driver name='qemu'/>
+ <driver name='qemu' type='raw'/>
<auth username='myname'>
<secret type='iscsi' usage='mycluster_myname'/>
</auth>
@@ -55,6 +55,29 @@
</source>
<target dev='sda' bus='scsi'/>
</disk>
+ <disk type='network' device='lun'>
+ <driver name='qemu' type='raw'/>
+ <source protocol='iscsi'
name='iqn.1992-01.com.example:server/0'>
+ <host name='example.org' port='3260'/>
+ <initiator>
+ <iqn name='iqn.1992-01.com.example:client'/>
+ </initiator>
+ </source>
+ <target dev='sdb' bus='scsi'/>
+ </disk>
+ <disk type='network' device='lun'>
+ <driver name='qemu' type='raw'/>
+ <source protocol='iscsi'
name='iqn.1992-01.com.example:server/0'>
+ <host name='example.org' port='3260'/>
+ <initiator>
+ <iqn name='iqn.1992-01.com.example:client'/>
+ </initiator>
+ <auth username='myname'>
+ <secret type='iscsi' usage='mycluster_myname'/>
+ </auth>
+ </source>
+ <target dev='sdc' bus='scsi'/>
+ </disk>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<controller type='scsi' index='0'
model='virtio-scsi'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 6d860fab95..ea3fc5901d 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1341,9 +1341,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("disk-transient");
DO_TEST_CAPS_VER("disk-network-nbd", "2.12.0");
DO_TEST_CAPS_LATEST("disk-network-nbd");
- DO_TEST("disk-network-iscsi-modern",
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_SCSI_BLOCK);
DO_TEST_CAPS_VER("disk-network-iscsi", "2.12.0");
DO_TEST_CAPS_LATEST("disk-network-iscsi");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-invalid");
diff --git a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml
b/tests/qemuxml2xmloutdata/disk-network-iscsi.xml
index a2fdaac5b0..d7e1b9ffff 100644
--- a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-iscsi.xml
@@ -60,6 +60,31 @@
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
+ <disk type='network' device='lun'>
+ <driver name='qemu' type='raw'/>
+ <source protocol='iscsi'
name='iqn.1992-01.com.example:server/0'>
+ <host name='example.org' port='3260'/>
+ <initiator>
+ <iqn name='iqn.1992-01.com.example:client'/>
+ </initiator>
+ </source>
+ <target dev='sdb' bus='scsi'/>
+ <address type='drive' controller='0' bus='0'
target='0' unit='1'/>
+ </disk>
+ <disk type='network' device='lun'>
+ <driver name='qemu' type='raw'/>
+ <source protocol='iscsi'
name='iqn.1992-01.com.example:server/0'>
+ <host name='example.org' port='3260'/>
+ <initiator>
+ <iqn name='iqn.1992-01.com.example:client'/>
+ </initiator>
+ <auth username='myname'>
+ <secret type='iscsi' usage='mycluster_myname'/>
+ </auth>
+ </source>
+ <target dev='sdc' bus='scsi'/>
+ <address type='drive' controller='0' bus='0'
target='0' unit='2'/>
+ </disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
--
2.31.1
8:02 a.m.
New subject: [PATCH 12/20] qemuxml2argvtest: Merge 'disk-iscsi' case into 'disk-cache'
Use the iSCSI disk path in one of the disks of the 'disk-cache' test as
it's the only specialty of 'disk-iscsi' case and remove the now
pointless files.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../disk-cache.x86_64-2.12.0.args | 2 +-
.../disk-cache.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-cache.xml | 2 +-
tests/qemuxml2argvdata/disk-iscsi.args | 31 -------------------
tests/qemuxml2argvdata/disk-iscsi.xml | 28 -----------------
tests/qemuxml2argvtest.c | 1 -
.../disk-cache.x86_64-2.12.0.xml | 2 +-
.../disk-cache.x86_64-latest.xml | 2 +-
8 files changed, 5 insertions(+), 65 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/disk-iscsi.args
delete mode 100644 tests/qemuxml2argvdata/disk-iscsi.xml
diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
index f3c4e9edc1..fab26632d4 100644
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
@@ -33,7 +33,7 @@ QEMU_AUDIO_DRV=none \
-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,write-cache=on
\
--drive
file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-virtio-disk0,cache=writethrough
\
+-drive
file=/dev/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan.hdserver:hydrar-desktop.win7vm-lun-0,format=qcow2,if=none,id=drive-virtio-disk0,cache=writethrough
\
-device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,write-cache=off
\
-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,removable=off,write-cache=off
\
diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
index eb8aeef0fc..7c78e04f77 100644
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
@@ -37,7 +37,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-3-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-3-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-3-storage"}'
\
-device
scsi-hd,bus=scsi0.0,scsi-id=0,device_id=drive-scsi0-0-0,drive=libvirt-3-format,id=scsi0-0-0,write-cache=on
\
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","cache":{"direct":false,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"driver":"host_device","filename":"/dev/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan.hdserver:hydrar-desktop.win7vm-lun-0","node-name":"libvirt-2-storage","cache":{"direct":false,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"cache":{"direct":false,"no-flush":false},"driver":"qcow2","file":"libvirt-2-storage"}'
\
-device
virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-2-format,id=virtio-disk0,write-cache=off
\
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
diff --git a/tests/qemuxml2argvdata/disk-cache.xml
b/tests/qemuxml2argvdata/disk-cache.xml
index e1ba6f953f..8ef609a622 100644
--- a/tests/qemuxml2argvdata/disk-cache.xml
+++ b/tests/qemuxml2argvdata/disk-cache.xml
@@ -33,7 +33,7 @@
</disk>
<disk type='block' device='disk'>
<driver name='qemu' type='qcow2'
cache='writethrough'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
+ <source
dev='/dev/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan.hdserver:hydrar-desktop.win7vm-lun-0'/>
<target dev='vda' bus='virtio'/>
</disk>
<disk type='block' device='disk'>
diff --git a/tests/qemuxml2argvdata/disk-iscsi.args
b/tests/qemuxml2argvdata/disk-iscsi.args
deleted file mode 100644
index a0365694e0..0000000000
--- a/tests/qemuxml2argvdata/disk-iscsi.args
+++ /dev/null
@@ -1,31 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--drive
file=/dev/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan.hdserver:hydrar-desktop.win7vm-lun-0,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 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-iscsi.xml
b/tests/qemuxml2argvdata/disk-iscsi.xml
deleted file mode 100644
index 04d821989f..0000000000
--- a/tests/qemuxml2argvdata/disk-iscsi.xml
+++ /dev/null
@@ -1,28 +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-i386</emulator>
- <disk type='block' device='disk'>
- <driver name='qemu' type='raw'/>
- <source
dev='/dev/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan.hdserver:hydrar-desktop.win7vm-lun-0'/>
- <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'/>
- <memballoon model='none'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index ea3fc5901d..1f633e3f07 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1297,7 +1297,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("disk-cdrom");
DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid");
DO_TEST_CAPS_LATEST("disk-cdrom-bus-other");
- DO_TEST_NOCAPS("disk-iscsi");
DO_TEST_CAPS_VER("disk-cdrom-network", "2.12.0");
DO_TEST_CAPS_LATEST("disk-cdrom-network");
DO_TEST_CAPS_VER("disk-cdrom-tray", "2.12.0");
diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml
b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml
index 7c835918af..15a6665145 100644
--- a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml
+++ b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml
@@ -34,7 +34,7 @@
</disk>
<disk type='block' device='disk'>
<driver name='qemu' type='qcow2'
cache='writethrough'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
+ <source
dev='/dev/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan.hdserver:hydrar-desktop.win7vm-lun-0'/>
<target dev='vda' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml
b/tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml
index 708bc0bb88..c770deaaab 100644
--- a/tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml
@@ -37,7 +37,7 @@
</disk>
<disk type='block' device='disk'>
<driver name='qemu' type='qcow2'
cache='writethrough'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
+ <source
dev='/dev/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan.hdserver:hydrar-desktop.win7vm-lun-0'/>
<target dev='vda' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
--
2.31.1
8:02 a.m.
New subject: [PATCH 13/20] qemuxml2argvtest: Modernize 'disk-network-rbd-no-colon' case
The test case fails in pre-blockdev scenarios as it would pass RBD
parameters behind our back but succeeds after as we pass it in JSON form
which doesn't have that defect.
Cover both cases instead of the fake-caps version.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...isk-network-rbd-no-colon.x86_64-4.1.0.err} | 0
...sk-network-rbd-no-colon.x86_64-latest.args | 39 +++++++++++++++++++
tests/qemuxml2argvtest.c | 3 +-
3 files changed, 41 insertions(+), 1 deletion(-)
rename tests/qemuxml2argvdata/{disk-network-rbd-no-colon.err =>
disk-network-rbd-no-colon.x86_64-4.1.0.err} (100%)
create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/disk-network-rbd-no-colon.err
b/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-4.1.0.err
similarity index 100%
rename from tests/qemuxml2argvdata/disk-network-rbd-no-colon.err
rename to tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-4.1.0.err
diff --git a/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args
new file mode 100644
index 0000000000..9a35dbcf7f
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args
@@ -0,0 +1,39 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}'
\
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-2-format,id=ide0-0-0,bootindex=1 \
+-blockdev
'{"driver":"rbd","pool":"poolname","image":"imagename:rbd_cache=1:rbd_cache_size=67108864:rbd_cache_max_dirty=0","server":[{"host":"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"},{"host":"mon3.example.org","port":"6322"}],"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-1-format,id=virtio-disk0 \
+-audiodev id=audio1,driver=none \
+-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 1f633e3f07..bfa41a2f81 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1349,7 +1349,8 @@ mymain(void)
DO_TEST_CAPS_LATEST("disk-network-gluster");
DO_TEST_CAPS_VER("disk-network-rbd", "2.12.0");
DO_TEST_CAPS_LATEST("disk-network-rbd");
- DO_TEST_FAILURE_NOCAPS("disk-network-rbd-no-colon");
+ DO_TEST_CAPS_VER_FAILURE("disk-network-rbd-no-colon", "4.1.0");
+ DO_TEST_CAPS_LATEST("disk-network-rbd-no-colon");
DO_TEST_CAPS_VER("disk-network-sheepdog", "2.12.0");
DO_TEST_CAPS_VER("disk-network-sheepdog", "6.0.0");
DO_TEST_CAPS_VER("disk-network-source-auth", "2.12.0");
--
2.31.1
8:02 a.m.
New subject: [PATCH 14/20] qemuxml2argvtest: Modernize outstanding disk-backend related tests
For backend related tests we need to cover the pre-blockdev and
post-blockdev era, so the fake-capability test is converted to a
combination of DO_TEST_CAPS_VER(..., "4.1.0") and DO_TEST_CAPS_LATEST.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...w.args => disk-fmt-qcow.x86_64-4.1.0.args} | 9 ++--
.../disk-fmt-qcow.x86_64-latest.args | 38 +++++++++++++++
...> disk-source-pool-mode.x86_64-4.1.0.args} | 9 ++--
.../disk-source-pool-mode.x86_64-latest.args | 45 ++++++++++++++++++
...rgs => disk-source-pool.x86_64-4.1.0.args} | 13 +++---
.../disk-source-pool.x86_64-latest.args | 46 +++++++++++++++++++
tests/qemuxml2argvtest.c | 9 ++--
7 files changed, 152 insertions(+), 17 deletions(-)
rename tests/qemuxml2argvdata/{disk-fmt-qcow.args => disk-fmt-qcow.x86_64-4.1.0.args}
(77%)
create mode 100644 tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args
rename tests/qemuxml2argvdata/{disk-source-pool-mode.args =>
disk-source-pool-mode.x86_64-4.1.0.args} (84%)
create mode 100644 tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.args
rename tests/qemuxml2argvdata/{disk-source-pool.args =>
disk-source-pool.x86_64-4.1.0.args} (73%)
create mode 100644 tests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/disk-fmt-qcow.args
b/tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-4.1.0.args
similarity index 77%
rename from tests/qemuxml2argvdata/disk-fmt-qcow.args
rename to tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-4.1.0.args
index aa284c1e15..fe8ce7326d 100644
--- a/tests/qemuxml2argvdata/disk-fmt-qcow.args
+++ b/tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-4.1.0.args
@@ -11,23 +11,24 @@ QEMU_AUDIO_DRV=none \
-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 \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=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=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-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 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-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 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args
new file mode 100644
index 0000000000..afdfc94c27
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args
@@ -0,0 +1,38 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"qcow2","file":"libvirt-2-storage"}'
\
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-2-format,id=ide0-0-0,bootindex=1 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0 \
+-audiodev id=audio1,driver=none \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.args
b/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-4.1.0.args
similarity index 84%
rename from tests/qemuxml2argvdata/disk-source-pool-mode.args
rename to tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-4.1.0.args
index f4f4a72a2a..dce39132fa 100644
--- a/tests/qemuxml2argvdata/disk-source-pool-mode.args
+++ b/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-4.1.0.args
@@ -11,21 +11,21 @@ QEMU_AUDIO_DRV=none \
-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 \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=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=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-drive
file=/some/block/device/unit:0:0:1,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.driver=iscsi,file.portal=iscsi.example.com:3260,file.target=demo-target,file.lun=2,file.transport=tcp,format=raw,if=none,id=drive-ide0-0-2,readonly=on
\
@@ -35,4 +35,5 @@ QEMU_AUDIO_DRV=none \
-drive
file.driver=iscsi,file.portal=iscsi.example.com:3260,file.target=demo-target,file.lun=3,file.transport=tcp,format=raw,if=none,id=drive-ide0-0-4,readonly=on
\
-device ide-cd,bus=ide.0,unit=4,drive=drive-ide0-0-4,id=ide0-0-4 \
-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-source-pool-mode.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.args
new file mode 100644
index 0000000000..a72147cb7f
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.args
@@ -0,0 +1,45 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-blockdev
'{"driver":"host_device","filename":"/some/block/device/unit:0:0:1","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-4-format","read-only":true,"driver":"raw","file":"libvirt-4-storage"}'
\
+-device ide-cd,bus=ide.0,unit=1,drive=libvirt-4-format,id=ide0-0-1 \
+-blockdev
'{"driver":"iscsi","portal":"iscsi.example.com:3260","target":"demo-target","lun":2,"transport":"tcp","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-3-format","read-only":true,"driver":"raw","file":"libvirt-3-storage"}'
\
+-device ide-cd,bus=ide.0,unit=2,drive=libvirt-3-format,id=ide0-0-2 \
+-blockdev
'{"driver":"file","filename":"/tmp/idedisk.img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}'
\
+-device ide-hd,bus=ide.0,unit=3,drive=libvirt-2-format,id=ide0-0-3,bootindex=1 \
+-blockdev
'{"driver":"iscsi","portal":"iscsi.example.com:3260","target":"demo-target","lun":3,"transport":"tcp","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device ide-cd,bus=ide.0,unit=4,drive=libvirt-1-format,id=ide0-0-4 \
+-audiodev id=audio1,driver=none \
+-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-source-pool.args
b/tests/qemuxml2argvdata/disk-source-pool.x86_64-4.1.0.args
similarity index 73%
rename from tests/qemuxml2argvdata/disk-source-pool.args
rename to tests/qemuxml2argvdata/disk-source-pool.x86_64-4.1.0.args
index fe97765783..4779ee065b 100644
--- a/tests/qemuxml2argvdata/disk-source-pool.args
+++ b/tests/qemuxml2argvdata/disk-source-pool.x86_64-4.1.0.args
@@ -11,21 +11,21 @@ QEMU_AUDIO_DRV=none \
-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 \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=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=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-drive file=/some/block/device/cdrom,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 if=none,id=drive-ide0-1-0,readonly=on \
@@ -33,8 +33,9 @@ QEMU_AUDIO_DRV=none \
-drive file=/tmp/idedisk.img,format=raw,if=none,id=drive-ide0-0-2 \
-device ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,bootindex=1 \
-drive file=fat:/some/dir/device/vol1,if=none,id=drive-virtio-disk0,readonly=on \
--device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0 \
+-device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0 \
-drive file=fat:/some/dir/device/vol2,if=none,id=drive-virtio-disk1,readonly=on \
--device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
+-device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
-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/qemuxml2argvdata/disk-source-pool.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args
new file mode 100644
index 0000000000..a48af2689c
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args
@@ -0,0 +1,46 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-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 \
+-blockdev
'{"driver":"host_device","filename":"/some/block/device/cdrom","node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-5-format","read-only":true,"driver":"raw","file":"libvirt-5-storage"}'
\
+-device ide-cd,bus=ide.0,unit=1,drive=libvirt-5-format,id=ide0-0-1 \
+-device ide-cd,bus=ide.1,unit=0,id=ide0-1-0 \
+-blockdev
'{"driver":"file","filename":"/tmp/idedisk.img","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-3-format","read-only":false,"driver":"raw","file":"libvirt-3-storage"}'
\
+-device ide-hd,bus=ide.0,unit=2,drive=libvirt-3-format,id=ide0-0-2,bootindex=1 \
+-blockdev
'{"driver":"vvfat","dir":"/some/dir/device/vol1","floppy":false,"rw":false,"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":true,"driver":"raw","file":"libvirt-2-storage"}'
\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-2-format,id=virtio-disk0 \
+-blockdev
'{"driver":"vvfat","dir":"/some/dir/device/vol2","floppy":false,"rw":false,"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-1-format,id=virtio-disk1 \
+-audiodev id=audio1,driver=none \
+-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 bfa41a2f81..95e26c2a17 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1322,7 +1322,8 @@ mymain(void)
DO_TEST_CAPS_LATEST("floppy-drive-fat");
DO_TEST_CAPS_VER("disk-readonly-disk", "2.12.0");
DO_TEST_CAPS_LATEST("disk-readonly-disk");
- DO_TEST_NOCAPS("disk-fmt-qcow");
+ DO_TEST_CAPS_VER("disk-fmt-qcow", "4.1.0");
+ DO_TEST_CAPS_LATEST("disk-fmt-qcow");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-cow");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-dir");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-iso");
@@ -1386,8 +1387,10 @@ mymain(void)
DO_TEST_CAPS_VER("disk-aio", "2.12.0");
DO_TEST_CAPS_LATEST("disk-aio");
DO_TEST_CAPS_LATEST("disk-aio-io_uring");
- DO_TEST_NOCAPS("disk-source-pool");
- DO_TEST_NOCAPS("disk-source-pool-mode");
+ DO_TEST_CAPS_VER("disk-source-pool", "4.1.0");
+ DO_TEST_CAPS_LATEST("disk-source-pool");
+ DO_TEST_CAPS_VER("disk-source-pool-mode", "4.1.0");
+ DO_TEST_CAPS_LATEST("disk-source-pool-mode");
DO_TEST_CAPS_LATEST("disk-ioeventfd");
DO_TEST_CAPS_VER("disk-copy_on_read", "2.12.0");
DO_TEST_CAPS_LATEST("disk-copy_on_read");
--
2.31.1
8:02 a.m.
New subject: [PATCH 15/20] qemuxml2argvtest: Modernize 'disk-floppy-pseries' case
Use real caps. The flooppy device still is forbidden for ppc64.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...floppy-pseries.err => disk-floppy-pseries.ppc64-latest.err} | 0
tests/qemuxml2argvtest.c | 3 +--
2 files changed, 1 insertion(+), 2 deletions(-)
rename tests/qemuxml2argvdata/{disk-floppy-pseries.err =>
disk-floppy-pseries.ppc64-latest.err} (100%)
diff --git a/tests/qemuxml2argvdata/disk-floppy-pseries.err
b/tests/qemuxml2argvdata/disk-floppy-pseries.ppc64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/disk-floppy-pseries.err
rename to tests/qemuxml2argvdata/disk-floppy-pseries.ppc64-latest.err
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 95e26c2a17..5f64a222ac 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1307,8 +1307,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("disk-floppy-q35-2_9");
DO_TEST_CAPS_VER("disk-floppy-q35-2_11", "2.12.0");
DO_TEST_CAPS_LATEST("disk-floppy-q35-2_11");
- DO_TEST_FAILURE("disk-floppy-pseries",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
+ DO_TEST_CAPS_ARCH_LATEST_FAILURE("disk-floppy-pseries",
"ppc64");
DO_TEST_CAPS_LATEST("disk-floppy-tray");
DO_TEST_CAPS_LATEST("disk-virtio");
DO_TEST("disk-virtio-ccw", QEMU_CAPS_CCW);
--
2.31.1
8:02 a.m.
New subject: [PATCH 16/20] qemuxml2argvtest: Modernize s390x disk tests
An update to the machine type was necessary as 'virtio-ccw' is no longer
supported.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../disk-virtio-ccw-many.args | 36 ----------------
.../disk-virtio-ccw-many.s390x-latest.args | 43 +++++++++++++++++++
.../qemuxml2argvdata/disk-virtio-ccw-many.xml | 2 +-
tests/qemuxml2argvdata/disk-virtio-ccw.args | 32 --------------
.../disk-virtio-ccw.s390x-latest.args | 37 ++++++++++++++++
tests/qemuxml2argvdata/disk-virtio-ccw.xml | 2 +-
.../disk-virtio-s390-zpci.args | 31 -------------
.../disk-virtio-s390-zpci.s390x-latest.args | 35 +++++++++++++++
tests/qemuxml2argvtest.c | 6 +--
9 files changed, 120 insertions(+), 104 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-ccw-many.args
create mode 100644 tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-ccw.args
create mode 100644 tests/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args
diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
b/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
deleted file mode 100644
index 6932f29a18..0000000000
--- a/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-s390x \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine s390-ccw,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=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
--device
virtio-blk-ccw,devno=0.0.0007,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--drive file=/dev/HostVG/QEMUGuest4,format=raw,if=none,id=drive-virtio-disk1 \
--device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk1,id=virtio-disk1 \
--drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-virtio-disk2 \
--device virtio-blk-ccw,devno=fe.0.0001,drive=drive-virtio-disk2,id=virtio-disk2 \
--drive file=/dev/HostVG/QEMUGuest3,format=raw,if=none,id=drive-virtio-disk3 \
--device virtio-blk-ccw,devno=fe.2.f00f,drive=drive-virtio-disk3,id=virtio-disk3 \
--device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args
b/tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args
new file mode 100644
index 0000000000..d509d6e536
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args
@@ -0,0 +1,43 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-s390x \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,memory-backend=s390.ram \
+-cpu qemu \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-4-format","read-only":false,"driver":"raw","file":"libvirt-4-storage"}'
\
+-device virtio-blk-ccw,devno=0.0.0007,drive=libvirt-4-format,id=virtio-disk0,bootindex=1
\
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest4","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-3-format","read-only":false,"driver":"raw","file":"libvirt-3-storage"}'
\
+-device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-3-format,id=virtio-disk1 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}'
\
+-device virtio-blk-ccw,devno=fe.0.0001,drive=libvirt-2-format,id=virtio-disk2 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest3","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device virtio-blk-ccw,devno=fe.2.f00f,drive=libvirt-1-format,id=virtio-disk3 \
+-audiodev id=audio1,driver=none \
+-device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw-many.xml
b/tests/qemuxml2argvdata/disk-virtio-ccw-many.xml
index e04371c715..b0e8ff57d6 100644
--- a/tests/qemuxml2argvdata/disk-virtio-ccw-many.xml
+++ b/tests/qemuxml2argvdata/disk-virtio-ccw-many.xml
@@ -5,7 +5,7 @@
<currentMemory>219136</currentMemory>
<vcpu>1</vcpu>
<os>
- <type arch='s390x' machine='s390-ccw'>hvm</type>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw.args
b/tests/qemuxml2argvdata/disk-virtio-ccw.args
deleted file mode 100644
index 1794560190..0000000000
--- a/tests/qemuxml2argvdata/disk-virtio-ccw.args
+++ /dev/null
@@ -1,32 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-s390x \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine s390-ccw,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=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
--device
virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-virtio-disk1 \
--device virtio-blk-ccw,devno=0.0.0007,drive=drive-virtio-disk1,id=virtio-disk1 \
--device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args
b/tests/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args
new file mode 100644
index 0000000000..414dd053d5
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args
@@ -0,0 +1,37 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-s390x \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,memory-backend=s390.ram \
+-cpu qemu \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}'
\
+-device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-2-format,id=virtio-disk0,bootindex=1
\
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device virtio-blk-ccw,devno=0.0.0007,drive=libvirt-1-format,id=virtio-disk1 \
+-audiodev id=audio1,driver=none \
+-device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw.xml
b/tests/qemuxml2argvdata/disk-virtio-ccw.xml
index 6bc04b8b98..ffd318bf8a 100644
--- a/tests/qemuxml2argvdata/disk-virtio-ccw.xml
+++ b/tests/qemuxml2argvdata/disk-virtio-ccw.xml
@@ -5,7 +5,7 @@
<currentMemory>219136</currentMemory>
<vcpu>1</vcpu>
<os>
- <type arch='s390x' machine='s390-ccw'>hvm</type>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
diff --git a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
deleted file mode 100644
index bdec1f752c..0000000000
--- a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
+++ /dev/null
@@ -1,31 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-s390x \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine s390-ccw-virtio,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=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
--device zpci,uid=25,fid=31,target=virtio-disk0,id=zpci25 \
--device
virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--device virtio-balloon-ccw,id=balloon0,devno=fe.0.0000 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args
b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args
new file mode 100644
index 0000000000..8e58542d50
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args
@@ -0,0 +1,35 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-s390x \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,memory-backend=s390.ram \
+-cpu qemu \
+-m 214 \
+-object
'{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264}'
\
+-overcommit mem-lock=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=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device zpci,uid=25,fid=31,target=virtio-disk0,id=zpci25 \
+-device
virtio-blk-pci,bus=pci.0,addr=0x8,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
+-audiodev id=audio1,driver=none \
+-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0000 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 5f64a222ac..69018c6411 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1310,9 +1310,9 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST_FAILURE("disk-floppy-pseries",
"ppc64");
DO_TEST_CAPS_LATEST("disk-floppy-tray");
DO_TEST_CAPS_LATEST("disk-virtio");
- DO_TEST("disk-virtio-ccw", QEMU_CAPS_CCW);
- DO_TEST("disk-virtio-ccw-many", QEMU_CAPS_CCW);
- DO_TEST("disk-virtio-s390-zpci", QEMU_CAPS_DEVICE_ZPCI, QEMU_CAPS_CCW);
+ DO_TEST_CAPS_ARCH_LATEST("disk-virtio-ccw", "s390x");
+ DO_TEST_CAPS_ARCH_LATEST("disk-virtio-ccw-many", "s390x");
+ DO_TEST_CAPS_ARCH_LATEST("disk-virtio-s390-zpci", "s390x");
DO_TEST_CAPS_LATEST("disk-order");
DO_TEST_CAPS_LATEST("disk-virtio-queues");
DO_TEST_CAPS_LATEST("disk-boot-disk");
--
2.31.1
8:17 a.m.
New subject: [PATCH 16/20] qemuxml2argvtest: Modernize s390x disk tests
On a Wednesday in 2021, Peter Krempa wrote:
An update to the machine type was necessary as 'virtio-ccw' is
no longer
supported.
's390-ccw'
Jano
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../disk-virtio-ccw-many.args | 36 ----------------
.../disk-virtio-ccw-many.s390x-latest.args | 43 +++++++++++++++++++
.../qemuxml2argvdata/disk-virtio-ccw-many.xml | 2 +-
tests/qemuxml2argvdata/disk-virtio-ccw.args | 32 --------------
.../disk-virtio-ccw.s390x-latest.args | 37 ++++++++++++++++
tests/qemuxml2argvdata/disk-virtio-ccw.xml | 2 +-
.../disk-virtio-s390-zpci.args | 31 -------------
.../disk-virtio-s390-zpci.s390x-latest.args | 35 +++++++++++++++
tests/qemuxml2argvtest.c | 6 +--
9 files changed, 120 insertions(+), 104 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-ccw-many.args
create mode 100644 tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-ccw.args
create mode 100644 tests/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args
8:02 a.m.
New subject: [PATCH 17/20] tests: qemu: Remove 'virtio-ccw' machine type from fake capabilities
Modern QEMUs don't support the machine type at all. Remove it from our
fake caps generator too and adjust test cases which depend on it.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../qemuhotplug-base-ccw-live+ccw-virtio.xml | 2 +-
...ug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml | 2 +-
...lug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 2 +-
.../qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml | 2 +-
...plug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml | 2 +-
.../qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 2 +-
.../qemuhotplug-base-ccw-live-with-ccw-virtio.xml | 2 +-
tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml | 2 +-
tests/qemuxml2argvdata/balloon-ccw-deflate.args | 2 +-
tests/qemuxml2argvdata/balloon-ccw-deflate.xml | 2 +-
tests/qemuxml2argvdata/console-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/console-virtio-ccw.xml | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml | 2 +-
tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.xml | 2 +-
tests/qemuxml2argvdata/net-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/net-virtio-ccw.xml | 2 +-
tests/qemuxml2argvdata/non-x86_64-timer-error.err | 2 +-
tests/qemuxml2argvdata/non-x86_64-timer-error.xml | 2 +-
tests/qemuxml2argvdata/virtio-rng-ccw.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-ccw.xml | 2 +-
tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml | 2 +-
tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml | 2 +-
tests/testutilsqemu.c | 2 +-
25 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
index 44f41c6ddd..a786d03185 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>4194304</currentMemory>
<vcpu placement='static'>4</vcpu>
<os>
- <type arch='s390x' machine='s390-ccw'>hvm</type>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
<boot dev='hd'/>
</os>
<features>
diff --git
a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml
b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml
index d10b29be7e..0c76410ff1 100644
---
a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml
+++
b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>4194304</currentMemory>
<vcpu placement='static'>4</vcpu>
<os>
- <type arch='s390x' machine='s390-ccw'>hvm</type>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
<boot dev='hd'/>
</os>
<features>
diff --git
a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml
b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml
index 0988f8681c..e048d2c23a 100644
---
a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml
+++
b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>4194304</currentMemory>
<vcpu placement='static'>4</vcpu>
<os>
- <type arch='s390x' machine='s390-ccw'>hvm</type>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
<boot dev='hd'/>
</os>
<features>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
index b0151cd690..fcf5bfadcb 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>4194304</currentMemory>
<vcpu placement='static'>4</vcpu>
<os>
- <type arch='s390x' machine='s390-ccw'>hvm</type>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
<boot dev='hd'/>
</os>
<features>
diff --git
a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml
b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml
index 0e8075caf6..8e7f479967 100644
---
a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml
+++
b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>4194304</currentMemory>
<vcpu placement='static'>4</vcpu>
<os>
- <type arch='s390x' machine='s390-ccw'>hvm</type>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
<boot dev='hd'/>
</os>
<features>
diff --git
a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml
b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml
index 0e8075caf6..8e7f479967 100644
---
a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml
+++
b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>4194304</currentMemory>
<vcpu placement='static'>4</vcpu>
<os>
- <type arch='s390x' machine='s390-ccw'>hvm</type>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
<boot dev='hd'/>
</os>
<features>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
index 240dda4c72..adec141512 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>4194304</currentMemory>
<vcpu placement='static'>4</vcpu>
<os>
- <type arch='s390x' machine='s390-ccw'>hvm</type>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
<boot dev='hd'/>
</os>
<features>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
index 9a650e340e..2267fe39df 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>4194304</currentMemory>
<vcpu placement='static'>4</vcpu>
<os>
- <type arch='s390x' machine='s390-ccw'>hvm</type>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
<boot dev='hd'/>
</os>
<features>
diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.args
b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
index 351ac7ea48..bf56265638 100644
--- a/tests/qemuxml2argvdata/balloon-ccw-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.xml
b/tests/qemuxml2argvdata/balloon-ccw-deflate.xml
index fe7c76037f..046fd7137f 100644
--- a/tests/qemuxml2argvdata/balloon-ccw-deflate.xml
+++ b/tests/qemuxml2argvdata/balloon-ccw-deflate.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='s390x' machine='s390-ccw'>hvm</type>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.args
b/tests/qemuxml2argvdata/console-virtio-ccw.args
index 5af1839410..5447a5e9e0 100644
--- a/tests/qemuxml2argvdata/console-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/console-virtio-ccw.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.xml
b/tests/qemuxml2argvdata/console-virtio-ccw.xml
index fc300db20e..5a16facbea 100644
--- a/tests/qemuxml2argvdata/console-virtio-ccw.xml
+++ b/tests/qemuxml2argvdata/console-virtio-ccw.xml
@@ -4,7 +4,7 @@
<memory>219100</memory>
<currentMemory>219100</currentMemory>
<os>
- <type arch='s390x' machine='s390-ccw'>hvm</type>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
</os>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
index 8f04e0b053..f78579846e 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=QEMUGuest2,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes
\
--machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml
index 33234bc3d9..2ef7b0c688 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='s390x' machine='s390-ccw'>hvm</type>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
index 7d5efa5aa3..52af50f032 100644
--- a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.xml
b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.xml
index dcc64ae618..dd2f6062c2 100644
--- a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.xml
+++ b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.xml
@@ -6,7 +6,7 @@
<vcpu placement='static'>1</vcpu>
<iothreads>2</iothreads>
<os>
- <type arch='s390x' machine='s390-ccw'>hvm</type>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.args
b/tests/qemuxml2argvdata/net-virtio-ccw.args
index 76ceaef6cf..24719f5a72 100644
--- a/tests/qemuxml2argvdata/net-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/net-virtio-ccw.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.xml
b/tests/qemuxml2argvdata/net-virtio-ccw.xml
index fa8d52d9c5..ef8f0c872b 100644
--- a/tests/qemuxml2argvdata/net-virtio-ccw.xml
+++ b/tests/qemuxml2argvdata/net-virtio-ccw.xml
@@ -5,7 +5,7 @@
<currentMemory>219136</currentMemory>
<vcpu>1</vcpu>
<os>
- <type arch='s390x' machine='s390-ccw'>hvm</type>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
diff --git a/tests/qemuxml2argvdata/non-x86_64-timer-error.err
b/tests/qemuxml2argvdata/non-x86_64-timer-error.err
index f46673eb62..eab07d939d 100644
--- a/tests/qemuxml2argvdata/non-x86_64-timer-error.err
+++ b/tests/qemuxml2argvdata/non-x86_64-timer-error.err
@@ -1 +1 @@
-unsupported configuration: Configuring the 'tsc' timer is not supported for
virtType=kvm arch=s390x machine=s390-ccw guests
+unsupported configuration: Configuring the 'tsc' timer is not supported for
virtType=kvm arch=s390x machine=s390-ccw-virtio guests
diff --git a/tests/qemuxml2argvdata/non-x86_64-timer-error.xml
b/tests/qemuxml2argvdata/non-x86_64-timer-error.xml
index 11559bb52b..1c8bad2daf 100644
--- a/tests/qemuxml2argvdata/non-x86_64-timer-error.xml
+++ b/tests/qemuxml2argvdata/non-x86_64-timer-error.xml
@@ -4,7 +4,7 @@
<memory>262144</memory>
<currentMemory>262144</currentMemory>
<os>
- <type arch='s390x' machine='s390-ccw'>hvm</type>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
</os>
<clock offset='utc'>
<timer name='tsc' present='yes'/>
diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.args
b/tests/qemuxml2argvdata/virtio-rng-ccw.args
index c728ead87e..8ec40a2a9e 100644
--- a/tests/qemuxml2argvdata/virtio-rng-ccw.args
+++ b/tests/qemuxml2argvdata/virtio-rng-ccw.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.xml
b/tests/qemuxml2argvdata/virtio-rng-ccw.xml
index 2cf7d82b48..8aa7c509c3 100644
--- a/tests/qemuxml2argvdata/virtio-rng-ccw.xml
+++ b/tests/qemuxml2argvdata/virtio-rng-ccw.xml
@@ -4,7 +4,7 @@
<memory>219100</memory>
<currentMemory>219100</currentMemory>
<os>
- <type arch='s390x' machine='s390-ccw'>hvm</type>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
</os>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml
index ee42e03f07..95eff7ead6 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='s390x' machine='s390-ccw'>hvm</type>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
diff --git a/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml
b/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml
index f711b34ffe..05cb204ea5 100644
--- a/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml
+++ b/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml
@@ -6,7 +6,7 @@
<vcpu placement='static'>1</vcpu>
<iothreads>2</iothreads>
<os>
- <type arch='s390x' machine='s390-ccw'>hvm</type>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 505c66b818..1078a3117a 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -73,7 +73,7 @@ static const char *const riscv64_machines[] = {
"spike_v1.10", "spike_v1.9.1", "sifive_e",
"virt", "sifive_u", NULL
};
static const char *const s390x_machines[] = {
- "s390-ccw-virtio", "s390-ccw", NULL
+ "s390-ccw-virtio", NULL
};
static const char *const sparc_machines[] = {
"SS-5", "LX", "SPARCClassic", "SPARCbook",
--
2.31.1
8:19 a.m.
New subject: [PATCH 17/20] tests: qemu: Remove 'virtio-ccw' machine type from fake capabilities
In the commit summary:
s/virtio/s390/
On a Wednesday in 2021, Peter Krempa wrote:
Modern QEMUs don't support the machine type at all. Remove it from
our
fake caps generator too and adjust test cases which depend on it.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
Jano
8:02 a.m.
New subject: [PATCH 18/20] qemuxml2argvtest: Use versioned ("4.1.0") capabilities for pre '-audiodev' cases
Use real caps instead of fake caps for the legacy cases. This will also
show us when we can remove the old-style code.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...args => audio-alsa-best.x86_64-4.1.0.args} | 9 +--
...l.err => audio-alsa-full.x86_64-4.1.0.err} | 0
...s => audio-alsa-minimal.x86_64-4.1.0.args} | 9 +--
...=> audio-coreaudio-best.x86_64-4.1.0.args} | 9 +--
... => audio-coreaudio-full.x86_64-4.1.0.err} | 0
...audio-coreaudio-minimal.x86_64-4.1.0.args} | 9 +--
...udio-default-nographics.x86_64-4.1.0.args} | 9 +--
...args => audio-file-best.x86_64-4.1.0.args} | 9 +--
...l.err => audio-file-full.x86_64-4.1.0.err} | 0
...s => audio-file-minimal.x86_64-4.1.0.args} | 9 +--
...l.err => audio-jack-full.x86_64-4.1.0.err} | 0
...rr => audio-jack-minimal.x86_64-4.1.0.err} | 0
...r => audio-many-backends.x86_64-4.1.0.err} | 0
...args => audio-none-best.x86_64-4.1.0.args} | 9 +--
...l.err => audio-none-full.x86_64-4.1.0.err} | 0
...s => audio-none-minimal.x86_64-4.1.0.args} | 9 +--
....args => audio-oss-best.x86_64-4.1.0.args} | 9 +--
...ll.err => audio-oss-full.x86_64-4.1.0.err} | 0
...gs => audio-oss-minimal.x86_64-4.1.0.args} | 9 +--
...> audio-pulseaudio-best.x86_64-4.1.0.args} | 9 +--
...=> audio-pulseaudio-full.x86_64-4.1.0.err} | 0
...udio-pulseaudio-minimal.x86_64-4.1.0.args} | 9 +--
....args => audio-sdl-best.x86_64-4.1.0.args} | 9 +--
...ll.err => audio-sdl-full.x86_64-4.1.0.err} | 0
...gs => audio-sdl-minimal.x86_64-4.1.0.args} | 9 +--
...rgs => audio-spice-best.x86_64-4.1.0.args} | 9 +--
....err => audio-spice-full.x86_64-4.1.0.err} | 0
... => audio-spice-minimal.x86_64-4.1.0.args} | 9 +--
tests/qemuxml2argvtest.c | 56 +++++++++----------
29 files changed, 113 insertions(+), 96 deletions(-)
rename tests/qemuxml2argvdata/{audio-alsa-best.args =>
audio-alsa-best.x86_64-4.1.0.args} (81%)
rename tests/qemuxml2argvdata/{audio-alsa-full.err =>
audio-alsa-full.x86_64-4.1.0.err} (100%)
rename tests/qemuxml2argvdata/{audio-alsa-minimal.args =>
audio-alsa-minimal.x86_64-4.1.0.args} (75%)
rename tests/qemuxml2argvdata/{audio-coreaudio-best.args =>
audio-coreaudio-best.x86_64-4.1.0.args} (81%)
rename tests/qemuxml2argvdata/{audio-coreaudio-full.err =>
audio-coreaudio-full.x86_64-4.1.0.err} (100%)
rename tests/qemuxml2argvdata/{audio-coreaudio-minimal.args =>
audio-coreaudio-minimal.x86_64-4.1.0.args} (75%)
rename tests/qemuxml2argvdata/{audio-default-nographics.args =>
audio-default-nographics.x86_64-4.1.0.args} (75%)
rename tests/qemuxml2argvdata/{audio-file-best.args =>
audio-file-best.x86_64-4.1.0.args} (81%)
rename tests/qemuxml2argvdata/{audio-file-full.err =>
audio-file-full.x86_64-4.1.0.err} (100%)
rename tests/qemuxml2argvdata/{audio-file-minimal.args =>
audio-file-minimal.x86_64-4.1.0.args} (75%)
rename tests/qemuxml2argvdata/{audio-jack-full.err =>
audio-jack-full.x86_64-4.1.0.err} (100%)
rename tests/qemuxml2argvdata/{audio-jack-minimal.err =>
audio-jack-minimal.x86_64-4.1.0.err} (100%)
rename tests/qemuxml2argvdata/{audio-many-backends.err =>
audio-many-backends.x86_64-4.1.0.err} (100%)
rename tests/qemuxml2argvdata/{audio-none-best.args =>
audio-none-best.x86_64-4.1.0.args} (80%)
rename tests/qemuxml2argvdata/{audio-none-full.err =>
audio-none-full.x86_64-4.1.0.err} (100%)
rename tests/qemuxml2argvdata/{audio-none-minimal.args =>
audio-none-minimal.x86_64-4.1.0.args} (75%)
rename tests/qemuxml2argvdata/{audio-oss-best.args =>
audio-oss-best.x86_64-4.1.0.args} (82%)
rename tests/qemuxml2argvdata/{audio-oss-full.err => audio-oss-full.x86_64-4.1.0.err}
(100%)
rename tests/qemuxml2argvdata/{audio-oss-minimal.args =>
audio-oss-minimal.x86_64-4.1.0.args} (75%)
rename tests/qemuxml2argvdata/{audio-pulseaudio-best.args =>
audio-pulseaudio-best.x86_64-4.1.0.args} (82%)
rename tests/qemuxml2argvdata/{audio-pulseaudio-full.err =>
audio-pulseaudio-full.x86_64-4.1.0.err} (100%)
rename tests/qemuxml2argvdata/{audio-pulseaudio-minimal.args =>
audio-pulseaudio-minimal.x86_64-4.1.0.args} (75%)
rename tests/qemuxml2argvdata/{audio-sdl-best.args =>
audio-sdl-best.x86_64-4.1.0.args} (81%)
rename tests/qemuxml2argvdata/{audio-sdl-full.err => audio-sdl-full.x86_64-4.1.0.err}
(100%)
rename tests/qemuxml2argvdata/{audio-sdl-minimal.args =>
audio-sdl-minimal.x86_64-4.1.0.args} (75%)
rename tests/qemuxml2argvdata/{audio-spice-best.args =>
audio-spice-best.x86_64-4.1.0.args} (80%)
rename tests/qemuxml2argvdata/{audio-spice-full.err =>
audio-spice-full.x86_64-4.1.0.err} (100%)
rename tests/qemuxml2argvdata/{audio-spice-minimal.args =>
audio-spice-minimal.x86_64-4.1.0.args} (75%)
diff --git a/tests/qemuxml2argvdata/audio-alsa-best.args
b/tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args
similarity index 81%
rename from tests/qemuxml2argvdata/audio-alsa-best.args
rename to tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args
index a9c6833570..615a45711e 100644
--- a/tests/qemuxml2argvdata/audio-alsa-best.args
+++ b/tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args
@@ -24,21 +24,22 @@ QEMU_AUDIO_DAC_DEV=/dev/dsp1 \
-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 \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=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=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-drive file=/dev/cdrom,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 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-alsa-full.err
b/tests/qemuxml2argvdata/audio-alsa-full.x86_64-4.1.0.err
similarity index 100%
rename from tests/qemuxml2argvdata/audio-alsa-full.err
rename to tests/qemuxml2argvdata/audio-alsa-full.x86_64-4.1.0.err
diff --git a/tests/qemuxml2argvdata/audio-alsa-minimal.args
b/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args
similarity index 75%
rename from tests/qemuxml2argvdata/audio-alsa-minimal.args
rename to tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args
index 9a1126b0e8..d27ddd1e29 100644
--- a/tests/qemuxml2argvdata/audio-alsa-minimal.args
+++ b/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args
@@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=alsa \
-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 \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=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=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-drive file=/dev/cdrom,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 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-coreaudio-best.args
b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args
similarity index 81%
rename from tests/qemuxml2argvdata/audio-coreaudio-best.args
rename to tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args
index 60308f06f0..cdcec548ea 100644
--- a/tests/qemuxml2argvdata/audio-coreaudio-best.args
+++ b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args
@@ -24,21 +24,22 @@ QEMU_COREAUDIO_BUFFER_SIZE=200 \
-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 \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=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=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-drive file=/dev/cdrom,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 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-coreaudio-full.err
b/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-4.1.0.err
similarity index 100%
rename from tests/qemuxml2argvdata/audio-coreaudio-full.err
rename to tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-4.1.0.err
diff --git a/tests/qemuxml2argvdata/audio-coreaudio-minimal.args
b/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args
similarity index 75%
rename from tests/qemuxml2argvdata/audio-coreaudio-minimal.args
rename to tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args
index f5a1c9822a..2254f91106 100644
--- a/tests/qemuxml2argvdata/audio-coreaudio-minimal.args
+++ b/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args
@@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=coreaudio \
-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 \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=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=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-drive file=/dev/cdrom,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 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-default-nographics.args
b/tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args
similarity index 75%
rename from tests/qemuxml2argvdata/audio-default-nographics.args
rename to tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args
index 9a1126b0e8..d27ddd1e29 100644
--- a/tests/qemuxml2argvdata/audio-default-nographics.args
+++ b/tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args
@@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=alsa \
-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 \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=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=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-drive file=/dev/cdrom,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 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-file-best.args
b/tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args
similarity index 81%
rename from tests/qemuxml2argvdata/audio-file-best.args
rename to tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args
index 36bd22e223..ccdc6417ab 100644
--- a/tests/qemuxml2argvdata/audio-file-best.args
+++ b/tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args
@@ -23,21 +23,22 @@ QEMU_WAV_PATH=audio.wav \
-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 \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=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=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-drive file=/dev/cdrom,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 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-file-full.err
b/tests/qemuxml2argvdata/audio-file-full.x86_64-4.1.0.err
similarity index 100%
rename from tests/qemuxml2argvdata/audio-file-full.err
rename to tests/qemuxml2argvdata/audio-file-full.x86_64-4.1.0.err
diff --git a/tests/qemuxml2argvdata/audio-file-minimal.args
b/tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args
similarity index 75%
rename from tests/qemuxml2argvdata/audio-file-minimal.args
rename to tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args
index abb377fab3..69f6f07a7c 100644
--- a/tests/qemuxml2argvdata/audio-file-minimal.args
+++ b/tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args
@@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=wav \
-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 \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=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=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-drive file=/dev/cdrom,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 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-jack-full.err
b/tests/qemuxml2argvdata/audio-jack-full.x86_64-4.1.0.err
similarity index 100%
rename from tests/qemuxml2argvdata/audio-jack-full.err
rename to tests/qemuxml2argvdata/audio-jack-full.x86_64-4.1.0.err
diff --git a/tests/qemuxml2argvdata/audio-jack-minimal.err
b/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-4.1.0.err
similarity index 100%
rename from tests/qemuxml2argvdata/audio-jack-minimal.err
rename to tests/qemuxml2argvdata/audio-jack-minimal.x86_64-4.1.0.err
diff --git a/tests/qemuxml2argvdata/audio-many-backends.err
b/tests/qemuxml2argvdata/audio-many-backends.x86_64-4.1.0.err
similarity index 100%
rename from tests/qemuxml2argvdata/audio-many-backends.err
rename to tests/qemuxml2argvdata/audio-many-backends.x86_64-4.1.0.err
diff --git a/tests/qemuxml2argvdata/audio-none-best.args
b/tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args
similarity index 80%
rename from tests/qemuxml2argvdata/audio-none-best.args
rename to tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args
index 8284b7cf5f..06bca09a59 100644
--- a/tests/qemuxml2argvdata/audio-none-best.args
+++ b/tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args
@@ -22,21 +22,22 @@ QEMU_AUDIO_DAC_FIXED_FMT=f32 \
-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 \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=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=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-drive file=/dev/cdrom,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 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-none-full.err
b/tests/qemuxml2argvdata/audio-none-full.x86_64-4.1.0.err
similarity index 100%
rename from tests/qemuxml2argvdata/audio-none-full.err
rename to tests/qemuxml2argvdata/audio-none-full.x86_64-4.1.0.err
diff --git a/tests/qemuxml2argvdata/audio-none-minimal.args
b/tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args
similarity index 75%
rename from tests/qemuxml2argvdata/audio-none-minimal.args
rename to tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args
index ec6ddd2857..0624595a5e 100644
--- a/tests/qemuxml2argvdata/audio-none-minimal.args
+++ b/tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args
@@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=none \
-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 \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=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=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-drive file=/dev/cdrom,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 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-oss-best.args
b/tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args
similarity index 82%
rename from tests/qemuxml2argvdata/audio-oss-best.args
rename to tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args
index 25d37650f6..99ef339f50 100644
--- a/tests/qemuxml2argvdata/audio-oss-best.args
+++ b/tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args
@@ -27,21 +27,22 @@ QEMU_OSS_NFRAGS=30 \
-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 \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=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=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-drive file=/dev/cdrom,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 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-oss-full.err
b/tests/qemuxml2argvdata/audio-oss-full.x86_64-4.1.0.err
similarity index 100%
rename from tests/qemuxml2argvdata/audio-oss-full.err
rename to tests/qemuxml2argvdata/audio-oss-full.x86_64-4.1.0.err
diff --git a/tests/qemuxml2argvdata/audio-oss-minimal.args
b/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args
similarity index 75%
rename from tests/qemuxml2argvdata/audio-oss-minimal.args
rename to tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args
index eb94dedbe0..19870c0d84 100644
--- a/tests/qemuxml2argvdata/audio-oss-minimal.args
+++ b/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args
@@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=oss \
-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 \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=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=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-drive file=/dev/cdrom,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 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-best.args
b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args
similarity index 82%
rename from tests/qemuxml2argvdata/audio-pulseaudio-best.args
rename to tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args
index f462325694..3f6118e847 100644
--- a/tests/qemuxml2argvdata/audio-pulseaudio-best.args
+++ b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args
@@ -26,21 +26,22 @@ QEMU_PA_SERVER=%s=acme.example.org \
-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 \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=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=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-drive file=/dev/cdrom,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 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-full.err
b/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-4.1.0.err
similarity index 100%
rename from tests/qemuxml2argvdata/audio-pulseaudio-full.err
rename to tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-4.1.0.err
diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.args
b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args
similarity index 75%
rename from tests/qemuxml2argvdata/audio-pulseaudio-minimal.args
rename to tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args
index e68b58528d..e6c8a71925 100644
--- a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.args
+++ b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args
@@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=pa \
-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 \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=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=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-drive file=/dev/cdrom,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 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-sdl-best.args
b/tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args
similarity index 81%
rename from tests/qemuxml2argvdata/audio-sdl-best.args
rename to tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args
index 221d67468c..2767721b6b 100644
--- a/tests/qemuxml2argvdata/audio-sdl-best.args
+++ b/tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args
@@ -24,21 +24,22 @@ SDL_AUDIODRIVER=pulseaudio \
-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 \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=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=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-drive file=/dev/cdrom,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 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-sdl-full.err
b/tests/qemuxml2argvdata/audio-sdl-full.x86_64-4.1.0.err
similarity index 100%
rename from tests/qemuxml2argvdata/audio-sdl-full.err
rename to tests/qemuxml2argvdata/audio-sdl-full.x86_64-4.1.0.err
diff --git a/tests/qemuxml2argvdata/audio-sdl-minimal.args
b/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args
similarity index 75%
rename from tests/qemuxml2argvdata/audio-sdl-minimal.args
rename to tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args
index fe745b25db..6720a3b50a 100644
--- a/tests/qemuxml2argvdata/audio-sdl-minimal.args
+++ b/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args
@@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=sdl \
-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 \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=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=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-drive file=/dev/cdrom,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 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-spice-best.args
b/tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args
similarity index 80%
rename from tests/qemuxml2argvdata/audio-spice-best.args
rename to tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args
index 70d10fe24d..bfc9657ae6 100644
--- a/tests/qemuxml2argvdata/audio-spice-best.args
+++ b/tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args
@@ -22,21 +22,22 @@ QEMU_AUDIO_DAC_FIXED_FMT=f32 \
-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 \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=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=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-drive file=/dev/cdrom,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 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-spice-full.err
b/tests/qemuxml2argvdata/audio-spice-full.x86_64-4.1.0.err
similarity index 100%
rename from tests/qemuxml2argvdata/audio-spice-full.err
rename to tests/qemuxml2argvdata/audio-spice-full.x86_64-4.1.0.err
diff --git a/tests/qemuxml2argvdata/audio-spice-minimal.args
b/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args
similarity index 75%
rename from tests/qemuxml2argvdata/audio-spice-minimal.args
rename to tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args
index 30a4f5e5a0..ebc58f725b 100644
--- a/tests/qemuxml2argvdata/audio-spice-minimal.args
+++ b/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args
@@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=spice \
-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 \
+-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=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=on,wait=off
\
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-drive file=/dev/cdrom,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 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 69018c6411..87c8a27b73 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1080,15 +1080,15 @@ mymain(void)
QEMU_CAPS_VIRTIO_BLK_SCSI);
/* Simplest possible <audio>, all supported with ENV */
- DO_TEST_NOCAPS("audio-none-minimal");
- DO_TEST_NOCAPS("audio-alsa-minimal");
- DO_TEST_NOCAPS("audio-coreaudio-minimal");
- DO_TEST_PARSE_ERROR_NOCAPS("audio-jack-minimal");
- DO_TEST_NOCAPS("audio-oss-minimal");
- DO_TEST_NOCAPS("audio-pulseaudio-minimal");
- DO_TEST_NOCAPS("audio-sdl-minimal");
- DO_TEST_NOCAPS("audio-spice-minimal");
- DO_TEST_NOCAPS("audio-file-minimal");
+ DO_TEST_CAPS_VER("audio-none-minimal", "4.1.0");
+ DO_TEST_CAPS_VER("audio-alsa-minimal", "4.1.0");
+ DO_TEST_CAPS_VER("audio-coreaudio-minimal", "4.1.0");
+ DO_TEST_CAPS_VER_PARSE_ERROR("audio-jack-minimal", "4.1.0");
+ DO_TEST_CAPS_VER("audio-oss-minimal", "4.1.0");
+ DO_TEST_CAPS_VER("audio-pulseaudio-minimal", "4.1.0");
+ DO_TEST_CAPS_VER("audio-sdl-minimal", "4.1.0");
+ DO_TEST_CAPS_VER("audio-spice-minimal", "4.1.0");
+ DO_TEST_CAPS_VER("audio-file-minimal", "4.1.0");
DO_TEST_CAPS_LATEST("audio-none-minimal");
DO_TEST_CAPS_LATEST("audio-alsa-minimal");
@@ -1101,14 +1101,14 @@ mymain(void)
DO_TEST_CAPS_LATEST("audio-file-minimal");
/* Best <audio> still compat with old ENV */
- DO_TEST_NOCAPS("audio-none-best");
- DO_TEST_NOCAPS("audio-alsa-best");
- DO_TEST_NOCAPS("audio-coreaudio-best");
- DO_TEST_NOCAPS("audio-oss-best");
- DO_TEST_NOCAPS("audio-pulseaudio-best");
- DO_TEST_NOCAPS("audio-sdl-best");
- DO_TEST_NOCAPS("audio-spice-best");
- DO_TEST_NOCAPS("audio-file-best");
+ DO_TEST_CAPS_VER("audio-none-best", "4.1.0");
+ DO_TEST_CAPS_VER("audio-alsa-best", "4.1.0");
+ DO_TEST_CAPS_VER("audio-coreaudio-best", "4.1.0");
+ DO_TEST_CAPS_VER("audio-oss-best", "4.1.0");
+ DO_TEST_CAPS_VER("audio-pulseaudio-best", "4.1.0");
+ DO_TEST_CAPS_VER("audio-sdl-best", "4.1.0");
+ DO_TEST_CAPS_VER("audio-spice-best", "4.1.0");
+ DO_TEST_CAPS_VER("audio-file-best", "4.1.0");
DO_TEST_CAPS_LATEST("audio-none-best");
DO_TEST_CAPS_LATEST("audio-alsa-best");
@@ -1120,15 +1120,15 @@ mymain(void)
DO_TEST_CAPS_LATEST("audio-file-best");
/* Full <audio> only compat with new QEMU -audiodev args */
- DO_TEST_PARSE_ERROR_NOCAPS("audio-none-full");
- DO_TEST_PARSE_ERROR_NOCAPS("audio-alsa-full");
- DO_TEST_PARSE_ERROR_NOCAPS("audio-coreaudio-full");
- DO_TEST_PARSE_ERROR_NOCAPS("audio-jack-full");
- DO_TEST_PARSE_ERROR_NOCAPS("audio-oss-full");
- DO_TEST_PARSE_ERROR_NOCAPS("audio-pulseaudio-full");
- DO_TEST_PARSE_ERROR_NOCAPS("audio-sdl-full");
- DO_TEST_PARSE_ERROR_NOCAPS("audio-spice-full");
- DO_TEST_PARSE_ERROR_NOCAPS("audio-file-full");
+ DO_TEST_CAPS_VER_PARSE_ERROR("audio-none-full", "4.1.0");
+ DO_TEST_CAPS_VER_PARSE_ERROR("audio-alsa-full", "4.1.0");
+ DO_TEST_CAPS_VER_PARSE_ERROR("audio-coreaudio-full", "4.1.0");
+ DO_TEST_CAPS_VER_PARSE_ERROR("audio-jack-full", "4.1.0");
+ DO_TEST_CAPS_VER_PARSE_ERROR("audio-oss-full", "4.1.0");
+ DO_TEST_CAPS_VER_PARSE_ERROR("audio-pulseaudio-full", "4.1.0");
+ DO_TEST_CAPS_VER_PARSE_ERROR("audio-sdl-full", "4.1.0");
+ DO_TEST_CAPS_VER_PARSE_ERROR("audio-spice-full", "4.1.0");
+ DO_TEST_CAPS_VER_PARSE_ERROR("audio-file-full", "4.1.0");
DO_TEST_CAPS_LATEST("audio-none-full");
DO_TEST_CAPS_LATEST("audio-alsa-full");
@@ -1141,7 +1141,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("audio-file-full");
/* Multiple backends not supported with ENV */
- DO_TEST_PARSE_ERROR_NOCAPS("audio-many-backends");
+ DO_TEST_CAPS_VER_PARSE_ERROR("audio-many-backends", "4.1.0");
DO_TEST_CAPS_LATEST("audio-many-backends");
/* Validate auto-creation of <audio> for legacy compat */
@@ -1164,7 +1164,7 @@ mymain(void)
g_setenv("QEMU_AUDIO_DRV", "alsa", TRUE);
driver.config->nogfxAllowHostAudio = true;
- DO_TEST_NOCAPS("audio-default-nographics");
+ DO_TEST_CAPS_VER("audio-default-nographics", "4.1.0");
DO_TEST_CAPS_LATEST("audio-default-nographics");
driver.config->nogfxAllowHostAudio = false;
g_unsetenv("QEMU_AUDIO_DRV");
--
2.31.1
8:02 a.m.
New subject: [PATCH 19/20] qemuxml2argvtest: Pin old-style '-no-reboot' usage to qemu-5.2
After qemu-5.2 we always use -no-shutdown.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/misc-no-reboot.args | 31 ----------------
.../misc-no-reboot.x86_64-5.2.0.args | 35 +++++++++++++++++++
tests/qemuxml2argvtest.c | 2 +-
3 files changed, 36 insertions(+), 32 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/misc-no-reboot.args
create mode 100644 tests/qemuxml2argvdata/misc-no-reboot.x86_64-5.2.0.args
diff --git a/tests/qemuxml2argvdata/misc-no-reboot.args
b/tests/qemuxml2argvdata/misc-no-reboot.args
deleted file mode 100644
index 54ae04a480..0000000000
--- a/tests/qemuxml2argvdata/misc-no-reboot.args
+++ /dev/null
@@ -1,31 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-reboot \
--no-acpi \
--boot strict=on \
--usb \
--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 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/misc-no-reboot.x86_64-5.2.0.args
b/tests/qemuxml2argvdata/misc-no-reboot.x86_64-5.2.0.args
new file mode 100644
index 0000000000..db6fff54db
--- /dev/null
+++ b/tests/qemuxml2argvdata/misc-no-reboot.x86_64-5.2.0.args
@@ -0,0 +1,35 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
+-machine pc-i440fx-5.2,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object memory-backend-ram,id=pc.ram,size=224395264 \
+-overcommit mem-lock=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=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-reboot \
+-no-acpi \
+-boot strict=on \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-audiodev id=audio1,driver=none \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 87c8a27b73..b464d4bb68 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1564,7 +1564,7 @@ mymain(void)
DO_TEST("misc-disable-suspends", QEMU_CAPS_PIIX_DISABLE_S3,
QEMU_CAPS_PIIX_DISABLE_S4);
DO_TEST("misc-enable-s4", QEMU_CAPS_PIIX_DISABLE_S4);
DO_TEST_PARSE_ERROR_NOCAPS("misc-enable-s4");
- DO_TEST_NOCAPS("misc-no-reboot");
+ DO_TEST_CAPS_VER("misc-no-reboot", "5.2.0");
DO_TEST_CAPS_LATEST("misc-no-reboot");
DO_TEST_NOCAPS("misc-uuid");
DO_TEST_PARSE_ERROR_NOCAPS("vhost_queues-invalid");
--
2.31.1
8:02 a.m.
New subject: [PATCH 20/20] qemuxml2argvtest: remove 'fs9p' cases with fake capabilities.
The filesystem commandline doesn't differ in the '-latest' cases.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/fs9p-ccw.args | 36 ----------------------------
tests/qemuxml2argvdata/fs9p.args | 34 --------------------------
tests/qemuxml2argvtest.c | 2 --
3 files changed, 72 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/fs9p-ccw.args
delete mode 100644 tests/qemuxml2argvdata/fs9p.args
diff --git a/tests/qemuxml2argvdata/fs9p-ccw.args b/tests/qemuxml2argvdata/fs9p-ccw.args
deleted file mode 100644
index 9cc700e0ce..0000000000
--- a/tests/qemuxml2argvdata/fs9p-ccw.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-s390x \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine s390-ccw-virtio,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=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
--device
virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \
--device virtio-9p-ccw,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,devno=fe.0.0001
\
--fsdev local,security_model=mapped,writeout=immediate,id=fsdev-fs1,path=/export/to/guest2
\
--device virtio-9p-ccw,id=fs1,fsdev=fsdev-fs1,mount_tag=/import/from/host2,devno=fe.0.0002
\
--fsdev handle,writeout=immediate,id=fsdev-fs2,path=/export/to/guest3 \
--device virtio-9p-ccw,id=fs2,fsdev=fsdev-fs2,mount_tag=/import/from/host3,devno=fe.0.0003
\
--device virtio-balloon-ccw,id=balloon0,devno=fe.0.0004 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/fs9p.args b/tests/qemuxml2argvdata/fs9p.args
deleted file mode 100644
index a138c5f53c..0000000000
--- a/tests/qemuxml2argvdata/fs9p.args
+++ /dev/null
@@ -1,34 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \
--device
virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,bus=pci.0,addr=0x2 \
--fsdev local,security_model=mapped,writeout=immediate,id=fsdev-fs1,path=/export/to/guest2
\
--device
virtio-9p-pci,id=fs1,fsdev=fsdev-fs1,mount_tag=/import/from/host2,bus=pci.0,addr=0x3 \
--fsdev handle,writeout=immediate,id=fsdev-fs2,path=/export/to/guest3 \
--device
virtio-9p-pci,id=fs2,fsdev=fsdev-fs2,mount_tag=/import/from/host3,bus=pci.0,addr=0x4 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index b464d4bb68..c696424f8f 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1860,9 +1860,7 @@ mymain(void)
QEMU_CAPS_HDA_OUTPUT,
QEMU_CAPS_DEVICE_ICH9_INTEL_HDA,
QEMU_CAPS_OBJECT_USB_AUDIO);
- DO_TEST_NOCAPS("fs9p");
DO_TEST_CAPS_LATEST("fs9p");
- DO_TEST("fs9p-ccw", QEMU_CAPS_CCW);
DO_TEST_CAPS_ARCH_LATEST("fs9p-ccw", "s390x");
DO_TEST_NOCAPS("hostdev-usb-address");
--
2.31.1
8:20 a.m.
On a Wednesday in 2021, Peter Krempa wrote:
This series cleans up disk related tests and ensures that all use
real
capabilities.
This is preparation for an upcoming RFC patch adding real caps test for
everything.
Peter Krempa (20):
testCompareXMLToArgv: Avoid use of uninitialized 'monitor_chr'
testQemuInfoInitArgs: Report error if path to 'latest' caps for an
arch is NULL
qemuxml2argvtest: Remove 'boot-strict' case
qemuxml2argvtest: Agregate all 'disk'-related test cases
qemuxml2argvtest: Remove fake caps versions of disk tests we have a
versioned test for
qemuxml2argvtest: Remove negative case for 'luks-disks-source-qcow2'
qemuxml2argvtest: Remove 'disk-usb-nosupport' case
qemuxml2argvtest: Convert encrypted disk test cases to
DO_TEST_CAPS_LATEST
qemuxml2argvtest: Use DO_TEST_CAPS_LATEST_PARSE_ERROR for disk cases
qemuxml2argvtest: Use real caps for all disk frontend property tests
qemuxml2argvtest: Replace 'disk-network-iscsi' by the more
comprehensive 'disk-network-iscsi-modern'
qemuxml2argvtest: Merge 'disk-iscsi' case into 'disk-cache'
qemuxml2argvtest: Modernize 'disk-network-rbd-no-colon' case
qemuxml2argvtest: Modernize outstanding disk-backend related tests
qemuxml2argvtest: Modernize 'disk-floppy-pseries' case
qemuxml2argvtest: Modernize s390x disk tests
tests: qemu: Remove 'virtio-ccw' machine type from fake capabilities
qemuxml2argvtest: Use versioned ("4.1.0") capabilities for pre
'-audiodev' cases
qemuxml2argvtest: Pin old-style '-no-reboot' usage to qemu-5.2
qemuxml2argvtest: remove 'fs9p' cases with fake capabilities.
.../qemuhotplug-base-ccw-live+ccw-virtio.xml | 2 +-
...ith-2-ccw-virtio+ccw-virtio-1-explicit.xml | 2 +-
[...]
.../hostdev-scsi-vhost-scsi-ccw.xml | 2 +-
.../iothreads-disk-virtio-ccw.xml | 2 +-
tests/testutilsqemu.c | 8 +-
181 files changed, 1726 insertions(+), 2164 deletions(-)
rename tests/qemuxml2argvdata/{audio-alsa-best.args =>
audio-alsa-best.x86_64-4.1.0.args} (81%)
rename tests/qemuxml2argvdata/{audio-alsa-full.err =>
audio-alsa-full.x86_64-4.1.0.err} (100%)
[...]
With the machine type fixed in two commit messages:
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
1157
days inactive
1157
days old
23 comments
2 participants
participants (2)
-
Ján Tomko -
Peter Krempa