[libvirt] [PATCH v2 00/32] qemu: add support for 'device_id' of SCSI disks (blockdev-add saga)
Now that qemu has commited the patches this contains real caps data and also fixes few merge conflicts with patches pushed upstream. Peter Krempa (32): tests: qemucaps: Make fake 'microcodeVersion' depend on filename instead of length qemu: capabilities: Probe caps for 'scsi-hd' instead of 'scsi-disk' qemu: capabilities: Probe caps for 'ide-hd' instead of 'ide-drive' tests: qemuxml: Add a common test file for the 'virtio-scsi' controller tests: qemu: Remove 'disk-scsi-virtio-scsi' test tests: qemuxml: Merge 'num-queues' variant of 'virtio-scsi' test into the common file tests: qemuxml: Merge 'cmd_per_lun' variant of 'virtio-scsi' test into the common file tests: qemuxml: Merge 'max_sectors' variant of 'virtio-scsi' test into the common file tests: qemuxml: Merge 'ioeventfd' variant of 'virtio-scsi' test into the common file tests: qemuxml2argv: Use real caps when auto-generating SCSI controller type tests: qemuxml2argv: Remove testing of post startup change to 'cachemode' for shared disks tests: qemuxml2argv: Remove the 'after startup XML' testing machinery tests: qemuxml2argv: Move cases from 'disk-shared-locking' into 'disk-shared' tests: qemu: Rename 'disk-scsi-device' to 'disk-scsi' tests: qemuxml2argv: Modernize 'disk-scsi' test tests: qemu: Merge 'disk-scsi-megasas' test into 'disk-scsi' tests: qemu: Merge 'disk-scsi-mptsas1068' test into 'disk-scsi' tests: qemu: Merge 'disk-scsi-mptsas1068' test into 'disk-scsi' tests: qemuxml2argv: Use 1.5.3 version for very old state in 'disk-cache' tests: qemuxml2argv: Modernize virtio-scsi iothread tests tests: qemuxml2argv: Remove 'disk-virtio-scsi-ccw' test qemu: caps: Always assume presence of 'scsi-hd' and 'scsi-cd' device qemu: caps: Always assume presence of 'ide-hd' and 'ide-cd' devices qemu: command: Use correct type for switch in qemuBuildDiskDeviceStr tests: qemuxml2argv: Add CDROM disks for all untested buses qemu: Forbid cdroms on virtio bus qemu: command: Drop formatting of 'media=cdrom' from -drive tests: qemuxml2argv: Add a 'serial' value for a SCSI disk test: qemucaps: Update caps with scsi 'device_id' property qemu: caps: Introduce capability for 'device_id' property of 'scsi-disk' qemu: Use the 'device_id' property of SCSI disks to avoid regressing qemu: caps: Add lockout for -blockdev if QEMU_CAPS_SCSI_DISK_DEVICE_ID is not present src/qemu/qemu_capabilities.c | 13 +- src/qemu/qemu_capabilities.h | 5 +- src/qemu/qemu_command.c | 78 +- src/qemu/qemu_domain.c | 8 + tests/Makefile.am | 1 - .../caps_1.5.3.x86_64.replies | 4 +- .../caps_1.5.3.x86_64.xml | 4 +- .../caps_1.6.0.x86_64.replies | 4 +- .../caps_1.6.0.x86_64.xml | 4 +- .../caps_1.7.0.x86_64.replies | 4 +- .../caps_1.7.0.x86_64.xml | 4 +- .../caps_2.1.1.x86_64.replies | 4 +- .../caps_2.1.1.x86_64.xml | 4 +- .../caps_2.10.0.aarch64.replies | 4 +- .../caps_2.10.0.aarch64.xml | 4 +- .../caps_2.10.0.ppc64.replies | 4 +- .../caps_2.10.0.ppc64.xml | 4 +- .../caps_2.10.0.s390x.replies | 4 +- .../caps_2.10.0.s390x.xml | 3 +- .../caps_2.10.0.x86_64.replies | 4 +- .../caps_2.10.0.x86_64.xml | 4 +- .../caps_2.11.0.s390x.replies | 4 +- .../caps_2.11.0.s390x.xml | 3 +- .../caps_2.11.0.x86_64.replies | 4 +- .../caps_2.11.0.x86_64.xml | 4 +- .../caps_2.12.0.aarch64.replies | 4 +- .../caps_2.12.0.aarch64.xml | 4 +- .../caps_2.12.0.ppc64.replies | 4 +- .../caps_2.12.0.ppc64.xml | 4 +- .../caps_2.12.0.s390x.replies | 4 +- .../caps_2.12.0.s390x.xml | 3 +- .../caps_2.12.0.x86_64.replies | 4 +- .../caps_2.12.0.x86_64.xml | 4 +- .../caps_2.4.0.x86_64.replies | 4 +- .../caps_2.4.0.x86_64.xml | 4 +- .../caps_2.5.0.x86_64.replies | 4 +- .../caps_2.5.0.x86_64.xml | 4 +- .../caps_2.6.0.aarch64.replies | 4 +- .../caps_2.6.0.aarch64.xml | 4 +- .../caps_2.6.0.ppc64.replies | 4 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 4 +- .../caps_2.6.0.x86_64.replies | 4 +- .../caps_2.6.0.x86_64.xml | 4 +- .../caps_2.7.0.s390x.replies | 4 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 3 +- .../caps_2.7.0.x86_64.replies | 4 +- .../caps_2.7.0.x86_64.xml | 4 +- .../caps_2.8.0.s390x.replies | 4 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 3 +- .../caps_2.8.0.x86_64.replies | 4 +- .../caps_2.8.0.x86_64.xml | 4 +- .../caps_2.9.0.ppc64.replies | 4 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 4 +- .../caps_2.9.0.s390x.replies | 4 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 3 +- .../caps_2.9.0.x86_64.replies | 4 +- .../caps_2.9.0.x86_64.xml | 4 +- .../caps_3.0.0.ppc64.replies | 4 +- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 4 +- .../caps_3.0.0.riscv32.replies | 4 +- .../caps_3.0.0.riscv32.xml | 1 - .../caps_3.0.0.riscv64.replies | 4 +- .../caps_3.0.0.riscv64.xml | 1 - .../caps_3.0.0.s390x.replies | 4 +- .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 3 +- .../caps_3.0.0.x86_64.replies | 4 +- .../caps_3.0.0.x86_64.xml | 4 +- .../caps_3.1.0.ppc64.replies | 4 +- .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 4 +- .../caps_3.1.0.x86_64.replies | 4 +- .../caps_3.1.0.x86_64.xml | 4 +- .../caps_4.0.0.riscv32.replies | 4 +- .../caps_4.0.0.riscv32.xml | 2 - .../caps_4.0.0.riscv64.replies | 4 +- .../caps_4.0.0.riscv64.xml | 2 - .../caps_4.0.0.x86_64.replies | 2300 +++++++++-------- .../caps_4.0.0.x86_64.xml | 34 +- tests/qemucapabilitiestest.c | 17 +- .../aarch64-virtio-pci-manual-addresses.args | 4 +- tests/qemuxml2argvdata/autoindex.args | 2 +- .../qemuxml2argvdata/balloon-device-auto.args | 3 +- .../balloon-device-deflate-off.args | 3 +- .../balloon-device-deflate.args | 3 +- .../balloon-device-period.args | 3 +- tests/qemuxml2argvdata/balloon-device.args | 3 +- tests/qemuxml2argvdata/bios-nvram-secure.args | 4 +- tests/qemuxml2argvdata/bios-nvram.args | 3 +- tests/qemuxml2argvdata/bios.args | 3 +- .../blkdeviotune-group-num.args | 5 +- .../blkdeviotune-max-length.args | 5 +- tests/qemuxml2argvdata/blkdeviotune-max.args | 5 +- tests/qemuxml2argvdata/blkiotune-device.args | 3 +- tests/qemuxml2argvdata/blkiotune.args | 3 +- tests/qemuxml2argvdata/boot-cdrom.args | 6 +- tests/qemuxml2argvdata/boot-complex.args | 10 +- tests/qemuxml2argvdata/boot-floppy.args | 2 +- .../boot-menu-disable-drive.args | 6 +- tests/qemuxml2argvdata/boot-menu-disable.args | 6 +- .../boot-menu-enable-with-timeout.args | 6 +- tests/qemuxml2argvdata/boot-menu-enable.args | 6 +- tests/qemuxml2argvdata/boot-multi.args | 6 +- tests/qemuxml2argvdata/boot-network.args | 2 +- tests/qemuxml2argvdata/boot-order.args | 8 +- tests/qemuxml2argvdata/boot-strict.args | 10 +- tests/qemuxml2argvdata/channel-guestfwd.args | 3 +- tests/qemuxml2argvdata/channel-spicevmc.args | 3 +- .../qemuxml2argvdata/channel-virtio-auto.args | 3 +- .../channel-virtio-autoadd.args | 3 +- .../channel-virtio-autoassign.args | 3 +- .../channel-virtio-default.args | 3 +- .../channel-virtio-state.args | 3 +- .../qemuxml2argvdata/channel-virtio-unix.args | 3 +- tests/qemuxml2argvdata/channel-virtio.args | 3 +- tests/qemuxml2argvdata/clock-catchup.args | 3 +- tests/qemuxml2argvdata/clock-france.args | 3 +- tests/qemuxml2argvdata/clock-hpet-off.args | 3 +- .../clock-localtime-basis-localtime.args | 3 +- tests/qemuxml2argvdata/clock-localtime.args | 3 +- tests/qemuxml2argvdata/clock-utc.args | 3 +- tests/qemuxml2argvdata/clock-variable.args | 3 +- .../qemuxml2argvdata/console-compat-auto.args | 3 +- .../console-compat-chardev.args | 3 +- tests/qemuxml2argvdata/console-compat.args | 3 +- .../qemuxml2argvdata/console-virtio-many.args | 3 +- tests/qemuxml2argvdata/console-virtio.args | 3 +- tests/qemuxml2argvdata/controller-order.args | 4 +- .../controller-virtio-scsi.x86_64-latest.args | 50 + .../controller-virtio-scsi.xml | 61 + .../cpu-host-passthrough-features.args | 3 +- .../qemuxml2argvdata/cputune-zero-shares.args | 3 +- tests/qemuxml2argvdata/cputune.args | 3 +- tests/qemuxml2argvdata/debug-threads.args | 3 +- tests/qemuxml2argvdata/disk-aio.args | 7 +- tests/qemuxml2argvdata/disk-boot-cdrom.args | 7 +- tests/qemuxml2argvdata/disk-boot-disk.args | 7 +- ...ache.args => disk-cache.x86_64-1.5.3.args} | 16 +- .../disk-cache.x86_64-latest.args | 4 +- .../disk-cdrom-bus-other.x86_64-latest.args | 37 + .../qemuxml2argvdata/disk-cdrom-bus-other.xml | 47 + .../qemuxml2argvdata/disk-cdrom-network.args | 17 +- tests/qemuxml2argvdata/disk-cdrom-tray.args | 9 +- tests/qemuxml2argvdata/disk-cdrom.args | 16 +- tests/qemuxml2argvdata/disk-copy_on_read.args | 5 +- .../qemuxml2argvdata/disk-detect-zeroes.args | 5 +- tests/qemuxml2argvdata/disk-discard.args | 5 +- tests/qemuxml2argvdata/disk-error-policy.args | 7 +- tests/qemuxml2argvdata/disk-floppy-tray.args | 3 +- tests/qemuxml2argvdata/disk-floppy.args | 3 +- tests/qemuxml2argvdata/disk-fmt-qcow.args | 7 +- tests/qemuxml2argvdata/disk-geometry.args | 4 +- tests/qemuxml2argvdata/disk-ioeventfd.args | 5 +- tests/qemuxml2argvdata/disk-iscsi.args | 3 +- .../disk-network-sheepdog.args | 3 +- tests/qemuxml2argvdata/disk-no-boot.args | 8 +- tests/qemuxml2argvdata/disk-order.args | 7 +- .../qemuxml2argvdata/disk-readonly-disk.args | 8 +- tests/qemuxml2argvdata/disk-sata-device.args | 2 +- ...> disk-scsi-device-auto.x86_64-1.5.3.args} | 11 +- .../disk-scsi-device-auto.x86_64-latest.args | 36 + tests/qemuxml2argvdata/disk-scsi-device.args | 30 - .../disk-scsi-disk-vpd-build-error.xml | 2 +- tests/qemuxml2argvdata/disk-scsi-megasas.args | 31 - tests/qemuxml2argvdata/disk-scsi-megasas.xml | 35 - .../disk-scsi-mptsas1068.args | 31 - .../qemuxml2argvdata/disk-scsi-mptsas1068.xml | 36 - .../disk-scsi-virtio-scsi.args | 31 - .../disk-scsi-virtio-scsi.xml | 35 - tests/qemuxml2argvdata/disk-scsi-vscsi.args | 31 - tests/qemuxml2argvdata/disk-scsi-vscsi.xml | 35 - .../disk-scsi.x86_64-latest.args | 49 + .../{disk-scsi-device.xml => disk-scsi.xml} | 20 + tests/qemuxml2argvdata/disk-serial.args | 6 +- .../qemuxml2argvdata/disk-shared-locking.args | 34 - .../qemuxml2argvdata/disk-shared-locking.xml | 42 - tests/qemuxml2argvdata/disk-shared.args | 31 - .../disk-shared.x86_64-2.12.0.args | 9 +- .../disk-shared.x86_64-latest.args | 10 +- tests/qemuxml2argvdata/disk-shared.xml | 14 + tests/qemuxml2argvdata/disk-snapshot.args | 9 +- .../disk-source-pool-mode.args | 15 +- tests/qemuxml2argvdata/disk-source-pool.args | 11 +- .../disk-usb-device-removable.args | 3 +- tests/qemuxml2argvdata/disk-usb-device.args | 3 +- .../disk-virtio-scsi-ccw.args | 29 - .../qemuxml2argvdata/disk-virtio-scsi-ccw.xml | 31 - .../disk-virtio-scsi-cmd_per_lun.args | 28 - .../disk-virtio-scsi-cmd_per_lun.xml | 31 - .../disk-virtio-scsi-ioeventfd.args | 28 - .../disk-virtio-scsi-ioeventfd.xml | 31 - .../disk-virtio-scsi-max_sectors.args | 28 - .../disk-virtio-scsi-max_sectors.xml | 31 - .../disk-virtio-scsi-num_queues.args | 28 - .../disk-virtio-scsi-num_queues.xml | 31 - tests/qemuxml2argvdata/disk-virtio.args | 7 +- tests/qemuxml2argvdata/event_idx.args | 5 +- tests/qemuxml2argvdata/fips-enabled.args | 3 +- tests/qemuxml2argvdata/fs9p.args | 3 +- .../graphics-egl-headless.args | 3 +- .../graphics-sdl-fullscreen.args | 3 +- tests/qemuxml2argvdata/graphics-sdl.args | 3 +- .../graphics-spice-agent-file-xfer.args | 3 +- .../graphics-spice-agentmouse.args | 3 +- .../graphics-spice-compression.args | 3 +- .../graphics-spice-egl-headless.args | 3 +- .../graphics-spice-qxl-vga.args | 3 +- .../qemuxml2argvdata/graphics-spice-sasl.args | 3 +- .../graphics-spice-timeout.args | 5 +- tests/qemuxml2argvdata/graphics-spice.args | 3 +- .../graphics-vnc-auto-socket-cfg.args | 3 +- .../graphics-vnc-egl-headless.args | 3 +- .../graphics-vnc-no-listen-attr.args | 3 +- .../qemuxml2argvdata/graphics-vnc-policy.args | 3 +- .../graphics-vnc-remove-generated-socket.args | 3 +- tests/qemuxml2argvdata/graphics-vnc-sasl.args | 3 +- tests/qemuxml2argvdata/graphics-vnc.args | 3 +- .../hostdev-pci-address-device.args | 3 +- .../qemuxml2argvdata/hostdev-pci-address.args | 3 +- .../hostdev-scsi-lsi-iscsi-auth.args | 3 +- .../hostdev-scsi-lsi-iscsi.args | 3 +- tests/qemuxml2argvdata/hostdev-scsi-lsi.args | 3 +- .../hostdev-scsi-readonly.args | 3 +- .../hostdev-scsi-vhost-scsi-pci.args | 3 +- .../hostdev-scsi-virtio-iscsi-auth.args | 3 +- .../hostdev-scsi-virtio-iscsi.args | 3 +- .../hostdev-scsi-virtio-scsi.args | 3 +- .../hostdev-usb-address-device-boot.args | 2 +- .../hostdev-usb-address-device.args | 3 +- .../qemuxml2argvdata/hostdev-usb-address.args | 3 +- .../hostdev-vfio-multidomain.args | 3 +- tests/qemuxml2argvdata/hostdev-vfio.args | 3 +- .../qemuxml2argvdata/hugepages-memaccess.args | 3 +- .../hugepages-memaccess2.args | 3 +- tests/qemuxml2argvdata/hugepages-shared.args | 3 +- .../qemuxml2argvdata/input-usbmouse-addr.args | 3 +- tests/qemuxml2argvdata/input-usbmouse.args | 3 +- tests/qemuxml2argvdata/input-usbtablet.args | 3 +- tests/qemuxml2argvdata/iothreads-disk.args | 3 +- .../iothreads-ids-partial.args | 3 +- tests/qemuxml2argvdata/iothreads-ids.args | 3 +- ...threads-virtio-scsi-ccw.s390x-latest.args} | 20 +- ...hreads-virtio-scsi-pci.x86_64-latest.args} | 23 +- tests/qemuxml2argvdata/iothreads.args | 3 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 3 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 3 +- tests/qemuxml2argvdata/machine-aliases1.args | 3 +- tests/qemuxml2argvdata/machine-aliases2.args | 3 +- tests/qemuxml2argvdata/machine-core-off.args | 3 +- tests/qemuxml2argvdata/machine-core-on.args | 3 +- tests/qemuxml2argvdata/machine-smm-opt.args | 4 +- .../qemuxml2argvdata/machine-vmport-opt.args | 3 +- tests/qemuxml2argvdata/master-key.args | 3 +- .../memory-hotplug-dimm-addr.args | 3 +- .../qemuxml2argvdata/memory-hotplug-dimm.args | 3 +- tests/qemuxml2argvdata/memory-hotplug.args | 3 +- tests/qemuxml2argvdata/memtune-unlimited.args | 3 +- tests/qemuxml2argvdata/memtune.args | 3 +- tests/qemuxml2argvdata/migrate.args | 3 +- .../minimal-msg-timestamp.args | 3 +- tests/qemuxml2argvdata/minimal-sandbox.args | 3 +- tests/qemuxml2argvdata/minimal.args | 3 +- tests/qemuxml2argvdata/misc-acpi.args | 3 +- tests/qemuxml2argvdata/misc-disable-s3.args | 3 +- .../misc-disable-suspends.args | 3 +- tests/qemuxml2argvdata/misc-enable-s4.args | 3 +- tests/qemuxml2argvdata/misc-no-reboot.args | 3 +- tests/qemuxml2argvdata/misc-uuid.args | 3 +- tests/qemuxml2argvdata/monitor-json.args | 3 +- .../multifunction-pci-device.args | 2 +- tests/qemuxml2argvdata/name-escape.args | 3 +- tests/qemuxml2argvdata/net-client.args | 3 +- tests/qemuxml2argvdata/net-eth-hostip.args | 3 +- tests/qemuxml2argvdata/net-eth-ifname.args | 3 +- tests/qemuxml2argvdata/net-eth-names.args | 3 +- tests/qemuxml2argvdata/net-eth.args | 3 +- .../net-hostdev-bootorder.args | 3 +- .../net-hostdev-multidomain.args | 3 +- .../net-hostdev-vfio-multidomain.args | 3 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 3 +- tests/qemuxml2argvdata/net-hostdev.args | 3 +- tests/qemuxml2argvdata/net-mcast.args | 3 +- tests/qemuxml2argvdata/net-server.args | 3 +- tests/qemuxml2argvdata/net-udp.args | 3 +- tests/qemuxml2argvdata/net-user-addr.args | 3 +- tests/qemuxml2argvdata/net-user.args | 3 +- .../net-vhostuser-multiq.args | 3 +- tests/qemuxml2argvdata/net-virtio-device.args | 3 +- .../net-virtio-disable-offloads.args | 3 +- tests/qemuxml2argvdata/net-virtio-netdev.args | 3 +- .../net-virtio-rxtxqueuesize.args | 3 +- tests/qemuxml2argvdata/net-virtio.args | 3 +- tests/qemuxml2argvdata/nosharepages.args | 3 +- .../numad-auto-memory-vcpu-cpuset.args | 3 +- ...o-memory-vcpu-no-cpuset-and-placement.args | 3 +- .../numad-auto-vcpu-static-numatune.args | 3 +- .../numad-static-memory-auto-vcpu.args | 3 +- tests/qemuxml2argvdata/numad.args | 3 +- .../numatune-auto-nodeset-invalid.args | 3 +- tests/qemuxml2argvdata/numatune-memory.args | 3 +- tests/qemuxml2argvdata/panic-no-address.args | 3 +- tests/qemuxml2argvdata/panic.args | 3 +- .../parallel-parport-chardev.args | 3 +- .../parallel-tcp-chardev.args | 3 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 4 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 4 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 4 +- tests/qemuxml2argvdata/pci-autofill-addr.xml | 2 +- tests/qemuxml2argvdata/pci-bridge.args | 4 +- tests/qemuxml2argvdata/pci-many.args | 4 +- tests/qemuxml2argvdata/pci-rom.args | 3 +- .../pci-serial-dev-chardev.args | 3 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 2 +- tests/qemuxml2argvdata/pcie-root-port.args | 2 +- .../pcie-switch-downstream-port.args | 2 +- .../pcie-switch-upstream-port.args | 2 +- tests/qemuxml2argvdata/pcihole64-q35.args | 2 +- .../pseries-vio-user-assigned.args | 4 +- tests/qemuxml2argvdata/pseries-vio.args | 4 +- tests/qemuxml2argvdata/q35-usb2-multi.args | 2 +- tests/qemuxml2argvdata/q35-usb2-reorder.args | 2 +- tests/qemuxml2argvdata/q35-usb2.args | 2 +- tests/qemuxml2argvdata/q35.args | 2 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 3 +- .../qemu-ns-commandline-ns0.args | 3 +- .../qemu-ns-commandline-ns1.args | 3 +- .../qemuxml2argvdata/qemu-ns-commandline.args | 3 +- .../qemu-ns-domain-commandline-ns0.args | 3 +- .../qemu-ns-domain-commandline.args | 3 +- .../qemuxml2argvdata/qemu-ns-domain-ns0.args | 3 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 3 +- tests/qemuxml2argvdata/qemu-ns.args | 3 +- tests/qemuxml2argvdata/restore-v2-fd.args | 3 +- tests/qemuxml2argvdata/restore-v2.args | 3 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 3 +- .../seclabel-dynamic-baselabel.args | 3 +- .../seclabel-dynamic-labelskip.args | 3 +- .../seclabel-dynamic-override.args | 5 +- .../seclabel-dynamic-relabel.args | 3 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 3 +- tests/qemuxml2argvdata/seclabel-none.args | 3 +- .../seclabel-static-labelskip.args | 3 +- .../seclabel-static-relabel.args | 3 +- tests/qemuxml2argvdata/seclabel-static.args | 3 +- .../serial-dev-chardev-iobase.args | 3 +- .../qemuxml2argvdata/serial-dev-chardev.args | 3 +- .../qemuxml2argvdata/serial-file-chardev.args | 3 +- tests/qemuxml2argvdata/serial-file-log.args | 3 +- .../qemuxml2argvdata/serial-many-chardev.args | 3 +- .../qemuxml2argvdata/serial-pty-chardev.args | 3 +- .../serial-spiceport-nospice.args | 3 +- tests/qemuxml2argvdata/serial-spiceport.args | 3 +- .../qemuxml2argvdata/serial-tcp-chardev.args | 3 +- .../serial-tcp-telnet-chardev.args | 3 +- .../serial-tcp-tlsx509-chardev-notls.args | 3 +- .../serial-tcp-tlsx509-chardev-verify.args | 3 +- .../serial-tcp-tlsx509-chardev.args | 3 +- .../serial-tcp-tlsx509-secret-chardev.args | 3 +- .../qemuxml2argvdata/serial-udp-chardev.args | 3 +- tests/qemuxml2argvdata/serial-vc-chardev.args | 3 +- tests/qemuxml2argvdata/smbios.args | 3 +- tests/qemuxml2argvdata/smp.args | 3 +- tests/qemuxml2argvdata/sound-device.args | 3 +- tests/qemuxml2argvdata/sound.args | 3 +- tests/qemuxml2argvdata/user-aliases.args | 4 +- .../video-device-pciaddr-default.args | 3 +- tests/qemuxml2argvdata/video-none-device.args | 3 +- .../video-qxl-device-vgamem.args | 3 +- tests/qemuxml2argvdata/video-qxl-device.args | 3 +- tests/qemuxml2argvdata/video-qxl-heads.args | 3 +- .../qemuxml2argvdata/video-qxl-nodevice.args | 3 +- tests/qemuxml2argvdata/video-qxl-noheads.args | 3 +- .../video-qxl-sec-device-vgamem.args | 3 +- .../video-qxl-sec-device.args | 3 +- .../video-vga-device-vgamem.args | 3 +- tests/qemuxml2argvdata/video-vga-device.args | 3 +- .../qemuxml2argvdata/video-vga-nodevice.args | 3 +- .../qemuxml2argvdata/video-vga-qxl-heads.args | 3 +- .../video-virtio-gpu-device.args | 3 +- .../video-virtio-gpu-sdl-gl.args | 3 +- .../video-virtio-gpu-spice-gl.args | 3 +- .../video-virtio-gpu-virgl.args | 3 +- tests/qemuxml2argvdata/video-virtio-vga.args | 3 +- tests/qemuxml2argvdata/vmcoreinfo.args | 3 +- tests/qemuxml2argvdata/watchdog-device.args | 3 +- tests/qemuxml2argvdata/watchdog-dump.args | 3 +- .../qemuxml2argvdata/watchdog-injectnmi.args | 3 +- tests/qemuxml2argvdata/watchdog.args | 3 +- tests/qemuxml2argvtest.c | 115 +- .../qemuxml2startupxmloutdata/disk-shared.xml | 56 - .../controller-virtio-scsi.xml | 76 + ...rtio-scsi.xml => disk-cdrom-bus-other.xml} | 44 +- .../qemuxml2xmloutdata/disk-scsi-megasas.xml | 45 - .../disk-scsi-mptsas1068.xml | 46 - tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml | 45 - .../{disk-scsi-device.xml => disk-scsi.xml} | 31 +- .../disk-virtio-scsi-cmd_per_lun.xml | 37 - .../disk-virtio-scsi-ioeventfd.xml | 37 - .../disk-virtio-scsi-max_sectors.xml | 37 - .../disk-virtio-scsi-num_queues.xml | 37 - .../qemuxml2xmloutdata/pci-autofill-addr.xml | 2 +- tests/qemuxml2xmltest.c | 28 +- 400 files changed, 2312 insertions(+), 3114 deletions(-) create mode 100644 tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/controller-virtio-scsi.xml rename tests/qemuxml2argvdata/{disk-cache.args => disk-cache.x86_64-1.5.3.args} (72%) create mode 100644 tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom-bus-other.xml rename tests/qemuxml2argvdata/{disk-scsi-device-auto.args => disk-scsi-device-auto.x86_64-1.5.3.args} (69%) create mode 100644 tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-device.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-megasas.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-megasas.xml delete mode 100644 tests/qemuxml2argvdata/disk-scsi-mptsas1068.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-mptsas1068.xml delete mode 100644 tests/qemuxml2argvdata/disk-scsi-virtio-scsi.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-virtio-scsi.xml delete mode 100644 tests/qemuxml2argvdata/disk-scsi-vscsi.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-vscsi.xml create mode 100644 tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-scsi-device.xml => disk-scsi.xml} (58%) delete mode 100644 tests/qemuxml2argvdata/disk-shared-locking.args delete mode 100644 tests/qemuxml2argvdata/disk-shared-locking.xml delete mode 100644 tests/qemuxml2argvdata/disk-shared.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ccw.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ccw.xml delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.xml delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ioeventfd.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ioeventfd.xml delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.xml delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-num_queues.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-num_queues.xml rename tests/qemuxml2argvdata/{iothreads-virtio-scsi-ccw.args => iothreads-virtio-scsi-ccw.s390x-latest.args} (58%) rename tests/qemuxml2argvdata/{iothreads-virtio-scsi-pci.args => iothreads-virtio-scsi-pci.x86_64-latest.args} (56%) delete mode 100644 tests/qemuxml2startupxmloutdata/disk-shared.xml create mode 100644 tests/qemuxml2xmloutdata/controller-virtio-scsi.xml rename tests/qemuxml2xmloutdata/{disk-scsi-virtio-scsi.xml => disk-cdrom-bus-other.xml} (54%) delete mode 100644 tests/qemuxml2xmloutdata/disk-scsi-megasas.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml rename tests/qemuxml2xmloutdata/{disk-scsi-device.xml => disk-scsi.xml} (57%) delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml -- 2.20.1
To avoid changes to the filled in microcode in case we change the caps replies file for any reason make the number depend on the filename. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 2 +- .../caps_2.10.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 2 +- .../caps_2.12.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 2 +- tests/qemucapabilitiestest.c | 17 +++++++++++++---- 33 files changed, 45 insertions(+), 36 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index fc0bc6e10c..3c9a474b5b 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -98,7 +98,7 @@ <flag name='mch'/> <version>1005003</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>48498</microcodeVersion> + <microcodeVersion>43100763</microcodeVersion> <package></package> <arch>x86_64</arch> <cpu type='kvm' name='Opteron_G5'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index c939cec5e8..528af43a6d 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -103,7 +103,7 @@ <flag name='mch'/> <version>1006000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>46667</microcodeVersion> + <microcodeVersion>43100761</microcodeVersion> <package></package> <arch>x86_64</arch> <cpu type='kvm' name='Opteron_G5'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 509d6ca098..ddc06959ca 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -105,7 +105,7 @@ <flag name='mch'/> <version>1007000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>52111</microcodeVersion> + <microcodeVersion>43100762</microcodeVersion> <package></package> <arch>x86_64</arch> <cpu type='kvm' name='Opteron_G5'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 426c4654fb..7c65353ba5 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -121,7 +121,7 @@ <flag name='mch'/> <version>2001001</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>60857</microcodeVersion> + <microcodeVersion>43100758</microcodeVersion> <package></package> <arch>x86_64</arch> <cpu type='kvm' name='Opteron_G5'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 7061ba8f7e..9f6676a2b8 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -154,7 +154,7 @@ <flag name='iothread.poll-max-ns'/> <version>2010000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>305067</microcodeVersion> + <microcodeVersion>61700805</microcodeVersion> <package> (v2.10.0)</package> <arch>aarch64</arch> <cpu type='kvm' name='pxa262'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 2a48b63efe..d4cc446d0b 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -153,7 +153,7 @@ <flag name='iothread.poll-max-ns'/> <version>2010000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>384412</microcodeVersion> + <microcodeVersion>42900805</microcodeVersion> <package> (v2.10.0)</package> <arch>ppc64</arch> <cpu type='kvm' name='default'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 180a688ba2..9c88b919a4 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -117,7 +117,7 @@ <flag name='iothread.poll-max-ns'/> <version>2010000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>306247</microcodeVersion> + <microcodeVersion>39100805</microcodeVersion> <package></package> <arch>s390x</arch> <hostCPU type='kvm' model='z14-base' migratability='no'> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 8ced5f301d..2941743f94 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -195,7 +195,7 @@ <flag name='iothread.poll-max-ns'/> <version>2010000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>364616</microcodeVersion> + <microcodeVersion>43100805</microcodeVersion> <package> (v2.10.0)</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 7dc643d9a3..60d902f1ac 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -124,7 +124,7 @@ <flag name='iothread.poll-max-ns'/> <version>2011000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>345099</microcodeVersion> + <microcodeVersion>39100806</microcodeVersion> <package></package> <arch>s390x</arch> <hostCPU type='kvm' model='z14-base' migratability='no'> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 0a9eeecb76..e1584f99d4 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -201,7 +201,7 @@ <flag name='iothread.poll-max-ns'/> <version>2011000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>369105</microcodeVersion> + <microcodeVersion>43100806</microcodeVersion> <package> (v2.11.0)</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 186a6ccfeb..f58979716d 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -168,7 +168,7 @@ <flag name='memory-backend-file.align'/> <version>2011090</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>345725</microcodeVersion> + <microcodeVersion>61700807</microcodeVersion> <package>v2.12.0-rc0</package> <arch>aarch64</arch> <cpu type='kvm' name='pxa262'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index c47ebd77ad..e58df048c4 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -166,7 +166,7 @@ <flag name='memory-backend-file.align'/> <version>2011090</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>426509</microcodeVersion> + <microcodeVersion>42900807</microcodeVersion> <package>v2.12.0-rc0</package> <arch>ppc64</arch> <cpu type='kvm' name='default'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 49249f5adf..60385cc505 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -135,7 +135,7 @@ <flag name='memory-backend-file.align'/> <version>2012000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>375102</microcodeVersion> + <microcodeVersion>39100807</microcodeVersion> <package></package> <arch>s390x</arch> <hostCPU type='kvm' model='z14-base' migratability='no'> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index b35206efea..3d12aba2e8 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -209,7 +209,7 @@ <flag name='memory-backend-file.align'/> <version>2011090</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>414601</microcodeVersion> + <microcodeVersion>43100807</microcodeVersion> <package>v2.12.0-rc0</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 10133a1e7e..c95f34559b 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -147,7 +147,7 @@ <flag name='mch'/> <version>2004000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>77219</microcodeVersion> + <microcodeVersion>43100760</microcodeVersion> <package></package> <arch>x86_64</arch> <cpu type='kvm' name='Opteron_G5'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 9be7d8924b..240abd299c 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -153,7 +153,7 @@ <flag name='mch'/> <version>2005000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>218187</microcodeVersion> + <microcodeVersion>43100761</microcodeVersion> <package></package> <arch>x86_64</arch> <cpu type='kvm' name='Opteron_G5'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 381d050115..801a2e62ad 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -137,7 +137,7 @@ <flag name='hda-output'/> <version>2006000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>229858</microcodeVersion> + <microcodeVersion>61700762</microcodeVersion> <package></package> <arch>aarch64</arch> <cpu type='kvm' name='pxa262'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index f81c73dd03..949f9305c3 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -132,7 +132,7 @@ <flag name='hda-output'/> <version>2006000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>264684</microcodeVersion> + <microcodeVersion>42900762</microcodeVersion> <package></package> <arch>ppc64</arch> <cpu type='kvm' name='default'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index b711da555f..f5bca878be 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -165,7 +165,7 @@ <flag name='mch'/> <version>2006000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>229221</microcodeVersion> + <microcodeVersion>43100762</microcodeVersion> <package></package> <arch>x86_64</arch> <cpu type='kvm' name='Opteron_G5'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index de87692857..a667aa7673 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -103,7 +103,7 @@ <flag name='zpci'/> <version>2007000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>219140</microcodeVersion> + <microcodeVersion>39100763</microcodeVersion> <package></package> <arch>s390x</arch> <cpu type='kvm' name='host'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 443de40de7..5d8ba4ee68 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -170,7 +170,7 @@ <flag name='mch'/> <version>2007000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>240727</microcodeVersion> + <microcodeVersion>43100763</microcodeVersion> <package> (v2.7.0)</package> <arch>x86_64</arch> <cpu type='kvm' name='Opteron_G5'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index f3a32ad376..00c3ff5133 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -106,7 +106,7 @@ <flag name='zpci'/> <version>2007093</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>244554</microcodeVersion> + <microcodeVersion>39100764</microcodeVersion> <package></package> <arch>s390x</arch> <hostCPU type='kvm' model='zEC12.2-base' migratability='no'> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 174678ffec..5a6e26cba1 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -173,7 +173,7 @@ <flag name='mch'/> <version>2008000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>257382</microcodeVersion> + <microcodeVersion>43100764</microcodeVersion> <package> (v2.8.0)</package> <arch>x86_64</arch> <cpu type='kvm' name='host' usable='yes'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index d9ca8f3d2b..87f24e2e41 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -145,7 +145,7 @@ <flag name='iothread.poll-max-ns'/> <version>2009000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>349056</microcodeVersion> + <microcodeVersion>42900765</microcodeVersion> <package> (v2.9.0)</package> <arch>ppc64</arch> <cpu type='kvm' name='default'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index 4bb61f09f0..e197848e4e 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -111,7 +111,7 @@ <flag name='iothread.poll-max-ns'/> <version>2009000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>267973</microcodeVersion> + <microcodeVersion>39100765</microcodeVersion> <package></package> <arch>s390x</arch> <hostCPU type='kvm' model='z13.2-base' migratability='no'> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 7f9e88fbee..871018364f 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -189,7 +189,7 @@ <flag name='iothread.poll-max-ns'/> <version>2009000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>340605</microcodeVersion> + <microcodeVersion>43100765</microcodeVersion> <package> (v2.9.0)</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 24a3c2b716..971c0665be 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -166,7 +166,7 @@ <flag name='memory-backend-file.align'/> <version>2012050</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>444946</microcodeVersion> + <microcodeVersion>42900757</microcodeVersion> <package>v2.12.0-1689-g518d23a</package> <arch>ppc64</arch> <cpu type='kvm' name='default'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index 8569de6538..bf889145a0 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -137,7 +137,7 @@ <flag name='memory-backend-file.align'/> <version>3000000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>388416</microcodeVersion> + <microcodeVersion>39100757</microcodeVersion> <package></package> <arch>s390x</arch> <hostCPU type='kvm' model='z14-base' migratability='no'> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 77d1f2770d..b787bd9acd 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -212,7 +212,7 @@ <flag name='nvdimm.unarmed'/> <version>3000000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>426554</microcodeVersion> + <microcodeVersion>43100757</microcodeVersion> <package>v3.0.0</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index 175233aa09..d55eb5d981 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -170,7 +170,7 @@ <flag name='memory-backend-file.pmem'/> <version>3000091</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>437731</microcodeVersion> + <microcodeVersion>42900758</microcodeVersion> <package>v3.1.0-rc1-74-g3c035a41dc</package> <arch>ppc64</arch> <cpu type='kvm' name='default'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 58395cff2f..db72e873c5 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -214,7 +214,7 @@ <flag name='nvdimm.unarmed'/> <version>3000092</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>440976</microcodeVersion> + <microcodeVersion>43100758</microcodeVersion> <package>v3.1.0-rc2-48-g039d4e3df0</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index c2db392e83..b8da376b2c 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -214,7 +214,7 @@ <flag name='nvdimm.unarmed'/> <version>3001050</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>446361</microcodeVersion> + <microcodeVersion>43100758</microcodeVersion> <package>v3.1.0-759-g15bede5541</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 379a0986a6..fab77db7ce 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -48,6 +48,8 @@ testQemuCaps(const void *opaque) qemuMonitorTestPtr mon = NULL; virQEMUCapsPtr capsActual = NULL; char *actual = NULL; + unsigned int fakeMicrocodeVersion = 0; + const char *p; if (virAsprintf(&repliesFile, "%s/qemucapabilitiesdata/%s.%s.replies", abs_srcdir, data->base, data->archName) < 0 || @@ -69,10 +71,17 @@ testQemuCaps(const void *opaque) qemuMonitorTestGetMonitor(mon)) < 0) goto cleanup; - /* Fill microcodeVersion with a "random" value which is the file - * length to provide a reproducible number for testing. - */ - virQEMUCapsSetMicrocodeVersion(capsActual, virFileLength(repliesFile, -1)); + /* calculate fake microcode version based on filename for a reproducible + * number for testing which does not change with the contents */ + for (p = data->archName; *p; p++) + fakeMicrocodeVersion += *p; + + fakeMicrocodeVersion *= 100000; + + for (p = data->base; *p; p++) + fakeMicrocodeVersion += *p; + + virQEMUCapsSetMicrocodeVersion(capsActual, fakeMicrocodeVersion); } if (!(actual = virQEMUCapsFormatCache(capsActual))) -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:34PM +0100, Peter Krempa wrote:
To avoid changes to the filled in microcode in case we change the caps replies file for any reason make the number depend on the filename.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 2 +- .../caps_2.10.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 2 +- .../caps_2.12.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 2 +- tests/qemucapabilitiestest.c | 17 +++++++++++++---- 33 files changed, 45 insertions(+), 36 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Since commit 02e8d0cfdf8 we are using 'scsi-hd' and 'scsi-cd' instead of 'scsi-disk'. We also should probe capabilities for 'scsi-hd' instead of 'scsi-disk'. It is safe to do as 'scsi-disk' is the common denominator of both 'scsi-hd' and 'scsi-cd' so all the properties were common. For now the test data are modified by just changing the appropriate type when probing for caps. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies | 2 +- tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies | 2 +- tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7ed5f94803..aec40404c9 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1299,7 +1299,7 @@ static virQEMUCapsObjectTypeProps virQEMUCapsDeviceProps[] = { { "vfio-pci", virQEMUCapsDevicePropsVfioPCI, ARRAY_CARDINALITY(virQEMUCapsDevicePropsVfioPCI), QEMU_CAPS_DEVICE_VFIO_PCI }, - { "scsi-disk", virQEMUCapsDevicePropsSCSIDisk, + { "scsi-hd", virQEMUCapsDevicePropsSCSIDisk, ARRAY_CARDINALITY(virQEMUCapsDevicePropsSCSIDisk), -1 }, { "ide-drive", virQEMUCapsDevicePropsIDEDrive, diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies index 88bc93be3a..95f3c45f2f 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies @@ -1465,7 +1465,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies index ea04d55f2a..ef7b3021e7 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies @@ -1494,7 +1494,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies index 1261a2bdc1..dfa1d3e623 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies @@ -1503,7 +1503,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies index b6efe1d3a1..adf015bf19 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies @@ -1770,7 +1770,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies index c8b73cd7e2..c0a463b5b1 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies @@ -4066,7 +4066,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies index 20e5b47541..0f41060b1d 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies @@ -4167,7 +4167,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies index a79fad62df..30fecf430e 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies @@ -2813,7 +2813,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies index 783a40c9a6..251363ace7 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies @@ -3044,7 +3044,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies index 3a03f390b2..e5914f4112 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies @@ -2867,7 +2867,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies index 18a2628b1f..f526f09691 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies @@ -3046,7 +3046,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies index 2cd6705d78..809ec1f309 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies @@ -4388,7 +4388,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies index d8aef1e9d1..57bf5612f5 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies @@ -4377,7 +4377,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies index b5a14b5916..aa3e821f8c 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies @@ -2951,7 +2951,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies index 7ba3efaf4f..16ac6aff53 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies @@ -3235,7 +3235,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies index ee248e38aa..c2cdafd39b 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies @@ -2072,7 +2072,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies index 6065200d39..caec42eb56 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies @@ -2169,7 +2169,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies index 2bf4b91e47..965eb5d5d9 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies @@ -2932,7 +2932,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies index 99af9c8a46..88bbbb6410 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies @@ -3082,7 +3082,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies index 3ae433df2c..a9b181beb9 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies @@ -2251,7 +2251,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies index 38d1fa6e52..4d69572410 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies @@ -2079,7 +2079,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies index 8eda09db39..160c4424ed 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies @@ -2320,7 +2320,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies index 1836b6bfc9..2730b740d5 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies @@ -2342,7 +2342,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies index ab48387adb..c13bfb4f69 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies @@ -2435,7 +2435,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies index c92663e299..d63c4a3484 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies @@ -3426,7 +3426,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies index 891cd0180b..bb2f7674e4 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies @@ -2528,7 +2528,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies index 3b5bcdbc66..6ca30f43eb 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies @@ -2616,7 +2616,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies index aff01371a3..18f3047b4c 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies @@ -4460,7 +4460,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies index 663b4a49c0..726b3843e3 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies @@ -1299,7 +1299,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-14" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies index cc66c232ab..65acdeb5e6 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies @@ -1299,7 +1299,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-14" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies index 3bcdfce293..b7a2108ccc 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies @@ -3028,7 +3028,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies index 16f021c879..d60559a6ad 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies @@ -3305,7 +3305,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies index 5f57a3bb18..88fd2619e2 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies @@ -4493,7 +4493,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies index 8c537cc763..3357ae44e5 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies @@ -3338,7 +3338,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies index 2d3f2fbcc6..e8e2c8671f 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies @@ -2793,7 +2793,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies index 97d92290f6..5c169379d2 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies @@ -2793,7 +2793,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies index 35cf567a34..75817bf7ed 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies @@ -3481,7 +3481,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:35PM +0100, Peter Krempa wrote:
Since commit 02e8d0cfdf8 we are using 'scsi-hd' and 'scsi-cd' instead of 'scsi-disk'. We also should probe capabilities for 'scsi-hd' instead of 'scsi-disk'. It is safe to do as 'scsi-disk' is the common denominator of both 'scsi-hd' and 'scsi-cd' so all the properties were common.
For now the test data are modified by just changing the appropriate type when probing for caps.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies | 2 +- tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies | 2 +- tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Since commit a4cda054e7 we are using 'ide-hd' and 'ide-cd' instead of 'ide-drive'. We also should probe capabilities for 'ide-hd' instead of 'ide-drive'. It is safe to do as 'ide-drive' is the common denominator of both 'ide-hd' and 'ide-cd' so all the properties were common. For now the test data are modified by just changing the appropriate type when probing for caps. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies | 2 +- tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies | 2 +- tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index aec40404c9..3d7d05cd99 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1302,7 +1302,7 @@ static virQEMUCapsObjectTypeProps virQEMUCapsDeviceProps[] = { { "scsi-hd", virQEMUCapsDevicePropsSCSIDisk, ARRAY_CARDINALITY(virQEMUCapsDevicePropsSCSIDisk), -1 }, - { "ide-drive", virQEMUCapsDevicePropsIDEDrive, + { "ide-hd", virQEMUCapsDevicePropsIDEDrive, ARRAY_CARDINALITY(virQEMUCapsDevicePropsIDEDrive), -1 }, { "PIIX4_PM", virQEMUCapsDevicePropsPiix4PM, diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies index 95f3c45f2f..a62b4e98f4 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies @@ -1547,7 +1547,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-17" } diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies index ef7b3021e7..3253ba635a 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies @@ -1576,7 +1576,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-17" } diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies index dfa1d3e623..4789a11f55 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies @@ -1585,7 +1585,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-17" } diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies index adf015bf19..42b7278fe1 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies @@ -1864,7 +1864,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-17" } diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies index c0a463b5b1..61131cee46 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies @@ -4188,7 +4188,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies index 0f41060b1d..7e9229983c 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies @@ -4289,7 +4289,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies index 30fecf430e..d688e2aeef 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies @@ -2935,7 +2935,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-17" } diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies index 251363ace7..c182f5fe5e 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies @@ -3166,7 +3166,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies index e5914f4112..560c0af0c8 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies @@ -2989,7 +2989,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-17" } diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies index f526f09691..1ed4707a23 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies @@ -3168,7 +3168,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies index 809ec1f309..565e10047e 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies @@ -4510,7 +4510,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies index 57bf5612f5..fb9fa444c8 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies @@ -4499,7 +4499,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies index aa3e821f8c..ddc62a8b82 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies @@ -3077,7 +3077,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-17" } diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies index 16ac6aff53..132c9c9893 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies @@ -3357,7 +3357,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies index c2cdafd39b..9ad0d61af6 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies @@ -2175,7 +2175,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-17" } diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies index caec42eb56..dcec7217db 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies @@ -2272,7 +2272,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies index 965eb5d5d9..9df4439b05 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies @@ -3035,7 +3035,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies index 88bbbb6410..09f2f5daa5 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies @@ -3185,7 +3185,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies index a9b181beb9..b3848a67fa 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies @@ -2354,7 +2354,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies index 4d69572410..bea4007f04 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies @@ -2197,7 +2197,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-17" } diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies index 160c4424ed..e2b5751cf7 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies @@ -2438,7 +2438,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies index 2730b740d5..7a874985dd 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies @@ -2460,7 +2460,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-17" } diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies index c13bfb4f69..a4747f746a 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies @@ -2553,7 +2553,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies index d63c4a3484..d9319e9a59 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies @@ -3548,7 +3548,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies index bb2f7674e4..fab8534b8e 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies @@ -2650,7 +2650,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-17" } diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies index 6ca30f43eb..ec7747b5d7 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies @@ -2738,7 +2738,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies index 18f3047b4c..c6e5678144 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies @@ -4586,7 +4586,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies index 726b3843e3..cf8953390a 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies @@ -1425,7 +1425,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies index 65acdeb5e6..b1b5784439 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies @@ -1425,7 +1425,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies index b7a2108ccc..1b398ed4e4 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies @@ -3154,7 +3154,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-17" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies index d60559a6ad..558a753e13 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies @@ -3431,7 +3431,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies index 88fd2619e2..ca8c176dd3 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies @@ -4619,7 +4619,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies index 3357ae44e5..358e2a0bdf 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies @@ -3464,7 +3464,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies index e8e2c8671f..667159d6ab 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies @@ -2919,7 +2919,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies index 5c169379d2..414707e42a 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies @@ -2919,7 +2919,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies index 75817bf7ed..f39f047f1f 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies @@ -3607,7 +3607,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ide-drive" + "typename": "ide-hd" }, "id": "libvirt-16" } -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:36PM +0100, Peter Krempa wrote:
Since commit a4cda054e7 we are using 'ide-hd' and 'ide-cd' instead of 'ide-drive'. We also should probe capabilities for 'ide-hd' instead of 'ide-drive'. It is safe to do as 'ide-drive' is the common denominator of both 'ide-hd' and 'ide-cd' so all the properties were common.
For now the test data are modified by just changing the appropriate type when probing for caps. ^ stray space
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies | 2 +- tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies | 2 +- tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Add a file to agregate testing for 'virtio-scsi' based on the modern framework. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../controller-virtio-scsi.x86_64-latest.args | 34 ++++++++++++++++++ .../controller-virtio-scsi.xml | 29 +++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../controller-virtio-scsi.xml | 36 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 5 files changed, 101 insertions(+) create mode 100644 tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/controller-virtio-scsi.xml create mode 100644 tests/qemuxml2xmloutdata/controller-virtio-scsi.xml diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args new file mode 100644 index 0000000000..e6f640f50f --- /dev/null +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args @@ -0,0 +1,34 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 8,sockets=8,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \ +-drive file=/dev/HostVG/QEMUGuest1,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 \ +-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/controller-virtio-scsi.xml b/tests/qemuxml2argvdata/controller-virtio-scsi.xml new file mode 100644 index 0000000000..4e24debed0 --- /dev/null +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.xml @@ -0,0 +1,29 @@ +<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'>8</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6dc05c347f..0a6a76edc5 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1191,6 +1191,7 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-ioeventfd", QEMU_CAPS_VIRTIO_IOEVENTFD, QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_CAPS_LATEST("controller-virtio-scsi"); DO_TEST("disk-scsi-megasas", QEMU_CAPS_SCSI_MEGASAS); DO_TEST("disk-scsi-mptsas1068", diff --git a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml new file mode 100644 index 0000000000..3c1552d3a7 --- /dev/null +++ b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml @@ -0,0 +1,36 @@ +<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'>8</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='scsi' index='0' model='virtio-scsi'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 85261cb2e0..bef453850c 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -379,6 +379,7 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-ioeventfd", QEMU_CAPS_VIRTIO_SCSI); + DO_TEST("controller-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-s390-zpci", QEMU_CAPS_DEVICE_ZPCI, QEMU_CAPS_CCW); -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:37PM +0100, Peter Krempa wrote:
Add a file to agregate testing for 'virtio-scsi' based on the modern
aggregate
framework.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../controller-virtio-scsi.x86_64-latest.args | 34 ++++++++++++++++++ .../controller-virtio-scsi.xml | 29 +++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../controller-virtio-scsi.xml | 36 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 5 files changed, 101 insertions(+) create mode 100644 tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/controller-virtio-scsi.xml create mode 100644 tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Now that we have a specific test for testing the 'virtio-scsi' controller and other tests which test a combination of scsi and non-scsi devices this test no longer makes sense. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../disk-scsi-virtio-scsi.args | 31 ------------- .../disk-scsi-virtio-scsi.xml | 35 --------------- tests/qemuxml2argvtest.c | 2 - .../disk-scsi-virtio-scsi.xml | 45 ------------------- tests/qemuxml2xmltest.c | 2 - 5 files changed, 115 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-scsi-virtio-scsi.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-virtio-scsi.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml diff --git a/tests/qemuxml2argvdata/disk-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/disk-scsi-virtio-scsi.args deleted file mode 100644 index 60760831ab..0000000000 --- a/tests/qemuxml2argvdata/disk-scsi-virtio-scsi.args +++ /dev/null @@ -1,31 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ --drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-4-0 \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,\ -drive=drive-scsi0-0-4-0,id=scsi0-0-4-0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/disk-scsi-virtio-scsi.xml b/tests/qemuxml2argvdata/disk-scsi-virtio-scsi.xml deleted file mode 100644 index 842c03d1ce..0000000000 --- a/tests/qemuxml2argvdata/disk-scsi-virtio-scsi.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-i686</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='file' device='disk'> - <source file='/tmp/scsidisk.img'/> - <target dev='sda' bus='scsi'/> - <address type='drive' controller='0' bus='0' target='4' unit='0'/> - </disk> - <controller type='ide' index='0'/> - <controller type='scsi' index='0' model='virtio-scsi'/> - <controller type='usb' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0a6a76edc5..65c02b731b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1181,8 +1181,6 @@ mymain(void) QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-scsi-vscsi", NONE); - DO_TEST("disk-scsi-virtio-scsi", - QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-num_queues", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-cmd_per_lun", diff --git a/tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml b/tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml deleted file mode 100644 index 069a35f27c..0000000000 --- a/tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml +++ /dev/null @@ -1,45 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='/tmp/scsidisk.img'/> - <target dev='sda' bus='scsi'/> - <address type='drive' controller='0' bus='0' target='4' unit='0'/> - </disk> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='scsi' index='0' model='virtio-scsi'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </controller> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </memballoon> - </devices> -</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index bef453850c..d22104a9dd 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -367,8 +367,6 @@ mymain(void) DO_TEST("disk-scsi-device", QEMU_CAPS_SCSI_LSI); DO_TEST("disk-scsi-vscsi", NONE); - DO_TEST("disk-scsi-virtio-scsi", - QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-num_queues", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-reservations", -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:38PM +0100, Peter Krempa wrote:
Now that we have a specific test for testing the 'virtio-scsi' controller and other tests which test a combination of scsi and non-scsi devices this test no longer makes sense.
Bye, test!
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../disk-scsi-virtio-scsi.args | 31 ------------- .../disk-scsi-virtio-scsi.xml | 35 --------------- tests/qemuxml2argvtest.c | 2 - .../disk-scsi-virtio-scsi.xml | 45 ------------------- tests/qemuxml2xmltest.c | 2 - 5 files changed, 115 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-scsi-virtio-scsi.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-virtio-scsi.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
We don't need separate files for this test. Also modernize it in the process. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../controller-virtio-scsi.x86_64-latest.args | 6 ++- .../controller-virtio-scsi.xml | 8 ++++ .../disk-virtio-scsi-num_queues.args | 28 -------------- .../disk-virtio-scsi-num_queues.xml | 31 ---------------- tests/qemuxml2argvtest.c | 2 - .../controller-virtio-scsi.xml | 12 +++++- .../disk-virtio-scsi-num_queues.xml | 37 ------------------- tests/qemuxml2xmltest.c | 2 - 8 files changed, 24 insertions(+), 102 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-num_queues.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-num_queues.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args index e6f640f50f..7552f09019 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args @@ -25,10 +25,14 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -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 virtio-scsi-pci,id=scsi1,num_queues=8,bus=pci.0,addr=0x3 \ -drive file=/dev/HostVG/QEMUGuest1,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 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ +-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi1-0-0-0 \ +-device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,\ +id=scsi1-0-0-0 \ +-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/controller-virtio-scsi.xml b/tests/qemuxml2argvdata/controller-virtio-scsi.xml index 4e24debed0..ec27166386 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.xml +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.xml @@ -19,8 +19,16 @@ <target dev='sda' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='sdb' bus='scsi'/> + <address type='drive' controller='1' bus='0' target='0' unit='0'/> + </disk> <controller type='usb' index='0'/> <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='scsi' index='1' model='virtio-scsi'> + <driver queues='8'/> + </controller> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-num_queues.args b/tests/qemuxml2argvdata/disk-virtio-scsi-num_queues.args deleted file mode 100644 index b0db76e09b..0000000000 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-num_queues.args +++ /dev/null @@ -1,28 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 8,sockets=8,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --device virtio-scsi-pci,id=scsi0,num_queues=8,bus=pci.0,addr=0x3 \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-0-0 \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ -drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-num_queues.xml b/tests/qemuxml2argvdata/disk-virtio-scsi-num_queues.xml deleted file mode 100644 index 4618271e74..0000000000 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-num_queues.xml +++ /dev/null @@ -1,31 +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'>8</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='sdb' bus='scsi'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='scsi' index='0' model='virtio-scsi'> - <driver queues='8'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 65c02b731b..ee54674666 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1181,8 +1181,6 @@ mymain(void) QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-scsi-vscsi", NONE); - DO_TEST("disk-virtio-scsi-num_queues", - QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-cmd_per_lun", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-max_sectors", diff --git a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml index 3c1552d3a7..14498222de 100644 --- a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml +++ b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml @@ -20,17 +20,27 @@ <target dev='sda' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='sdb' bus='scsi'/> + <address type='drive' controller='1' bus='0' target='0' unit='0'/> + </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='scsi' index='0' model='virtio-scsi'> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </controller> + <controller type='scsi' index='1' model='virtio-scsi'> + <driver queues='8'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </controller> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </memballoon> </devices> </domain> diff --git a/tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml b/tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml deleted file mode 100644 index f0776b6b71..0000000000 --- a/tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml +++ /dev/null @@ -1,37 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>8</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='sdb' bus='scsi'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='scsi' index='0' model='virtio-scsi'> - <driver queues='8'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </memballoon> - </devices> -</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index d22104a9dd..9900095048 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -367,8 +367,6 @@ mymain(void) DO_TEST("disk-scsi-device", QEMU_CAPS_SCSI_LSI); DO_TEST("disk-scsi-vscsi", NONE); - DO_TEST("disk-virtio-scsi-num_queues", - QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-reservations", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_PR_MANAGER_HELPER); DO_TEST("disk-virtio-scsi-cmd_per_lun", -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:39PM +0100, Peter Krempa wrote:
We don't need separate files for this test. Also modernize it in the process.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../controller-virtio-scsi.x86_64-latest.args | 6 ++- .../controller-virtio-scsi.xml | 8 ++++ .../disk-virtio-scsi-num_queues.args | 28 -------------- .../disk-virtio-scsi-num_queues.xml | 31 ---------------- tests/qemuxml2argvtest.c | 2 - .../controller-virtio-scsi.xml | 12 +++++- .../disk-virtio-scsi-num_queues.xml | 37 ------------------- tests/qemuxml2xmltest.c | 2 - 8 files changed, 24 insertions(+), 102 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-num_queues.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-num_queues.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
We don't need separate files for this test. Also modernize it in the process. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../controller-virtio-scsi.x86_64-latest.args | 6 ++- .../controller-virtio-scsi.xml | 8 ++++ .../disk-virtio-scsi-cmd_per_lun.args | 28 -------------- .../disk-virtio-scsi-cmd_per_lun.xml | 31 ---------------- tests/qemuxml2argvtest.c | 2 - .../controller-virtio-scsi.xml | 12 +++++- .../disk-virtio-scsi-cmd_per_lun.xml | 37 ------------------- tests/qemuxml2xmltest.c | 2 - 8 files changed, 24 insertions(+), 102 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args index 7552f09019..954553e6d7 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args @@ -26,13 +26,17 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \ -device virtio-scsi-pci,id=scsi1,num_queues=8,bus=pci.0,addr=0x3 \ +-device virtio-scsi-pci,id=scsi2,cmd_per_lun=50,bus=pci.0,addr=0x4 \ -drive file=/dev/HostVG/QEMUGuest1,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 \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi1-0-0-0 \ -device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,\ id=scsi1-0-0-0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \ +-drive file=/dev/HostVG/QEMUGuest3,format=raw,if=none,id=drive-scsi2-0-0-0 \ +-device scsi-hd,bus=scsi2.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi2-0-0-0,\ +id=scsi2-0-0-0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.xml b/tests/qemuxml2argvdata/controller-virtio-scsi.xml index ec27166386..64d34b0fb2 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.xml +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.xml @@ -24,11 +24,19 @@ <target dev='sdb' bus='scsi'/> <address type='drive' controller='1' bus='0' target='0' unit='0'/> </disk> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest3'/> + <target dev='sdc' bus='scsi'/> + <address type='drive' controller='2' bus='0' target='0' unit='0'/> + </disk> <controller type='usb' index='0'/> <controller type='scsi' index='0' model='virtio-scsi'/> <controller type='scsi' index='1' model='virtio-scsi'> <driver queues='8'/> </controller> + <controller type='scsi' index='2' model='virtio-scsi'> + <driver cmd_per_lun='50'/> + </controller> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.args b/tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.args deleted file mode 100644 index d8318b4c29..0000000000 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.args +++ /dev/null @@ -1,28 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 8,sockets=8,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --device virtio-scsi-pci,id=scsi0,cmd_per_lun=50,bus=pci.0,addr=0x3 \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-0-0 \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ -drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.xml b/tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.xml deleted file mode 100644 index 7c44beaabe..0000000000 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.xml +++ /dev/null @@ -1,31 +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'>8</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='sdb' bus='scsi'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='scsi' index='0' model='virtio-scsi'> - <driver cmd_per_lun='50'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ee54674666..bfae41605c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1181,8 +1181,6 @@ mymain(void) QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-scsi-vscsi", NONE); - DO_TEST("disk-virtio-scsi-cmd_per_lun", - QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-max_sectors", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-ioeventfd", diff --git a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml index 14498222de..7db0d0c114 100644 --- a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml +++ b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml @@ -26,6 +26,12 @@ <target dev='sdb' bus='scsi'/> <address type='drive' controller='1' bus='0' target='0' unit='0'/> </disk> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest3'/> + <target dev='sdc' bus='scsi'/> + <address type='drive' controller='2' bus='0' target='0' unit='0'/> + </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> @@ -36,11 +42,15 @@ <driver queues='8'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> + <controller type='scsi' index='2' model='virtio-scsi'> + <driver cmd_per_lun='50'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </controller> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </memballoon> </devices> </domain> diff --git a/tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml b/tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml deleted file mode 100644 index f50a668625..0000000000 --- a/tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml +++ /dev/null @@ -1,37 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>8</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='sdb' bus='scsi'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='scsi' index='0' model='virtio-scsi'> - <driver cmd_per_lun='50'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </memballoon> - </devices> -</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 9900095048..3fe74bd1d6 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -369,8 +369,6 @@ mymain(void) DO_TEST("disk-scsi-vscsi", NONE); DO_TEST("disk-virtio-scsi-reservations", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_PR_MANAGER_HELPER); - DO_TEST("disk-virtio-scsi-cmd_per_lun", - QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-max_sectors", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-ioeventfd", -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:40PM +0100, Peter Krempa wrote:
We don't need separate files for this test. Also modernize it in the process.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../controller-virtio-scsi.x86_64-latest.args | 6 ++- .../controller-virtio-scsi.xml | 8 ++++ .../disk-virtio-scsi-cmd_per_lun.args | 28 -------------- .../disk-virtio-scsi-cmd_per_lun.xml | 31 ---------------- tests/qemuxml2argvtest.c | 2 - .../controller-virtio-scsi.xml | 12 +++++- .../disk-virtio-scsi-cmd_per_lun.xml | 37 ------------------- tests/qemuxml2xmltest.c | 2 - 8 files changed, 24 insertions(+), 102 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
We don't need separate files for this test. Also modernize it in the process. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../controller-virtio-scsi.x86_64-latest.args | 6 ++- .../controller-virtio-scsi.xml | 8 ++++ .../disk-virtio-scsi-max_sectors.args | 28 -------------- .../disk-virtio-scsi-max_sectors.xml | 31 ---------------- tests/qemuxml2argvtest.c | 2 - .../controller-virtio-scsi.xml | 12 +++++- .../disk-virtio-scsi-max_sectors.xml | 37 ------------------- tests/qemuxml2xmltest.c | 2 - 8 files changed, 24 insertions(+), 102 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args index 954553e6d7..3779e892b6 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args @@ -27,6 +27,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \ -device virtio-scsi-pci,id=scsi1,num_queues=8,bus=pci.0,addr=0x3 \ -device virtio-scsi-pci,id=scsi2,cmd_per_lun=50,bus=pci.0,addr=0x4 \ +-device virtio-scsi-pci,id=scsi3,max_sectors=512,bus=pci.0,addr=0x5 \ -drive file=/dev/HostVG/QEMUGuest1,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 \ @@ -36,7 +37,10 @@ id=scsi1-0-0-0 \ -drive file=/dev/HostVG/QEMUGuest3,format=raw,if=none,id=drive-scsi2-0-0-0 \ -device scsi-hd,bus=scsi2.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi2-0-0-0,\ id=scsi2-0-0-0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \ +-drive file=/dev/HostVG/QEMUGuest4,format=raw,if=none,id=drive-scsi3-0-0-0 \ +-device scsi-hd,bus=scsi3.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi3-0-0-0,\ +id=scsi3-0-0-0 \ +-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/controller-virtio-scsi.xml b/tests/qemuxml2argvdata/controller-virtio-scsi.xml index 64d34b0fb2..ebf608d1fd 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.xml +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.xml @@ -29,6 +29,11 @@ <target dev='sdc' bus='scsi'/> <address type='drive' controller='2' bus='0' target='0' unit='0'/> </disk> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest4'/> + <target dev='sdd' bus='scsi'/> + <address type='drive' controller='3' bus='0' target='0' unit='0'/> + </disk> <controller type='usb' index='0'/> <controller type='scsi' index='0' model='virtio-scsi'/> <controller type='scsi' index='1' model='virtio-scsi'> @@ -37,6 +42,9 @@ <controller type='scsi' index='2' model='virtio-scsi'> <driver cmd_per_lun='50'/> </controller> + <controller type='scsi' index='3' model='virtio-scsi'> + <driver max_sectors='512'/> + </controller> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.args b/tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.args deleted file mode 100644 index 071ae542f4..0000000000 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.args +++ /dev/null @@ -1,28 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 8,sockets=8,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --device virtio-scsi-pci,id=scsi0,max_sectors=512,bus=pci.0,addr=0x3 \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-0-0 \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ -drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.xml b/tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.xml deleted file mode 100644 index 838e4844b4..0000000000 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.xml +++ /dev/null @@ -1,31 +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'>8</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='sdb' bus='scsi'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='scsi' index='0' model='virtio-scsi'> - <driver max_sectors='512'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index bfae41605c..fbaeb51443 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1181,8 +1181,6 @@ mymain(void) QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-scsi-vscsi", NONE); - DO_TEST("disk-virtio-scsi-max_sectors", - QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-ioeventfd", QEMU_CAPS_VIRTIO_IOEVENTFD, QEMU_CAPS_VIRTIO_SCSI); DO_TEST_CAPS_LATEST("controller-virtio-scsi"); diff --git a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml index 7db0d0c114..b108e4a0db 100644 --- a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml +++ b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml @@ -32,6 +32,12 @@ <target dev='sdc' bus='scsi'/> <address type='drive' controller='2' bus='0' target='0' unit='0'/> </disk> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest4'/> + <target dev='sdd' bus='scsi'/> + <address type='drive' controller='3' bus='0' target='0' unit='0'/> + </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> @@ -46,11 +52,15 @@ <driver cmd_per_lun='50'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </controller> + <controller type='scsi' index='3' model='virtio-scsi'> + <driver max_sectors='512'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> + </controller> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </memballoon> </devices> </domain> diff --git a/tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml b/tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml deleted file mode 100644 index 07f4012fd0..0000000000 --- a/tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml +++ /dev/null @@ -1,37 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>8</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='sdb' bus='scsi'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='scsi' index='0' model='virtio-scsi'> - <driver max_sectors='512'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </memballoon> - </devices> -</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 3fe74bd1d6..c525b6f4e3 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -369,8 +369,6 @@ mymain(void) DO_TEST("disk-scsi-vscsi", NONE); DO_TEST("disk-virtio-scsi-reservations", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_PR_MANAGER_HELPER); - DO_TEST("disk-virtio-scsi-max_sectors", - QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-ioeventfd", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("controller-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI); -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:41PM +0100, Peter Krempa wrote:
We don't need separate files for this test. Also modernize it in the process.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../controller-virtio-scsi.x86_64-latest.args | 6 ++- .../controller-virtio-scsi.xml | 8 ++++ .../disk-virtio-scsi-max_sectors.args | 28 -------------- .../disk-virtio-scsi-max_sectors.xml | 31 ---------------- tests/qemuxml2argvtest.c | 2 - .../controller-virtio-scsi.xml | 12 +++++- .../disk-virtio-scsi-max_sectors.xml | 37 ------------------- tests/qemuxml2xmltest.c | 2 - 8 files changed, 24 insertions(+), 102 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
We don't need separate files for this test. Also modernize it in the process. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../controller-virtio-scsi.x86_64-latest.args | 6 ++- .../controller-virtio-scsi.xml | 8 ++++ .../disk-virtio-scsi-ioeventfd.args | 28 -------------- .../disk-virtio-scsi-ioeventfd.xml | 31 ---------------- tests/qemuxml2argvtest.c | 2 - .../controller-virtio-scsi.xml | 12 +++++- .../disk-virtio-scsi-ioeventfd.xml | 37 ------------------- tests/qemuxml2xmltest.c | 2 - 8 files changed, 24 insertions(+), 102 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ioeventfd.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ioeventfd.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args index 3779e892b6..cf8a497eb7 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args @@ -28,6 +28,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device virtio-scsi-pci,id=scsi1,num_queues=8,bus=pci.0,addr=0x3 \ -device virtio-scsi-pci,id=scsi2,cmd_per_lun=50,bus=pci.0,addr=0x4 \ -device virtio-scsi-pci,id=scsi3,max_sectors=512,bus=pci.0,addr=0x5 \ +-device virtio-scsi-pci,id=scsi4,ioeventfd=on,bus=pci.0,addr=0x6 \ -drive file=/dev/HostVG/QEMUGuest1,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 \ @@ -40,7 +41,10 @@ id=scsi2-0-0-0 \ -drive file=/dev/HostVG/QEMUGuest4,format=raw,if=none,id=drive-scsi3-0-0-0 \ -device scsi-hd,bus=scsi3.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi3-0-0-0,\ id=scsi3-0-0-0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \ +-drive file=/dev/HostVG/QEMUGuest5,format=raw,if=none,id=drive-scsi4-0-0-0 \ +-device scsi-hd,bus=scsi4.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi4-0-0-0,\ +id=scsi4-0-0-0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.xml b/tests/qemuxml2argvdata/controller-virtio-scsi.xml index ebf608d1fd..844e4ad397 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.xml +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.xml @@ -34,6 +34,11 @@ <target dev='sdd' bus='scsi'/> <address type='drive' controller='3' bus='0' target='0' unit='0'/> </disk> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest5'/> + <target dev='sde' bus='scsi'/> + <address type='drive' controller='4' bus='0' target='0' unit='0'/> + </disk> <controller type='usb' index='0'/> <controller type='scsi' index='0' model='virtio-scsi'/> <controller type='scsi' index='1' model='virtio-scsi'> @@ -45,6 +50,9 @@ <controller type='scsi' index='3' model='virtio-scsi'> <driver max_sectors='512'/> </controller> + <controller type='scsi' index='4' model='virtio-scsi'> + <driver ioeventfd='on'/> + </controller> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-ioeventfd.args b/tests/qemuxml2argvdata/disk-virtio-scsi-ioeventfd.args deleted file mode 100644 index aa7652aa9b..0000000000 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-ioeventfd.args +++ /dev/null @@ -1,28 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 8,sockets=8,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --device virtio-scsi-pci,id=scsi0,ioeventfd=on,bus=pci.0,addr=0x3 \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-0-0 \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ -drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-ioeventfd.xml b/tests/qemuxml2argvdata/disk-virtio-scsi-ioeventfd.xml deleted file mode 100644 index f6fd345595..0000000000 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-ioeventfd.xml +++ /dev/null @@ -1,31 +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'>8</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='sdb' bus='scsi'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='scsi' index='0' model='virtio-scsi'> - <driver ioeventfd='on'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fbaeb51443..16909dc8a6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1181,8 +1181,6 @@ mymain(void) QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-scsi-vscsi", NONE); - DO_TEST("disk-virtio-scsi-ioeventfd", - QEMU_CAPS_VIRTIO_IOEVENTFD, QEMU_CAPS_VIRTIO_SCSI); DO_TEST_CAPS_LATEST("controller-virtio-scsi"); DO_TEST("disk-scsi-megasas", QEMU_CAPS_SCSI_MEGASAS); diff --git a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml index b108e4a0db..f810a70baf 100644 --- a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml +++ b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml @@ -38,6 +38,12 @@ <target dev='sdd' bus='scsi'/> <address type='drive' controller='3' bus='0' target='0' unit='0'/> </disk> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest5'/> + <target dev='sde' bus='scsi'/> + <address type='drive' controller='4' bus='0' target='0' unit='0'/> + </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> @@ -56,11 +62,15 @@ <driver max_sectors='512'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </controller> + <controller type='scsi' index='4' model='virtio-scsi'> + <driver ioeventfd='on'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </controller> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> </memballoon> </devices> </domain> diff --git a/tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml b/tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml deleted file mode 100644 index f2c0b47731..0000000000 --- a/tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml +++ /dev/null @@ -1,37 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>8</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='sdb' bus='scsi'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='scsi' index='0' model='virtio-scsi'> - <driver ioeventfd='on'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </memballoon> - </devices> -</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index c525b6f4e3..7b755de39f 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -369,8 +369,6 @@ mymain(void) DO_TEST("disk-scsi-vscsi", NONE); DO_TEST("disk-virtio-scsi-reservations", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_PR_MANAGER_HELPER); - DO_TEST("disk-virtio-scsi-ioeventfd", - QEMU_CAPS_VIRTIO_SCSI); DO_TEST("controller-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-s390-zpci", QEMU_CAPS_DEVICE_ZPCI, -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:42PM +0100, Peter Krempa wrote:
We don't need separate files for this test. Also modernize it in the process.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../controller-virtio-scsi.x86_64-latest.args | 6 ++- .../controller-virtio-scsi.xml | 8 ++++ .../disk-virtio-scsi-ioeventfd.args | 28 -------------- .../disk-virtio-scsi-ioeventfd.xml | 31 ---------------- tests/qemuxml2argvtest.c | 2 - .../controller-virtio-scsi.xml | 12 +++++- .../disk-virtio-scsi-ioeventfd.xml | 37 ------------------- tests/qemuxml2xmltest.c | 2 - 8 files changed, 24 insertions(+), 102 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ioeventfd.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ioeventfd.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Using an old strict set of capabilities is not of much use if a code path would select a more modern controller on accident. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...> disk-scsi-device-auto.x86_64-1.5.3.args} | 11 +++--- .../disk-scsi-device-auto.x86_64-latest.args | 35 +++++++++++++++++++ tests/qemuxml2argvtest.c | 4 +-- 3 files changed, 43 insertions(+), 7 deletions(-) rename tests/qemuxml2argvdata/{disk-scsi-device-auto.args => disk-scsi-device-auto.x86_64-1.5.3.args} (69%) create mode 100644 tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.args b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args similarity index 69% rename from tests/qemuxml2argvdata/disk-scsi-device-auto.args rename to tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args index c28a7b87be..e2ff678c4e 100644 --- a/tests/qemuxml2argvdata/disk-scsi-device-auto.args +++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args @@ -7,8 +7,9 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ +-realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ @@ -20,11 +21,11 @@ server,nowait \ -rtc base=utc \ -no-shutdown \ -no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -device lsi,id=scsi0,bus=pci.0,addr=0x3 \ --usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-0 \ --device scsi-disk,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \ +-device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args new file mode 100644 index 0000000000..549a162808 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-device lsi,id=scsi0,bus=pci.0,addr=0x2 \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ +-drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-0 \ +-device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \ +-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 16909dc8a6..5022061e04 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1167,8 +1167,8 @@ mymain(void) QEMU_CAPS_DEVICE_USB_STORAGE); DO_TEST("disk-scsi-device", QEMU_CAPS_SCSI_LSI); - DO_TEST("disk-scsi-device-auto", - QEMU_CAPS_SCSI_LSI); + DO_TEST_CAPS_VER("disk-scsi-device-auto", "1.5.3"); + DO_TEST_CAPS_LATEST("disk-scsi-device-auto"); DO_TEST("disk-scsi-disk-split", QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-scsi-disk-wwn", -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:43PM +0100, Peter Krempa wrote:
Using an old strict set of capabilities is not of much use if a code path would select a more modern controller on accident.
by accident?
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...> disk-scsi-device-auto.x86_64-1.5.3.args} | 11 +++--- .../disk-scsi-device-auto.x86_64-latest.args | 35 +++++++++++++++++++ tests/qemuxml2argvtest.c | 4 +-- 3 files changed, 43 insertions(+), 7 deletions(-) rename tests/qemuxml2argvdata/{disk-scsi-device-auto.args => disk-scsi-device-auto.x86_64-1.5.3.args} (69%) create mode 100644 tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Testing that the cachemode is properly recorded to the configuration after startup does not add much value and overcomplicates the xml2argv test. Remove the 'disk-shared' test with old capabilities, which would be done along as well as the test with real capabilities covers it sufficiently. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/disk-shared.args | 31 ---------- tests/qemuxml2argvtest.c | 1 - .../qemuxml2startupxmloutdata/disk-shared.xml | 56 ------------------- 3 files changed, 88 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-shared.args delete mode 100644 tests/qemuxml2startupxmloutdata/disk-shared.xml diff --git a/tests/qemuxml2argvdata/disk-shared.args b/tests/qemuxml2argvdata/disk-shared.args deleted file mode 100644 index 550708c3b3..0000000000 --- a/tests/qemuxml2argvdata/disk-shared.args +++ /dev/null @@ -1,31 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0,\ -cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1,serial=XYZXYZXYZYXXYZYZYXYZY \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,\ -media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5022061e04..c3f4640044 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1105,7 +1105,6 @@ mymain(void) DO_TEST_PARSE_ERROR("disk-fmt-cow", NONE); DO_TEST_PARSE_ERROR("disk-fmt-dir", NONE); DO_TEST_PARSE_ERROR("disk-fmt-iso", NONE); - DO_TEST_WITH_STARTUP("disk-shared", NONE); DO_TEST_CAPS_VER("disk-shared", "2.12.0"); DO_TEST_CAPS_LATEST("disk-shared"); DO_TEST_PARSE_ERROR("disk-shared-qcow", NONE); diff --git a/tests/qemuxml2startupxmloutdata/disk-shared.xml b/tests/qemuxml2startupxmloutdata/disk-shared.xml deleted file mode 100644 index 60b7eca788..0000000000 --- a/tests/qemuxml2startupxmloutdata/disk-shared.xml +++ /dev/null @@ -1,56 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw' cache='none'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <shareable/> - <serial>XYZXYZXYZYXXYZYZYXYZY</serial> - <alias name='ide0-0-0'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='cdrom'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest2'/> - <target dev='hdc' bus='ide'/> - <readonly/> - <alias name='ide0-1-0'/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'> - <alias name='usb'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <alias name='ide'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'> - <alias name='pci.0'/> - </controller> - <input type='mouse' bus='ps2'> - <alias name='input0'/> - </input> - <input type='keyboard' bus='ps2'> - <alias name='input1'/> - </input> - <memballoon model='virtio'> - <alias name='balloon0'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </memballoon> - </devices> -</domain> -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:44PM +0100, Peter Krempa wrote:
Testing that the cachemode is properly recorded to the configuration after startup does not add much value and overcomplicates the xml2argv test.
Remove the 'disk-shared' test with old capabilities, which would be done along as well as the test with real capabilities covers it sufficiently.
-EPARSE s/along //
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/disk-shared.args | 31 ---------- tests/qemuxml2argvtest.c | 1 - .../qemuxml2startupxmloutdata/disk-shared.xml | 56 ------------------- 3 files changed, 88 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-shared.args delete mode 100644 tests/qemuxml2startupxmloutdata/disk-shared.xml
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
A lot of code with no real impact and popularity. Remove all the helpers now that the only test case is gone. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/Makefile.am | 1 - tests/qemuxml2argvtest.c | 54 +++------------------------------------- 2 files changed, 3 insertions(+), 52 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index bdf7154fd5..ceb15d9218 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -129,7 +129,6 @@ EXTRA_DIST = \ qemumigparamsdata \ qemumonitorjsondata \ qemuxml2argvdata \ - qemuxml2startupxmloutdata \ qemuxml2xmloutdata \ qemustatusxml2xmldata \ qemumemlockdata \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c3f4640044..046c28c4b8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -291,9 +291,8 @@ typedef enum { FLAG_EXPECT_FAILURE = 1 << 0, FLAG_EXPECT_PARSE_ERROR = 1 << 1, FLAG_FIPS = 1 << 2, - FLAG_STEAL_VM = 1 << 3, - FLAG_REAL_CAPS = 1 << 4, - FLAG_SKIP_LEGACY_CPUS = 1 << 5, + FLAG_REAL_CAPS = 1 << 3, + FLAG_SKIP_LEGACY_CPUS = 1 << 4, } virQemuXML2ArgvTestFlags; struct testInfo { @@ -304,7 +303,6 @@ struct testInfo { int migrateFd; unsigned int flags; unsigned int parseFlags; - virDomainObjPtr vm; }; @@ -428,49 +426,16 @@ testUpdateQEMUCaps(const struct testInfo *info, } -static int -testCompareXMLToStartupXML(const void *data) -{ - const struct testInfo *info = data; - unsigned int format_flags = VIR_DOMAIN_DEF_FORMAT_SECURE; - char *xml = NULL; - char *actual = NULL; - int ret = -1; - - if (!info->vm) { - VIR_TEST_DEBUG("VM object missing. Did the args conversion succeed?"); - return -1; - } - - if (virAsprintf(&xml, "%s/qemuxml2startupxmloutdata/%s.xml", - abs_srcdir, info->name) < 0) - goto cleanup; - - if (!(actual = virDomainDefFormat(info->vm->def, NULL, format_flags))) - goto cleanup; - - ret = virTestCompareToFile(actual, xml); - - cleanup: - VIR_FREE(xml); - VIR_FREE(actual); - return ret; -} - - static int testCheckExclusiveFlags(int flags) { virCheckFlags(FLAG_EXPECT_FAILURE | FLAG_EXPECT_PARSE_ERROR | FLAG_FIPS | - FLAG_STEAL_VM | FLAG_REAL_CAPS | FLAG_SKIP_LEGACY_CPUS | 0, -1); - VIR_EXCLUSIVE_FLAGS_RET(FLAG_STEAL_VM, FLAG_EXPECT_FAILURE, -1); - VIR_EXCLUSIVE_FLAGS_RET(FLAG_STEAL_VM, FLAG_EXPECT_PARSE_ERROR, -1); VIR_EXCLUSIVE_FLAGS_RET(FLAG_REAL_CAPS, FLAG_SKIP_LEGACY_CPUS, -1); return 0; } @@ -643,9 +608,6 @@ testCompareXMLToArgv(const void *data) ret = 0; } - if (flags & FLAG_STEAL_VM) - VIR_STEAL_PTR(info->vm, vm); - cleanup: VIR_FREE(log); VIR_FREE(actualargv); @@ -781,7 +743,7 @@ mymain(void) do { \ static struct testInfo info = { \ name, "." suffix, NULL, migrateFrom, migrateFrom ? 7 : -1,\ - (flags | FLAG_REAL_CAPS), parseFlags, NULL \ + (flags | FLAG_REAL_CAPS), parseFlags, \ }; \ if (!(info.qemuCaps = qemuTestParseCapabilitiesArch(virArchFromString(arch), \ capsfile))) \ @@ -792,7 +754,6 @@ mymain(void) testCompareXMLToArgv, &info) < 0) \ ret = -1; \ virObjectUnref(info.qemuCaps); \ - virObjectUnref(info.vm); \ } while (0) # define TEST_CAPS_PATH abs_srcdir "/qemucapabilitiesdata/caps_" @@ -838,7 +799,6 @@ mymain(void) do { \ static struct testInfo info = { \ name, NULL, NULL, migrateFrom, migrateFd, (flags), parseFlags, \ - NULL \ }; \ if (testInitQEMUCaps(&info, gic) < 0) \ return EXIT_FAILURE; \ @@ -846,12 +806,7 @@ mymain(void) if (virTestRun("QEMU XML-2-ARGV " name, \ testCompareXMLToArgv, &info) < 0) \ ret = -1; \ - if (((flags) & FLAG_STEAL_VM) && \ - virTestRun("QEMU XML-2-startup-XML " name, \ - testCompareXMLToStartupXML, &info) < 0) \ - ret = -1; \ virObjectUnref(info.qemuCaps); \ - virObjectUnref(info.vm); \ } while (0) # define DO_TEST(name, ...) \ @@ -860,9 +815,6 @@ mymain(void) # define DO_TEST_GIC(name, gic, ...) \ DO_TEST_FULL(name, NULL, -1, 0, 0, gic, __VA_ARGS__) -# define DO_TEST_WITH_STARTUP(name, ...) \ - DO_TEST_FULL(name, NULL, -1, FLAG_STEAL_VM, 0, GIC_NONE, __VA_ARGS__) - # define DO_TEST_FAILURE(name, ...) \ DO_TEST_FULL(name, NULL, -1, FLAG_EXPECT_FAILURE, \ 0, GIC_NONE, __VA_ARGS__) -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:45PM +0100, Peter Krempa wrote:
A lot of code with no real impact and popularity. Remove all the helpers now that the only test case is gone.
Bye, machinery!
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/Makefile.am | 1 - tests/qemuxml2argvtest.c | 54 +++------------------------------------- 2 files changed, 3 insertions(+), 52 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
The tests are for the same feature. Move all the cases to 'disk-shared' case as it's already using DO_TEST_CAPS_LATEST Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../qemuxml2argvdata/disk-shared-locking.args | 34 --------------- .../qemuxml2argvdata/disk-shared-locking.xml | 42 ------------------- .../disk-shared.x86_64-2.12.0.args | 9 +++- .../disk-shared.x86_64-latest.args | 9 +++- tests/qemuxml2argvdata/disk-shared.xml | 14 +++++++ tests/qemuxml2argvtest.c | 2 - 6 files changed, 30 insertions(+), 80 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-shared-locking.args delete mode 100644 tests/qemuxml2argvdata/disk-shared-locking.xml diff --git a/tests/qemuxml2argvdata/disk-shared-locking.args b/tests/qemuxml2argvdata/disk-shared-locking.args deleted file mode 100644 index 9ced336ec4..0000000000 --- a/tests/qemuxml2argvdata/disk-shared-locking.args +++ /dev/null @@ -1,34 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ --usb \ --drive file=/dev/ide,format=raw,if=none,id=drive-ide0-0-0,cache=none \ --device ide-drive,bus=ide.0,unit=0,share-rw=on,drive=drive-ide0-0-0,\ -id=ide0-0-0,bootindex=1 \ --drive file=/dev/scsi,format=raw,if=none,id=drive-scsi0-0-0-0,cache=none \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,share-rw=on,\ -drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 \ --drive file=/dev/virtio,format=raw,if=none,id=drive-virtio-disk0,cache=none \ --device virtio-blk-pci,bus=pci.0,addr=0x4,share-rw=on,drive=drive-virtio-disk0,\ -id=virtio-disk0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/disk-shared-locking.xml b/tests/qemuxml2argvdata/disk-shared-locking.xml deleted file mode 100644 index dd48857a30..0000000000 --- a/tests/qemuxml2argvdata/disk-shared-locking.xml +++ /dev/null @@ -1,42 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/ide'/> - <target dev='hda' bus='ide'/> - <shareable/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/scsi'/> - <target dev='sda' bus='scsi'/> - <shareable/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/virtio'/> - <target dev='vda' bus='virtio'/> - <shareable/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='scsi' index='0' model='virtio-scsi'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args index 96d8063abb..15c3b75df1 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args @@ -24,6 +24,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -no-acpi \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0,\ cache=none \ -device ide-hd,bus=ide.0,unit=0,share-rw=on,drive=drive-ide0-0-0,id=ide0-0-0,\ @@ -31,7 +32,13 @@ bootindex=1,write-cache=on,serial=XYZXYZXYZYXXYZYZYXYZY \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,\ readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-drive file=/dev/scsi,format=raw,if=none,id=drive-scsi0-0-0-0,cache=none \ +-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,share-rw=on,\ +drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,write-cache=on \ +-drive file=/dev/virtio,format=raw,if=none,id=drive-virtio-disk0,cache=none \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,share-rw=on,\ +drive=drive-virtio-disk0,id=virtio-disk0,write-cache=on \ +-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-shared.x86_64-latest.args b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args index 15f8c6b3d7..4913d1ed20 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args @@ -24,6 +24,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -no-acpi \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0,\ cache=none \ -device ide-hd,bus=ide.0,unit=0,share-rw=on,drive=drive-ide0-0-0,id=ide0-0-0,\ @@ -31,7 +32,13 @@ bootindex=1,write-cache=on,serial=XYZXYZXYZYXXYZYZYXYZY \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,\ readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-drive file=/dev/scsi,format=raw,if=none,id=drive-scsi0-0-0-0,cache=none \ +-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,share-rw=on,\ +drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,write-cache=on \ +-drive file=/dev/virtio,format=raw,if=none,id=drive-virtio-disk0,cache=none \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,share-rw=on,\ +drive=drive-virtio-disk0,id=virtio-disk0,write-cache=on \ +-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-shared.xml b/tests/qemuxml2argvdata/disk-shared.xml index 677c2b0b7d..ec351ee1ae 100644 --- a/tests/qemuxml2argvdata/disk-shared.xml +++ b/tests/qemuxml2argvdata/disk-shared.xml @@ -29,8 +29,22 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/scsi'/> + <target dev='sda' bus='scsi'/> + <shareable/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/virtio'/> + <target dev='vda' bus='virtio'/> + <shareable/> + </disk> <controller type='usb' index='0'/> <controller type='ide' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi'/> <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 046c28c4b8..b7d313d215 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1060,8 +1060,6 @@ mymain(void) DO_TEST_CAPS_VER("disk-shared", "2.12.0"); DO_TEST_CAPS_LATEST("disk-shared"); DO_TEST_PARSE_ERROR("disk-shared-qcow", NONE); - DO_TEST("disk-shared-locking", - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DISK_SHARE_RW); DO_TEST("disk-error-policy", NONE); DO_TEST_CAPS_VER("disk-error-policy", "2.12.0"); DO_TEST_CAPS_LATEST("disk-error-policy"); -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:46PM +0100, Peter Krempa wrote:
The tests are for the same feature. Move all the cases to 'disk-shared' case as it's already using DO_TEST_CAPS_LATEST
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../qemuxml2argvdata/disk-shared-locking.args | 34 --------------- .../qemuxml2argvdata/disk-shared-locking.xml | 42 ------------------- .../disk-shared.x86_64-2.12.0.args | 9 +++- .../disk-shared.x86_64-latest.args | 9 +++- tests/qemuxml2argvdata/disk-shared.xml | 14 +++++++ tests/qemuxml2argvtest.c | 2 - 6 files changed, 30 insertions(+), 80 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-shared-locking.args delete mode 100644 tests/qemuxml2argvdata/disk-shared-locking.xml
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Drop the 'device' suffix which is quite pointless. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../qemuxml2argvdata/{disk-scsi-device.args => disk-scsi.args} | 0 tests/qemuxml2argvdata/{disk-scsi-device.xml => disk-scsi.xml} | 0 tests/qemuxml2argvtest.c | 2 +- .../qemuxml2xmloutdata/{disk-scsi-device.xml => disk-scsi.xml} | 0 tests/qemuxml2xmltest.c | 3 +-- 5 files changed, 2 insertions(+), 3 deletions(-) rename tests/qemuxml2argvdata/{disk-scsi-device.args => disk-scsi.args} (100%) rename tests/qemuxml2argvdata/{disk-scsi-device.xml => disk-scsi.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-scsi-device.xml => disk-scsi.xml} (100%) diff --git a/tests/qemuxml2argvdata/disk-scsi-device.args b/tests/qemuxml2argvdata/disk-scsi.args similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi-device.args rename to tests/qemuxml2argvdata/disk-scsi.args diff --git a/tests/qemuxml2argvdata/disk-scsi-device.xml b/tests/qemuxml2argvdata/disk-scsi.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi-device.xml rename to tests/qemuxml2argvdata/disk-scsi.xml diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b7d313d215..e2f3230c59 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1114,7 +1114,7 @@ mymain(void) QEMU_CAPS_USB_STORAGE_REMOVABLE); DO_TEST_FAILURE("disk-usb-pci", QEMU_CAPS_DEVICE_USB_STORAGE); - DO_TEST("disk-scsi-device", + DO_TEST("disk-scsi", QEMU_CAPS_SCSI_LSI); DO_TEST_CAPS_VER("disk-scsi-device-auto", "1.5.3"); DO_TEST_CAPS_LATEST("disk-scsi-device-auto"); diff --git a/tests/qemuxml2xmloutdata/disk-scsi-device.xml b/tests/qemuxml2xmloutdata/disk-scsi.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-scsi-device.xml rename to tests/qemuxml2xmloutdata/disk-scsi.xml diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 7b755de39f..fc8ed318b8 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -364,8 +364,7 @@ mymain(void) DO_TEST("disk-network-sheepdog", NONE); DO_TEST("disk-network-vxhs", NONE); DO_TEST("disk-network-tlsx509", NONE); - DO_TEST("disk-scsi-device", - QEMU_CAPS_SCSI_LSI); + DO_TEST("disk-scsi", QEMU_CAPS_SCSI_LSI); DO_TEST("disk-scsi-vscsi", NONE); DO_TEST("disk-virtio-scsi-reservations", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_PR_MANAGER_HELPER); -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:47PM +0100, Peter Krempa wrote:
Drop the 'device' suffix which is quite pointless.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../qemuxml2argvdata/{disk-scsi-device.args => disk-scsi.args} | 0 tests/qemuxml2argvdata/{disk-scsi-device.xml => disk-scsi.xml} | 0 tests/qemuxml2argvtest.c | 2 +- .../qemuxml2xmloutdata/{disk-scsi-device.xml => disk-scsi.xml} | 0 tests/qemuxml2xmltest.c | 3 +-- 5 files changed, 2 insertions(+), 3 deletions(-) rename tests/qemuxml2argvdata/{disk-scsi-device.args => disk-scsi.args} (100%) rename tests/qemuxml2argvdata/{disk-scsi-device.xml => disk-scsi.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-scsi-device.xml => disk-scsi.xml} (100%)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Use DO_TEST_CAPS_LATEST rather than a predetermined set of caps. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/disk-scsi.args | 30 ---------------- .../disk-scsi.x86_64-latest.args | 35 +++++++++++++++++++ tests/qemuxml2argvtest.c | 3 +- 3 files changed, 36 insertions(+), 32 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-scsi.args create mode 100644 tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-scsi.args b/tests/qemuxml2argvdata/disk-scsi.args deleted file mode 100644 index c28a7b87be..0000000000 --- a/tests/qemuxml2argvdata/disk-scsi.args +++ /dev/null @@ -1,30 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --device lsi,id=scsi0,bus=pci.0,addr=0x3 \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ --drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-0 \ --device scsi-disk,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args new file mode 100644 index 0000000000..549a162808 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-device lsi,id=scsi0,bus=pci.0,addr=0x2 \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ +-drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-0 \ +-device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \ +-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 e2f3230c59..6e6c95ecd1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1114,8 +1114,7 @@ mymain(void) QEMU_CAPS_USB_STORAGE_REMOVABLE); DO_TEST_FAILURE("disk-usb-pci", QEMU_CAPS_DEVICE_USB_STORAGE); - DO_TEST("disk-scsi", - QEMU_CAPS_SCSI_LSI); + DO_TEST_CAPS_LATEST("disk-scsi"); DO_TEST_CAPS_VER("disk-scsi-device-auto", "1.5.3"); DO_TEST_CAPS_LATEST("disk-scsi-device-auto"); DO_TEST("disk-scsi-disk-split", -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:48PM +0100, Peter Krempa wrote:
Use DO_TEST_CAPS_LATEST rather than a predetermined set of caps.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/disk-scsi.args | 30 ---------------- .../disk-scsi.x86_64-latest.args | 35 +++++++++++++++++++ tests/qemuxml2argvtest.c | 3 +- 3 files changed, 36 insertions(+), 32 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-scsi.args create mode 100644 tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
As we support multiple scsi controllers there's no need to have a special test for this controller. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/disk-scsi-megasas.args | 31 ------------- tests/qemuxml2argvdata/disk-scsi-megasas.xml | 35 --------------- .../disk-scsi.x86_64-latest.args | 6 ++- tests/qemuxml2argvdata/disk-scsi.xml | 6 +++ tests/qemuxml2argvtest.c | 2 - .../qemuxml2xmloutdata/disk-scsi-megasas.xml | 45 ------------------- tests/qemuxml2xmloutdata/disk-scsi.xml | 11 ++++- tests/qemuxml2xmltest.c | 4 +- 8 files changed, 22 insertions(+), 118 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-scsi-megasas.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-megasas.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-scsi-megasas.xml diff --git a/tests/qemuxml2argvdata/disk-scsi-megasas.args b/tests/qemuxml2argvdata/disk-scsi-megasas.args deleted file mode 100644 index e2d580827f..0000000000 --- a/tests/qemuxml2argvdata/disk-scsi-megasas.args +++ /dev/null @@ -1,31 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --device megasas,id=scsi0,bus=pci.0,addr=0x3 \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ --drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-4-0 \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,\ -drive=drive-scsi0-0-4-0,id=scsi0-0-4-0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/disk-scsi-megasas.xml b/tests/qemuxml2argvdata/disk-scsi-megasas.xml deleted file mode 100644 index 2ada09f51c..0000000000 --- a/tests/qemuxml2argvdata/disk-scsi-megasas.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-i686</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='file' device='disk'> - <source file='/tmp/scsidisk.img'/> - <target dev='sda' bus='scsi'/> - <address type='drive' controller='0' bus='0' target='4' unit='0'/> - </disk> - <controller type='ide' index='0'/> - <controller type='scsi' index='0' model='lsisas1078'/> - <controller type='usb' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args index 549a162808..65ff7979eb 100644 --- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args @@ -25,11 +25,15 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -device lsi,id=scsi0,bus=pci.0,addr=0x2 \ +-device megasas,id=scsi1,bus=pci.0,addr=0x3 \ -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/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-0 \ -device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ +-drive file=/tmp/scsidisk2.img,format=raw,if=none,id=drive-scsi1-0-0-0 \ +-device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,\ +id=scsi1-0-0-0 \ +-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.xml b/tests/qemuxml2argvdata/disk-scsi.xml index 4d17952fae..3318dc277c 100644 --- a/tests/qemuxml2argvdata/disk-scsi.xml +++ b/tests/qemuxml2argvdata/disk-scsi.xml @@ -24,9 +24,15 @@ <target dev='sda' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> + <disk type='file' device='disk'> + <source file='/tmp/scsidisk2.img'/> + <target dev='sdb' bus='scsi'/> + <address type='drive' controller='1' bus='0' target='0' unit='0'/> + </disk> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='scsi' index='0' model='lsilogic'/> + <controller type='scsi' index='1' model='lsisas1078'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6e6c95ecd1..a3c93ceb0d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1130,8 +1130,6 @@ mymain(void) QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-scsi-vscsi", NONE); DO_TEST_CAPS_LATEST("controller-virtio-scsi"); - DO_TEST("disk-scsi-megasas", - QEMU_CAPS_SCSI_MEGASAS); DO_TEST("disk-scsi-mptsas1068", QEMU_CAPS_SCSI_MPTSAS1068, QEMU_CAPS_SCSI_DISK_WWN); diff --git a/tests/qemuxml2xmloutdata/disk-scsi-megasas.xml b/tests/qemuxml2xmloutdata/disk-scsi-megasas.xml deleted file mode 100644 index 3453f1f750..0000000000 --- a/tests/qemuxml2xmloutdata/disk-scsi-megasas.xml +++ /dev/null @@ -1,45 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='/tmp/scsidisk.img'/> - <target dev='sda' bus='scsi'/> - <address type='drive' controller='0' bus='0' target='4' unit='0'/> - </disk> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='scsi' index='0' model='lsisas1078'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </controller> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </memballoon> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-scsi.xml b/tests/qemuxml2xmloutdata/disk-scsi.xml index c1b44a54a1..315f1cbf14 100644 --- a/tests/qemuxml2xmloutdata/disk-scsi.xml +++ b/tests/qemuxml2xmloutdata/disk-scsi.xml @@ -26,6 +26,12 @@ <target dev='sda' bus='scsi'/> <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/scsidisk2.img'/> + <target dev='sdb' bus='scsi'/> + <address type='drive' controller='1' bus='0' target='0' unit='0'/> + </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> @@ -35,11 +41,14 @@ <controller type='scsi' index='0' model='lsilogic'> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </controller> + <controller type='scsi' index='1' model='lsisas1078'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </controller> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </memballoon> </devices> </domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index fc8ed318b8..a501575066 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -364,7 +364,7 @@ mymain(void) DO_TEST("disk-network-sheepdog", NONE); DO_TEST("disk-network-vxhs", NONE); DO_TEST("disk-network-tlsx509", NONE); - DO_TEST("disk-scsi", QEMU_CAPS_SCSI_LSI); + DO_TEST("disk-scsi", QEMU_CAPS_SCSI_LSI, QEMU_CAPS_SCSI_MEGASAS); DO_TEST("disk-scsi-vscsi", NONE); DO_TEST("disk-virtio-scsi-reservations", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_PR_MANAGER_HELPER); @@ -372,8 +372,6 @@ mymain(void) DO_TEST("disk-virtio-s390-zpci", QEMU_CAPS_DEVICE_ZPCI, QEMU_CAPS_CCW); - DO_TEST("disk-scsi-megasas", - QEMU_CAPS_SCSI_MEGASAS); DO_TEST("disk-scsi-mptsas1068", QEMU_CAPS_SCSI_MPTSAS1068, QEMU_CAPS_SCSI_DISK_WWN); -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:49PM +0100, Peter Krempa wrote:
As we support multiple scsi controllers there's no need to have a special test for this controller.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/disk-scsi-megasas.args | 31 ------------- tests/qemuxml2argvdata/disk-scsi-megasas.xml | 35 --------------- .../disk-scsi.x86_64-latest.args | 6 ++- tests/qemuxml2argvdata/disk-scsi.xml | 6 +++ tests/qemuxml2argvtest.c | 2 - .../qemuxml2xmloutdata/disk-scsi-megasas.xml | 45 ------------------- tests/qemuxml2xmloutdata/disk-scsi.xml | 11 ++++- tests/qemuxml2xmltest.c | 4 +- 8 files changed, 22 insertions(+), 118 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-scsi-megasas.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-megasas.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-scsi-megasas.xml
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
As we support multiple scsi controllers there's no need to have a special test for this controller. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../disk-scsi-mptsas1068.args | 31 ------------- .../qemuxml2argvdata/disk-scsi-mptsas1068.xml | 36 --------------- .../disk-scsi.x86_64-latest.args | 6 ++- tests/qemuxml2argvdata/disk-scsi.xml | 7 +++ tests/qemuxml2argvtest.c | 3 -- .../disk-scsi-mptsas1068.xml | 46 ------------------- tests/qemuxml2xmloutdata/disk-scsi.xml | 12 ++++- tests/qemuxml2xmltest.c | 6 +-- 8 files changed, 25 insertions(+), 122 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-scsi-mptsas1068.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-mptsas1068.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml diff --git a/tests/qemuxml2argvdata/disk-scsi-mptsas1068.args b/tests/qemuxml2argvdata/disk-scsi-mptsas1068.args deleted file mode 100644 index 0ceddb4d46..0000000000 --- a/tests/qemuxml2argvdata/disk-scsi-mptsas1068.args +++ /dev/null @@ -1,31 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --device mptsas1068,id=scsi0,bus=pci.0,addr=0x3 \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ --drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-4-0 \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,\ -drive=drive-scsi0-0-4-0,id=scsi0-0-4-0,wwn=0x5000c50015ea71ac \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/disk-scsi-mptsas1068.xml b/tests/qemuxml2argvdata/disk-scsi-mptsas1068.xml deleted file mode 100644 index 496f2343de..0000000000 --- a/tests/qemuxml2argvdata/disk-scsi-mptsas1068.xml +++ /dev/null @@ -1,36 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <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'> - <source file='/tmp/scsidisk.img'/> - <target dev='sda' bus='scsi'/> - <address type='drive' controller='0' bus='0' target='4' unit='0'/> - <wwn>5000c50015ea71ac</wwn> - </disk> - <controller type='ide' index='0'/> - <controller type='scsi' index='0' model='lsisas1068'/> - <controller type='usb' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args index 65ff7979eb..1b22e18a18 100644 --- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args @@ -26,6 +26,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -device lsi,id=scsi0,bus=pci.0,addr=0x2 \ -device megasas,id=scsi1,bus=pci.0,addr=0x3 \ +-device mptsas1068,id=scsi2,bus=pci.0,addr=0x4 \ -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/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-0 \ @@ -33,7 +34,10 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -drive file=/tmp/scsidisk2.img,format=raw,if=none,id=drive-scsi1-0-0-0 \ -device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,\ id=scsi1-0-0-0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \ +-drive file=/tmp/scsidisk3.img,format=raw,if=none,id=drive-scsi2-0-0-0 \ +-device scsi-hd,bus=scsi2.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi2-0-0-0,\ +id=scsi2-0-0-0,wwn=0x5000c50015ea71ac \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/disk-scsi.xml b/tests/qemuxml2argvdata/disk-scsi.xml index 3318dc277c..6049ea2069 100644 --- a/tests/qemuxml2argvdata/disk-scsi.xml +++ b/tests/qemuxml2argvdata/disk-scsi.xml @@ -29,10 +29,17 @@ <target dev='sdb' bus='scsi'/> <address type='drive' controller='1' bus='0' target='0' unit='0'/> </disk> + <disk type='file' device='disk'> + <source file='/tmp/scsidisk3.img'/> + <target dev='sdc' bus='scsi'/> + <address type='drive' controller='2' bus='0' target='0' unit='0'/> + <wwn>5000c50015ea71ac</wwn> + </disk> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='scsi' index='0' model='lsilogic'/> <controller type='scsi' index='1' model='lsisas1078'/> + <controller type='scsi' index='2' model='lsisas1068'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a3c93ceb0d..0c4b97615b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1130,9 +1130,6 @@ mymain(void) QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-scsi-vscsi", NONE); DO_TEST_CAPS_LATEST("controller-virtio-scsi"); - DO_TEST("disk-scsi-mptsas1068", - QEMU_CAPS_SCSI_MPTSAS1068, - QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-sata-device", QEMU_CAPS_ICH9_AHCI); DO_TEST("disk-aio", NONE); diff --git a/tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml b/tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml deleted file mode 100644 index e4f4b9e3b1..0000000000 --- a/tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml +++ /dev/null @@ -1,46 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='/tmp/scsidisk.img'/> - <target dev='sda' bus='scsi'/> - <wwn>5000c50015ea71ac</wwn> - <address type='drive' controller='0' bus='0' target='4' unit='0'/> - </disk> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='scsi' index='0' model='lsisas1068'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </controller> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </memballoon> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-scsi.xml b/tests/qemuxml2xmloutdata/disk-scsi.xml index 315f1cbf14..17602b9543 100644 --- a/tests/qemuxml2xmloutdata/disk-scsi.xml +++ b/tests/qemuxml2xmloutdata/disk-scsi.xml @@ -32,6 +32,13 @@ <target dev='sdb' bus='scsi'/> <address type='drive' controller='1' bus='0' target='0' unit='0'/> </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/tmp/scsidisk3.img'/> + <target dev='sdc' bus='scsi'/> + <wwn>5000c50015ea71ac</wwn> + <address type='drive' controller='2' bus='0' target='0' unit='0'/> + </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> @@ -44,11 +51,14 @@ <controller type='scsi' index='1' model='lsisas1078'> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> + <controller type='scsi' index='2' model='lsisas1068'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </controller> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </memballoon> </devices> </domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index a501575066..ee3a40bd2c 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -364,7 +364,8 @@ mymain(void) DO_TEST("disk-network-sheepdog", NONE); DO_TEST("disk-network-vxhs", NONE); DO_TEST("disk-network-tlsx509", NONE); - DO_TEST("disk-scsi", QEMU_CAPS_SCSI_LSI, QEMU_CAPS_SCSI_MEGASAS); + DO_TEST("disk-scsi", QEMU_CAPS_SCSI_LSI, QEMU_CAPS_SCSI_MEGASAS, + QEMU_CAPS_SCSI_MPTSAS1068, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-scsi-vscsi", NONE); DO_TEST("disk-virtio-scsi-reservations", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_PR_MANAGER_HELPER); @@ -372,9 +373,6 @@ mymain(void) DO_TEST("disk-virtio-s390-zpci", QEMU_CAPS_DEVICE_ZPCI, QEMU_CAPS_CCW); - DO_TEST("disk-scsi-mptsas1068", - QEMU_CAPS_SCSI_MPTSAS1068, - QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-mirror-old", NONE); DO_TEST("disk-mirror", NONE); DO_TEST_FULL("disk-active-commit", WHEN_ACTIVE, GIC_NONE, NONE); -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:50PM +0100, Peter Krempa wrote:
As we support multiple scsi controllers there's no need to have a special test for this controller.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../disk-scsi-mptsas1068.args | 31 ------------- .../qemuxml2argvdata/disk-scsi-mptsas1068.xml | 36 --------------- .../disk-scsi.x86_64-latest.args | 6 ++- tests/qemuxml2argvdata/disk-scsi.xml | 7 +++ tests/qemuxml2argvtest.c | 3 -- .../disk-scsi-mptsas1068.xml | 46 ------------------- tests/qemuxml2xmloutdata/disk-scsi.xml | 12 ++++- tests/qemuxml2xmltest.c | 6 +-- 8 files changed, 25 insertions(+), 122 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-scsi-mptsas1068.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-mptsas1068.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
As we support multiple scsi controllers there's no need to have a special test for this controller. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/disk-scsi-vscsi.args | 31 ------------- tests/qemuxml2argvdata/disk-scsi-vscsi.xml | 35 --------------- .../disk-scsi.x86_64-latest.args | 4 ++ tests/qemuxml2argvdata/disk-scsi.xml | 6 +++ tests/qemuxml2argvtest.c | 1 - tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml | 45 ------------------- tests/qemuxml2xmloutdata/disk-scsi.xml | 9 ++++ tests/qemuxml2xmltest.c | 1 - 8 files changed, 19 insertions(+), 113 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-scsi-vscsi.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-vscsi.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml diff --git a/tests/qemuxml2argvdata/disk-scsi-vscsi.args b/tests/qemuxml2argvdata/disk-scsi-vscsi.args deleted file mode 100644 index b733f0ebf3..0000000000 --- a/tests/qemuxml2argvdata/disk-scsi-vscsi.args +++ /dev/null @@ -1,31 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --device spapr-vscsi,id=scsi0,reg=0x2000 \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ --drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-3-0 \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=3,lun=0,\ -drive=drive-scsi0-0-3-0,id=scsi0-0-3-0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-scsi-vscsi.xml b/tests/qemuxml2argvdata/disk-scsi-vscsi.xml deleted file mode 100644 index 3cb74d4725..0000000000 --- a/tests/qemuxml2argvdata/disk-scsi-vscsi.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-i686</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='file' device='disk'> - <source file='/tmp/scsidisk.img'/> - <target dev='sda' bus='scsi'/> - <address type='drive' controller='0' bus='0' target='3' unit='0'/> - </disk> - <controller type='ide' index='0'/> - <controller type='scsi' index='0' model='ibmvscsi'/> - <controller type='usb' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args index 1b22e18a18..ac9f3ff02e 100644 --- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args @@ -27,6 +27,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device lsi,id=scsi0,bus=pci.0,addr=0x2 \ -device megasas,id=scsi1,bus=pci.0,addr=0x3 \ -device mptsas1068,id=scsi2,bus=pci.0,addr=0x4 \ +-device spapr-vscsi,id=scsi3,reg=0x2000 \ -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/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-0 \ @@ -37,6 +38,9 @@ id=scsi1-0-0-0 \ -drive file=/tmp/scsidisk3.img,format=raw,if=none,id=drive-scsi2-0-0-0 \ -device scsi-hd,bus=scsi2.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi2-0-0-0,\ id=scsi2-0-0-0,wwn=0x5000c50015ea71ac \ +-drive file=/tmp/scsidisk4.img,format=raw,if=none,id=drive-scsi3-0-0-0 \ +-device scsi-hd,bus=scsi3.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi3-0-0-0,\ +id=scsi3-0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/disk-scsi.xml b/tests/qemuxml2argvdata/disk-scsi.xml index 6049ea2069..496d8cab39 100644 --- a/tests/qemuxml2argvdata/disk-scsi.xml +++ b/tests/qemuxml2argvdata/disk-scsi.xml @@ -35,11 +35,17 @@ <address type='drive' controller='2' bus='0' target='0' unit='0'/> <wwn>5000c50015ea71ac</wwn> </disk> + <disk type='file' device='disk'> + <source file='/tmp/scsidisk4.img'/> + <target dev='sdd' bus='scsi'/> + <address type='drive' controller='3' bus='0' target='0' unit='0'/> + </disk> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='scsi' index='0' model='lsilogic'/> <controller type='scsi' index='1' model='lsisas1078'/> <controller type='scsi' index='2' model='lsisas1068'/> + <controller type='scsi' index='3' model='ibmvscsi'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0c4b97615b..705327a046 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1128,7 +1128,6 @@ mymain(void) DO_TEST_FAILURE("disk-scsi-disk-vpd-build-error", QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); - DO_TEST("disk-scsi-vscsi", NONE); DO_TEST_CAPS_LATEST("controller-virtio-scsi"); DO_TEST("disk-sata-device", QEMU_CAPS_ICH9_AHCI); diff --git a/tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml b/tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml deleted file mode 100644 index 5f0cc50674..0000000000 --- a/tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml +++ /dev/null @@ -1,45 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='/tmp/scsidisk.img'/> - <target dev='sda' bus='scsi'/> - <address type='drive' controller='0' bus='0' target='3' unit='0'/> - </disk> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='scsi' index='0' model='ibmvscsi'> - <address type='spapr-vio' reg='0x2000'/> - </controller> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </memballoon> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-scsi.xml b/tests/qemuxml2xmloutdata/disk-scsi.xml index 17602b9543..96c0cfec74 100644 --- a/tests/qemuxml2xmloutdata/disk-scsi.xml +++ b/tests/qemuxml2xmloutdata/disk-scsi.xml @@ -39,6 +39,12 @@ <wwn>5000c50015ea71ac</wwn> <address type='drive' controller='2' bus='0' target='0' unit='0'/> </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/tmp/scsidisk4.img'/> + <target dev='sdd' bus='scsi'/> + <address type='drive' controller='3' bus='0' target='0' unit='0'/> + </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> @@ -54,6 +60,9 @@ <controller type='scsi' index='2' model='lsisas1068'> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </controller> + <controller type='scsi' index='3' model='ibmvscsi'> + <address type='spapr-vio' reg='0x2000'/> + </controller> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index ee3a40bd2c..a4981affe8 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -366,7 +366,6 @@ mymain(void) DO_TEST("disk-network-tlsx509", NONE); DO_TEST("disk-scsi", QEMU_CAPS_SCSI_LSI, QEMU_CAPS_SCSI_MEGASAS, QEMU_CAPS_SCSI_MPTSAS1068, QEMU_CAPS_SCSI_DISK_WWN); - DO_TEST("disk-scsi-vscsi", NONE); DO_TEST("disk-virtio-scsi-reservations", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_PR_MANAGER_HELPER); DO_TEST("controller-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI); -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:51PM +0100, Peter Krempa wrote:
As we support multiple scsi controllers there's no need to have a special test for this controller.
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
In the commit summary: s/mptsas1068/vscsi/g
--- tests/qemuxml2argvdata/disk-scsi-vscsi.args | 31 ------------- tests/qemuxml2argvdata/disk-scsi-vscsi.xml | 35 --------------- .../disk-scsi.x86_64-latest.args | 4 ++ tests/qemuxml2argvdata/disk-scsi.xml | 6 +++ tests/qemuxml2argvtest.c | 1 - tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml | 45 ------------------- tests/qemuxml2xmloutdata/disk-scsi.xml | 9 ++++ tests/qemuxml2xmltest.c | 1 - 8 files changed, 19 insertions(+), 113 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-scsi-vscsi.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-vscsi.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Rather than testing random set of flags add a case also for the oldest supported qemu. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...k-cache.args => disk-cache.x86_64-1.5.3.args} | 16 +++++++++------- tests/qemuxml2argvtest.c | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) rename tests/qemuxml2argvdata/{disk-cache.args => disk-cache.x86_64-1.5.3.args} (72%) diff --git a/tests/qemuxml2argvdata/disk-cache.args b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args similarity index 72% rename from tests/qemuxml2argvdata/disk-cache.args rename to tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args index a136201ffd..288d0aa43c 100644 --- a/tests/qemuxml2argvdata/disk-cache.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args @@ -9,6 +9,7 @@ QEMU_AUDIO_DRV=none \ -S \ -machine pc-i440fx-2.6,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 \ @@ -20,22 +21,23 @@ server,nowait \ -rtc base=utc \ -no-shutdown \ -no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -device lsi,id=scsi0,bus=pci.0,addr=0x3 \ --usb \ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\ cache=writeback \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-1,\ cache=unsafe \ --device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ +-device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-scsi0-0-0,\ cache=none \ --device scsi-disk,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \ +-device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-virtio-disk0,\ cache=writethrough \ --device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ id=virtio-disk0 \ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-usb-disk1,\ cache=directsync \ --device usb-storage,bus=usb.0,port=1,drive=drive-usb-disk1,id=usb-disk1 +-device usb-storage,bus=usb.0,port=1,drive=drive-usb-disk1,id=usb-disk1,\ +removable=off diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 705327a046..d99b9acdc8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1063,7 +1063,7 @@ mymain(void) DO_TEST("disk-error-policy", NONE); DO_TEST_CAPS_VER("disk-error-policy", "2.12.0"); DO_TEST_CAPS_LATEST("disk-error-policy"); - DO_TEST("disk-cache", QEMU_CAPS_SCSI_LSI, QEMU_CAPS_DEVICE_USB_STORAGE); + DO_TEST_CAPS_VER("disk-cache", "1.5.3"); DO_TEST_CAPS_VER("disk-cache", "2.6.0"); DO_TEST_CAPS_VER("disk-cache", "2.7.0"); DO_TEST_CAPS_VER("disk-cache", "2.12.0"); -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:52PM +0100, Peter Krempa wrote:
Rather than testing random set of flags add a case also for the oldest supported qemu.
s/very old state in/the oldest case of/ or something sensible
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...k-cache.args => disk-cache.x86_64-1.5.3.args} | 16 +++++++++------- tests/qemuxml2argvtest.c | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) rename tests/qemuxml2argvdata/{disk-cache.args => disk-cache.x86_64-1.5.3.args} (72%)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Use DO_TEST_CAPS_LATEST to obtain actual results. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...threads-virtio-scsi-ccw.s390x-latest.args} | 20 ++++++++++------ ...hreads-virtio-scsi-pci.x86_64-latest.args} | 23 +++++++++++-------- tests/qemuxml2argvtest.c | 8 ++----- 3 files changed, 29 insertions(+), 22 deletions(-) rename tests/qemuxml2argvdata/{iothreads-virtio-scsi-ccw.args => iothreads-virtio-scsi-ccw.s390x-latest.args} (58%) rename tests/qemuxml2argvdata/{iothreads-virtio-scsi-pci.args => iothreads-virtio-scsi-pci.x86_64-latest.args} (57%) diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args similarity index 58% rename from tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.args rename to tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args index 08d38942f6..1c5be88a47 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args @@ -5,10 +5,13 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ --name QEMUGuest1 \ +-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 \ -object iothread,id=iothread1 \ -object iothread,id=iothread2 \ @@ -16,16 +19,19 @@ QEMU_AUDIO_DRV=none \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ +-boot strict=on \ -device virtio-scsi-ccw,iothread=iothread2,id=scsi0,devno=fe.0.0001 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ --device virtio-blk-ccw,iothread=iothread1,devno=fe.0.0000,\ +-device virtio-blk-ccw,iothread=iothread1,scsi=off,devno=fe.0.0000,\ drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi0-0-2-0 \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=2,lun=0,\ -drive=drive-scsi0-0-2-0,id=scsi0-0-2-0 \ --device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a +-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=2,lun=0,drive=drive-scsi0-0-2-0,\ +id=scsi0-0-2-0 \ +-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/iothreads-virtio-scsi-pci.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args similarity index 57% rename from tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.args rename to tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args index ee346516cb..4513edcdd0 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args @@ -5,10 +5,13 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ +-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 2,sockets=2,cores=1,threads=1 \ -object iothread,id=iothread1 \ -object iothread,id=iothread2 \ @@ -16,22 +19,24 @@ QEMU_AUDIO_DRV=none \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ -no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -device virtio-scsi-pci,iothread=iothread2,id=scsi0,bus=pci.0,addr=0xb \ --usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -drive file=/var/lib/libvirt/images/iothrtest1.img,format=raw,if=none,\ id=drive-virtio-disk1 \ --device virtio-blk-pci,iothread=iothread1,bus=pci.0,addr=0x4,\ +-device virtio-blk-pci,iothread=iothread1,scsi=off,bus=pci.0,addr=0x4,\ drive=drive-virtio-disk1,id=virtio-disk1 \ -drive file=/var/lib/libvirt/images/iothrtest2.img,format=raw,if=none,\ id=drive-scsi0-0-0-3 \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=3,\ -drive=drive-scsi0-0-0-3,id=scsi0-0-0-3 +-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=3,drive=drive-scsi0-0-0-3,\ +id=scsi0-0-0-3 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d99b9acdc8..acdf750102 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1691,12 +1691,8 @@ mymain(void) DO_TEST("iothreads-disk", QEMU_CAPS_OBJECT_IOTHREAD); DO_TEST("iothreads-disk-virtio-ccw", QEMU_CAPS_OBJECT_IOTHREAD, QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST("iothreads-virtio-scsi-pci", QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_OBJECT_IOTHREAD, - QEMU_CAPS_VIRTIO_SCSI_IOTHREAD); - DO_TEST("iothreads-virtio-scsi-ccw", QEMU_CAPS_OBJECT_IOTHREAD, - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI_IOTHREAD, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + DO_TEST_CAPS_LATEST("iothreads-virtio-scsi-pci"); + DO_TEST_CAPS_ARCH_LATEST("iothreads-virtio-scsi-ccw", "s390x"); DO_TEST("cpu-topology1", NONE); DO_TEST("cpu-topology2", NONE); -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:53PM +0100, Peter Krempa wrote:
Use DO_TEST_CAPS_LATEST to obtain actual results.
s/actual/modern/
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...threads-virtio-scsi-ccw.s390x-latest.args} | 20 ++++++++++------ ...hreads-virtio-scsi-pci.x86_64-latest.args} | 23 +++++++++++-------- tests/qemuxml2argvtest.c | 8 ++----- 3 files changed, 29 insertions(+), 22 deletions(-) rename tests/qemuxml2argvdata/{iothreads-virtio-scsi-ccw.args => iothreads-virtio-scsi-ccw.s390x-latest.args} (58%) rename tests/qemuxml2argvdata/{iothreads-virtio-scsi-pci.args => iothreads-virtio-scsi-pci.x86_64-latest.args} (57%)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
It's a subset of 'iothreads-virtio-scsi-ccw'. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../disk-virtio-scsi-ccw.args | 29 ----------------- .../qemuxml2argvdata/disk-virtio-scsi-ccw.xml | 31 ------------------- tests/qemuxml2argvtest.c | 2 -- 3 files changed, 62 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ccw.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ccw.xml diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-ccw.args b/tests/qemuxml2argvdata/disk-virtio-scsi-ccw.args deleted file mode 100644 index 66d3cbf47a..0000000000 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-ccw.args +++ /dev/null @@ -1,29 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x \ --name QEMUGuest1 \ --S \ --machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --device virtio-scsi-ccw,id=scsi0,devno=fe.0.0001 \ --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-scsi0-0-4-0 \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,\ -drive=drive-scsi0-0-4-0,id=scsi0-0-4-0 \ --device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-ccw.xml b/tests/qemuxml2argvdata/disk-virtio-scsi-ccw.xml deleted file mode 100644 index 1938b3eaab..0000000000 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-ccw.xml +++ /dev/null @@ -1,31 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> - <vcpu>1</vcpu> - <os> - <type arch='s390x' machine='s390-ccw'>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-s390x</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='vda' bus='virtio'/> - </disk> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest2'/> - <target dev='sda' bus='scsi'/> - <address type='drive' controller='0' bus='0' target='4' unit='0'/> - </disk> - <controller type='scsi' index='0' model='virtio-scsi'/> - <memballoon model='virtio'> - <address type='ccw' cssid='0xFe' ssid='0x0' devno='0xA'/> - </memballoon> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index acdf750102..3c9491982b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1036,8 +1036,6 @@ mymain(void) QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST("disk-virtio-ccw-many", QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST("disk-virtio-scsi-ccw", QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST("disk-virtio-s390-zpci", QEMU_CAPS_DEVICE_ZPCI, QEMU_CAPS_CCW, -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:54PM +0100, Peter Krempa wrote:
It's a subset of 'iothreads-virtio-scsi-ccw'.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../disk-virtio-scsi-ccw.args | 29 ----------------- .../qemuxml2argvdata/disk-virtio-scsi-ccw.xml | 31 ------------------- tests/qemuxml2argvtest.c | 2 -- 3 files changed, 62 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ccw.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ccw.xml
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
The split of scsi-disk into the two separate devices was introduced by qemu commit b443ae67 released in qemu v0.15. All changes to test files are not really related to disk testing thanks to previous refactors. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 19 ++++++------------- .../caps_1.5.3.x86_64.xml | 1 - .../caps_1.6.0.x86_64.xml | 1 - .../caps_1.7.0.x86_64.xml | 1 - .../caps_2.1.1.x86_64.xml | 1 - .../caps_2.10.0.aarch64.xml | 1 - .../caps_2.10.0.ppc64.xml | 1 - .../caps_2.10.0.s390x.xml | 1 - .../caps_2.10.0.x86_64.xml | 1 - .../caps_2.11.0.s390x.xml | 1 - .../caps_2.11.0.x86_64.xml | 1 - .../caps_2.12.0.aarch64.xml | 1 - .../caps_2.12.0.ppc64.xml | 1 - .../caps_2.12.0.s390x.xml | 1 - .../caps_2.12.0.x86_64.xml | 1 - .../caps_2.4.0.x86_64.xml | 1 - .../caps_2.5.0.x86_64.xml | 1 - .../caps_2.6.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - .../caps_2.6.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - .../caps_2.7.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - .../caps_2.8.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - .../caps_2.9.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 - .../caps_3.0.0.riscv32.xml | 1 - .../caps_3.0.0.riscv64.xml | 1 - .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 - .../caps_3.0.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - .../caps_3.1.0.x86_64.xml | 1 - .../caps_4.0.0.riscv32.xml | 1 - .../caps_4.0.0.riscv64.xml | 1 - .../caps_4.0.0.x86_64.xml | 1 - .../aarch64-virtio-pci-manual-addresses.args | 4 ++-- tests/qemuxml2argvdata/bios-nvram-secure.args | 4 ++-- tests/qemuxml2argvdata/machine-smm-opt.args | 4 ++-- .../multifunction-pci-device.args | 2 +- .../pseries-vio-user-assigned.args | 4 ++-- tests/qemuxml2argvdata/pseries-vio.args | 4 ++-- tests/qemuxml2argvtest.c | 11 ++++------- tests/qemuxml2xmltest.c | 6 ++---- 47 files changed, 24 insertions(+), 73 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3d7d05cd99..7033615eb5 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1023,7 +1023,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "qxl", QEMU_CAPS_DEVICE_QXL }, { "sga", QEMU_CAPS_SGA }, { "scsi-block", QEMU_CAPS_SCSI_BLOCK }, - { "scsi-cd", QEMU_CAPS_SCSI_CD }, { "ide-cd", QEMU_CAPS_IDE_CD }, { "VGA", QEMU_CAPS_DEVICE_VGA }, { "cirrus-vga", QEMU_CAPS_DEVICE_CIRRUS_VGA }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 6d5ed8a3cc..f9810bee92 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -174,7 +174,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 90 */ X_QEMU_CAPS_BLOCKJOB_SYNC, /* old block_job_cancel, block_stream */ QEMU_CAPS_BLOCKJOB_ASYNC, /* new block-job-cancel, block-stream */ - QEMU_CAPS_SCSI_CD, /* -device scsi-cd */ + X_QEMU_CAPS_SCSI_CD, /* -device scsi-cd */ QEMU_CAPS_IDE_CD, /* -device ide-cd */ X_QEMU_CAPS_NO_USER_CONFIG, /* -no-user-config */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 374836a35e..d9f64b8097 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1762,13 +1762,10 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, * legacy -drive is used. In modern qemu the 'ide-cd' or 'scsi-cd' are used. * virtio and other just ignore the attribute anyways */ if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) { - if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_CD)) - virBufferAddLit(&opt, ",media=cdrom"); - } else if (disk->bus == VIR_DOMAIN_DISK_BUS_IDE) { + if (disk->bus == VIR_DOMAIN_DISK_BUS_IDE) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_IDE_CD)) virBufferAddLit(&opt, ",media=cdrom"); - } else { + } else if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { virBufferAddLit(&opt, ",media=cdrom"); } } @@ -1995,14 +1992,10 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { virBufferAddLit(&opt, "scsi-block"); } else { - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_CD)) { - if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) - virBufferAddLit(&opt, "scsi-cd"); - else - virBufferAddLit(&opt, "scsi-hd"); - } else { - virBufferAddLit(&opt, "scsi-disk"); - } + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + virBufferAddLit(&opt, "scsi-cd"); + else + virBufferAddLit(&opt, "scsi-hd"); } if (!(contAlias = virDomainControllerAliasFind(def, VIR_DOMAIN_CONTROLLER_TYPE_SCSI, diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 3c9a474b5b..848bc44625 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 528af43a6d..7bc2e6a204 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index ddc06959ca..3fd785ca2e 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 7c65353ba5..3a72b58427 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 9f6676a2b8..a351802e27 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -23,7 +23,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index d4cc446d0b..b470336ac0 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 9c88b919a4..7347eff579 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -13,7 +13,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 2941743f94..f92c84d5a8 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 60d902f1ac..d26506bc62 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -13,7 +13,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index e1584f99d4..cb4d2381d0 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index f58979716d..16c4acfc45 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -23,7 +23,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index e58df048c4..575ed88371 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 60385cc505..154fb44532 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -13,7 +13,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 3d12aba2e8..7e6a8ea264 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index c95f34559b..1f69d1ee71 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 240abd299c..bb30aec3e6 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 801a2e62ad..6f2b8e9a91 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -25,7 +25,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 949f9305c3..2d9cd34e9f 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index f5bca878be..43b9f022e4 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index a667aa7673..e50c83950f 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -13,7 +13,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 5d8ba4ee68..cf880a0a88 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 00c3ff5133..6b975be02f 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -13,7 +13,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 5a6e26cba1..acfcbd673e 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 87f24e2e41..bdf69680ad 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index e197848e4e..7101f155ff 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -13,7 +13,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 871018364f..d2a0d1a8ff 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 971c0665be..1ef7a911fe 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index 1b5d8e6e12..3c2028323f 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -7,7 +7,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index 3c76f6355d..dc5a0fd42a 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -7,7 +7,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index bf889145a0..ecbdbdc716 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -14,7 +14,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index b787bd9acd..a8c17fd4b9 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index d55eb5d981..37c7e3424f 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index db72e873c5..4f74ae70f4 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index 15e447742d..dac5d9d07a 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -25,7 +25,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index 066c892eaa..69f51f166a 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -25,7 +25,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index b8da376b2c..205446ed0e 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args index 3e7ab481af..c7218a50ed 100644 --- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args +++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args @@ -30,8 +30,8 @@ path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.1,addr=0x1 \ -device virtio-scsi-pci,id=scsi0,bus=pci.3,addr=0x1 \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-scsi0-0-0-0 \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ -drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 \ +-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 \ -netdev user,id=hostnet0 \ -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.3,\ addr=0x2 \ diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.args b/tests/qemuxml2argvdata/bios-nvram-secure.args index 9ae30a0708..6d1789aa05 100644 --- a/tests/qemuxml2argvdata/bios-nvram-secure.args +++ b/tests/qemuxml2argvdata/bios-nvram-secure.args @@ -29,6 +29,6 @@ server,nowait \ -device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \ -device virtio-scsi-pci,id=scsi0,bus=pci.2,addr=0x1 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-0-0 \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ -drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 \ +-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 \ -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x2 diff --git a/tests/qemuxml2argvdata/machine-smm-opt.args b/tests/qemuxml2argvdata/machine-smm-opt.args index 25e7ab6372..e4dea21a7c 100644 --- a/tests/qemuxml2argvdata/machine-smm-opt.args +++ b/tests/qemuxml2argvdata/machine-smm-opt.args @@ -25,6 +25,6 @@ server,nowait \ -device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \ -device virtio-scsi-pci,id=scsi0,bus=pci.2,addr=0x1 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-0-0 \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ -drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 \ +-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 \ -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x2 diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/qemuxml2argvdata/multifunction-pci-device.args index e314068699..94e89c411f 100644 --- a/tests/qemuxml2argvdata/multifunction-pci-device.args +++ b/tests/qemuxml2argvdata/multifunction-pci-device.args @@ -31,6 +31,6 @@ server,nowait \ -device lsi,id=scsi8,bus=pci.0,addr=0x4.0x7 \ -usb \ -drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-0 \ --device scsi-disk,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0,\ +-device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0,\ bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args index 5de2646e21..62b98363ef 100644 --- a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args +++ b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args @@ -23,8 +23,8 @@ server,nowait \ -device spapr-vscsi,id=scsi1,reg=0x30000000 \ -usb \ -drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi1-0-0-0 \ --device scsi-disk,bus=scsi1.0,channel=0,scsi-id=0,lun=0,\ -drive=drive-scsi1-0-0-0,id=scsi1-0-0-0,bootindex=1 \ +-device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,\ +id=scsi1-0-0-0,bootindex=1 \ -chardev pty,id=charserial0 \ -device spapr-vty,chardev=charserial0,id=serial0,reg=0x20000000 \ -chardev pty,id=charserial1 \ diff --git a/tests/qemuxml2argvdata/pseries-vio.args b/tests/qemuxml2argvdata/pseries-vio.args index 454f6cffa9..d55272e85b 100644 --- a/tests/qemuxml2argvdata/pseries-vio.args +++ b/tests/qemuxml2argvdata/pseries-vio.args @@ -23,8 +23,8 @@ server,nowait \ -device spapr-vscsi,id=scsi1,reg=0x3000 \ -usb \ -drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi1-0-0-0 \ --device scsi-disk,bus=scsi1.0,channel=0,scsi-id=0,lun=0,\ -drive=drive-scsi1-0-0-0,id=scsi1-0-0-0,bootindex=1 \ +-device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,\ +id=scsi1-0-0-0,bootindex=1 \ -chardev pty,id=charserial0 \ -device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \ -chardev pty,id=charserial1 \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3c9491982b..a873977d81 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1116,16 +1116,13 @@ mymain(void) DO_TEST_CAPS_VER("disk-scsi-device-auto", "1.5.3"); DO_TEST_CAPS_LATEST("disk-scsi-device-auto"); DO_TEST("disk-scsi-disk-split", - QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI); + QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-scsi-disk-wwn", - QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_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_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_DISK_WWN); + QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST_FAILURE("disk-scsi-disk-vpd-build-error", - QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_DISK_WWN); + QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST_CAPS_LATEST("controller-virtio-scsi"); DO_TEST("disk-sata-device", QEMU_CAPS_ICH9_AHCI); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index a4981affe8..370920f926 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -557,11 +557,9 @@ mymain(void) DO_TEST("numad-static-vcpu-no-numatune", NONE); DO_TEST("disk-scsi-lun-passthrough-sgio", - QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_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_CD, QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); + QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-source-pool", NONE); DO_TEST("disk-source-pool-mode", NONE); -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:55PM +0100, Peter Krempa wrote:
The split of scsi-disk into the two separate devices was introduced by qemu commit b443ae67 released in qemu v0.15.
All changes to test files are not really related to disk testing thanks to previous refactors.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 19 ++++++------------- .../caps_1.5.3.x86_64.xml | 1 - .../caps_1.6.0.x86_64.xml | 1 - .../caps_1.7.0.x86_64.xml | 1 - .../caps_2.1.1.x86_64.xml | 1 - .../caps_2.10.0.aarch64.xml | 1 - .../caps_2.10.0.ppc64.xml | 1 - .../caps_2.10.0.s390x.xml | 1 - .../caps_2.10.0.x86_64.xml | 1 - .../caps_2.11.0.s390x.xml | 1 - .../caps_2.11.0.x86_64.xml | 1 - .../caps_2.12.0.aarch64.xml | 1 - .../caps_2.12.0.ppc64.xml | 1 - .../caps_2.12.0.s390x.xml | 1 - .../caps_2.12.0.x86_64.xml | 1 - .../caps_2.4.0.x86_64.xml | 1 - .../caps_2.5.0.x86_64.xml | 1 - .../caps_2.6.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - .../caps_2.6.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - .../caps_2.7.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - .../caps_2.8.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - .../caps_2.9.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 - .../caps_3.0.0.riscv32.xml | 1 - .../caps_3.0.0.riscv64.xml | 1 - .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 - .../caps_3.0.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - .../caps_3.1.0.x86_64.xml | 1 - .../caps_4.0.0.riscv32.xml | 1 - .../caps_4.0.0.riscv64.xml | 1 - .../caps_4.0.0.x86_64.xml | 1 - .../aarch64-virtio-pci-manual-addresses.args | 4 ++-- tests/qemuxml2argvdata/bios-nvram-secure.args | 4 ++-- tests/qemuxml2argvdata/machine-smm-opt.args | 4 ++-- .../multifunction-pci-device.args | 2 +- .../pseries-vio-user-assigned.args | 4 ++-- tests/qemuxml2argvdata/pseries-vio.args | 4 ++-- tests/qemuxml2argvtest.c | 11 ++++------- tests/qemuxml2xmltest.c | 6 ++---- 47 files changed, 24 insertions(+), 73 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
The split of scsi-disk into the two separate devices was introduced by qemu commit 1f56e32a7f4b3 released in qemu v0.15. Note that when compared to the previous commit which made sure that no disk related tests were touched, in this case it's not as careful. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 36 +++++++------------ .../caps_1.5.3.x86_64.xml | 1 - .../caps_1.6.0.x86_64.xml | 1 - .../caps_1.7.0.x86_64.xml | 1 - .../caps_2.1.1.x86_64.xml | 1 - .../caps_2.10.0.aarch64.xml | 1 - .../caps_2.10.0.ppc64.xml | 1 - .../caps_2.10.0.x86_64.xml | 1 - .../caps_2.11.0.x86_64.xml | 1 - .../caps_2.12.0.aarch64.xml | 1 - .../caps_2.12.0.ppc64.xml | 1 - .../caps_2.12.0.x86_64.xml | 1 - .../caps_2.4.0.x86_64.xml | 1 - .../caps_2.5.0.x86_64.xml | 1 - .../caps_2.6.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - .../caps_2.6.0.x86_64.xml | 1 - .../caps_2.7.0.x86_64.xml | 1 - .../caps_2.8.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - .../caps_2.9.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 - .../caps_3.0.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - .../caps_3.1.0.x86_64.xml | 1 - .../caps_4.0.0.riscv32.xml | 1 - .../caps_4.0.0.riscv64.xml | 1 - .../caps_4.0.0.x86_64.xml | 1 - tests/qemuxml2argvdata/autoindex.args | 2 +- .../qemuxml2argvdata/balloon-device-auto.args | 3 +- .../balloon-device-deflate-off.args | 3 +- .../balloon-device-deflate.args | 3 +- .../balloon-device-period.args | 3 +- tests/qemuxml2argvdata/balloon-device.args | 3 +- tests/qemuxml2argvdata/bios-nvram.args | 3 +- tests/qemuxml2argvdata/bios.args | 3 +- .../blkdeviotune-group-num.args | 5 ++- .../blkdeviotune-max-length.args | 5 ++- tests/qemuxml2argvdata/blkdeviotune-max.args | 5 ++- tests/qemuxml2argvdata/blkiotune-device.args | 3 +- tests/qemuxml2argvdata/blkiotune.args | 3 +- tests/qemuxml2argvdata/boot-cdrom.args | 6 ++-- tests/qemuxml2argvdata/boot-complex.args | 10 +++--- tests/qemuxml2argvdata/boot-floppy.args | 2 +- .../boot-menu-disable-drive.args | 6 ++-- tests/qemuxml2argvdata/boot-menu-disable.args | 6 ++-- .../boot-menu-enable-with-timeout.args | 6 ++-- tests/qemuxml2argvdata/boot-menu-enable.args | 6 ++-- tests/qemuxml2argvdata/boot-multi.args | 6 ++-- tests/qemuxml2argvdata/boot-network.args | 2 +- tests/qemuxml2argvdata/boot-order.args | 8 ++--- tests/qemuxml2argvdata/boot-strict.args | 10 +++--- tests/qemuxml2argvdata/channel-guestfwd.args | 3 +- tests/qemuxml2argvdata/channel-spicevmc.args | 3 +- .../qemuxml2argvdata/channel-virtio-auto.args | 3 +- .../channel-virtio-autoadd.args | 3 +- .../channel-virtio-autoassign.args | 3 +- .../channel-virtio-default.args | 3 +- .../channel-virtio-state.args | 3 +- .../qemuxml2argvdata/channel-virtio-unix.args | 3 +- tests/qemuxml2argvdata/channel-virtio.args | 3 +- tests/qemuxml2argvdata/clock-catchup.args | 3 +- tests/qemuxml2argvdata/clock-france.args | 3 +- tests/qemuxml2argvdata/clock-hpet-off.args | 3 +- .../clock-localtime-basis-localtime.args | 3 +- tests/qemuxml2argvdata/clock-localtime.args | 3 +- tests/qemuxml2argvdata/clock-utc.args | 3 +- tests/qemuxml2argvdata/clock-variable.args | 3 +- .../qemuxml2argvdata/console-compat-auto.args | 3 +- .../console-compat-chardev.args | 3 +- tests/qemuxml2argvdata/console-compat.args | 3 +- .../qemuxml2argvdata/console-virtio-many.args | 3 +- tests/qemuxml2argvdata/console-virtio.args | 3 +- tests/qemuxml2argvdata/controller-order.args | 4 +-- .../cpu-host-passthrough-features.args | 3 +- .../qemuxml2argvdata/cputune-zero-shares.args | 3 +- tests/qemuxml2argvdata/cputune.args | 3 +- tests/qemuxml2argvdata/debug-threads.args | 3 +- tests/qemuxml2argvdata/disk-aio.args | 7 ++-- tests/qemuxml2argvdata/disk-boot-cdrom.args | 7 ++-- tests/qemuxml2argvdata/disk-boot-disk.args | 7 ++-- .../qemuxml2argvdata/disk-cdrom-network.args | 17 +++++---- tests/qemuxml2argvdata/disk-cdrom-tray.args | 9 +++-- tests/qemuxml2argvdata/disk-cdrom.args | 16 ++++----- tests/qemuxml2argvdata/disk-copy_on_read.args | 5 ++- .../qemuxml2argvdata/disk-detect-zeroes.args | 5 ++- tests/qemuxml2argvdata/disk-discard.args | 5 ++- tests/qemuxml2argvdata/disk-error-policy.args | 7 ++-- tests/qemuxml2argvdata/disk-floppy-tray.args | 3 +- tests/qemuxml2argvdata/disk-floppy.args | 3 +- tests/qemuxml2argvdata/disk-fmt-qcow.args | 7 ++-- tests/qemuxml2argvdata/disk-geometry.args | 4 +-- tests/qemuxml2argvdata/disk-ioeventfd.args | 5 ++- tests/qemuxml2argvdata/disk-iscsi.args | 3 +- .../disk-network-sheepdog.args | 3 +- tests/qemuxml2argvdata/disk-no-boot.args | 8 ++--- tests/qemuxml2argvdata/disk-order.args | 7 ++-- .../qemuxml2argvdata/disk-readonly-disk.args | 8 ++--- tests/qemuxml2argvdata/disk-sata-device.args | 2 +- tests/qemuxml2argvdata/disk-serial.args | 6 ++-- tests/qemuxml2argvdata/disk-snapshot.args | 9 +++-- .../disk-source-pool-mode.args | 15 ++++---- tests/qemuxml2argvdata/disk-source-pool.args | 11 +++--- .../disk-usb-device-removable.args | 3 +- tests/qemuxml2argvdata/disk-usb-device.args | 3 +- tests/qemuxml2argvdata/disk-virtio.args | 7 ++-- tests/qemuxml2argvdata/event_idx.args | 5 ++- tests/qemuxml2argvdata/fips-enabled.args | 3 +- tests/qemuxml2argvdata/fs9p.args | 3 +- .../graphics-egl-headless.args | 3 +- .../graphics-sdl-fullscreen.args | 3 +- tests/qemuxml2argvdata/graphics-sdl.args | 3 +- .../graphics-spice-agent-file-xfer.args | 3 +- .../graphics-spice-agentmouse.args | 3 +- .../graphics-spice-compression.args | 3 +- .../graphics-spice-egl-headless.args | 3 +- .../graphics-spice-qxl-vga.args | 3 +- .../qemuxml2argvdata/graphics-spice-sasl.args | 3 +- .../graphics-spice-timeout.args | 5 ++- tests/qemuxml2argvdata/graphics-spice.args | 3 +- .../graphics-vnc-auto-socket-cfg.args | 3 +- .../graphics-vnc-egl-headless.args | 3 +- .../graphics-vnc-no-listen-attr.args | 3 +- .../qemuxml2argvdata/graphics-vnc-policy.args | 3 +- .../graphics-vnc-remove-generated-socket.args | 3 +- tests/qemuxml2argvdata/graphics-vnc-sasl.args | 3 +- tests/qemuxml2argvdata/graphics-vnc.args | 3 +- .../hostdev-pci-address-device.args | 3 +- .../qemuxml2argvdata/hostdev-pci-address.args | 3 +- .../hostdev-scsi-lsi-iscsi-auth.args | 3 +- .../hostdev-scsi-lsi-iscsi.args | 3 +- tests/qemuxml2argvdata/hostdev-scsi-lsi.args | 3 +- .../hostdev-scsi-readonly.args | 3 +- .../hostdev-scsi-vhost-scsi-pci.args | 3 +- .../hostdev-scsi-virtio-iscsi-auth.args | 3 +- .../hostdev-scsi-virtio-iscsi.args | 3 +- .../hostdev-scsi-virtio-scsi.args | 3 +- .../hostdev-usb-address-device-boot.args | 2 +- .../hostdev-usb-address-device.args | 3 +- .../qemuxml2argvdata/hostdev-usb-address.args | 3 +- .../hostdev-vfio-multidomain.args | 3 +- tests/qemuxml2argvdata/hostdev-vfio.args | 3 +- .../qemuxml2argvdata/hugepages-memaccess.args | 3 +- .../hugepages-memaccess2.args | 3 +- tests/qemuxml2argvdata/hugepages-shared.args | 3 +- .../qemuxml2argvdata/input-usbmouse-addr.args | 3 +- tests/qemuxml2argvdata/input-usbmouse.args | 3 +- tests/qemuxml2argvdata/input-usbtablet.args | 3 +- tests/qemuxml2argvdata/iothreads-disk.args | 3 +- .../iothreads-ids-partial.args | 3 +- tests/qemuxml2argvdata/iothreads-ids.args | 3 +- tests/qemuxml2argvdata/iothreads.args | 3 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 3 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 3 +- tests/qemuxml2argvdata/machine-aliases1.args | 3 +- tests/qemuxml2argvdata/machine-aliases2.args | 3 +- tests/qemuxml2argvdata/machine-core-off.args | 3 +- tests/qemuxml2argvdata/machine-core-on.args | 3 +- .../qemuxml2argvdata/machine-vmport-opt.args | 3 +- tests/qemuxml2argvdata/master-key.args | 3 +- .../memory-hotplug-dimm-addr.args | 3 +- .../qemuxml2argvdata/memory-hotplug-dimm.args | 3 +- tests/qemuxml2argvdata/memory-hotplug.args | 3 +- tests/qemuxml2argvdata/memtune-unlimited.args | 3 +- tests/qemuxml2argvdata/memtune.args | 3 +- tests/qemuxml2argvdata/migrate.args | 3 +- .../minimal-msg-timestamp.args | 3 +- tests/qemuxml2argvdata/minimal-sandbox.args | 3 +- tests/qemuxml2argvdata/minimal.args | 3 +- tests/qemuxml2argvdata/misc-acpi.args | 3 +- tests/qemuxml2argvdata/misc-disable-s3.args | 3 +- .../misc-disable-suspends.args | 3 +- tests/qemuxml2argvdata/misc-enable-s4.args | 3 +- tests/qemuxml2argvdata/misc-no-reboot.args | 3 +- tests/qemuxml2argvdata/misc-uuid.args | 3 +- tests/qemuxml2argvdata/monitor-json.args | 3 +- tests/qemuxml2argvdata/name-escape.args | 3 +- tests/qemuxml2argvdata/net-client.args | 3 +- tests/qemuxml2argvdata/net-eth-hostip.args | 3 +- tests/qemuxml2argvdata/net-eth-ifname.args | 3 +- tests/qemuxml2argvdata/net-eth-names.args | 3 +- tests/qemuxml2argvdata/net-eth.args | 3 +- .../net-hostdev-bootorder.args | 3 +- .../net-hostdev-multidomain.args | 3 +- .../net-hostdev-vfio-multidomain.args | 3 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 3 +- tests/qemuxml2argvdata/net-hostdev.args | 3 +- tests/qemuxml2argvdata/net-mcast.args | 3 +- tests/qemuxml2argvdata/net-server.args | 3 +- tests/qemuxml2argvdata/net-udp.args | 3 +- tests/qemuxml2argvdata/net-user-addr.args | 3 +- tests/qemuxml2argvdata/net-user.args | 3 +- .../net-vhostuser-multiq.args | 3 +- tests/qemuxml2argvdata/net-virtio-device.args | 3 +- .../net-virtio-disable-offloads.args | 3 +- tests/qemuxml2argvdata/net-virtio-netdev.args | 3 +- .../net-virtio-rxtxqueuesize.args | 3 +- tests/qemuxml2argvdata/net-virtio.args | 3 +- tests/qemuxml2argvdata/nosharepages.args | 3 +- .../numad-auto-memory-vcpu-cpuset.args | 3 +- ...o-memory-vcpu-no-cpuset-and-placement.args | 3 +- .../numad-auto-vcpu-static-numatune.args | 3 +- .../numad-static-memory-auto-vcpu.args | 3 +- tests/qemuxml2argvdata/numad.args | 3 +- .../numatune-auto-nodeset-invalid.args | 3 +- tests/qemuxml2argvdata/numatune-memory.args | 3 +- tests/qemuxml2argvdata/panic-no-address.args | 3 +- tests/qemuxml2argvdata/panic.args | 3 +- .../parallel-parport-chardev.args | 3 +- .../parallel-tcp-chardev.args | 3 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 4 +-- tests/qemuxml2argvdata/pci-autoadd-idx.args | 4 +-- tests/qemuxml2argvdata/pci-bridge.args | 4 +-- tests/qemuxml2argvdata/pci-many.args | 4 +-- tests/qemuxml2argvdata/pci-rom.args | 3 +- .../pci-serial-dev-chardev.args | 3 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 2 +- tests/qemuxml2argvdata/pcie-root-port.args | 2 +- .../pcie-switch-downstream-port.args | 2 +- .../pcie-switch-upstream-port.args | 2 +- tests/qemuxml2argvdata/pcihole64-q35.args | 2 +- tests/qemuxml2argvdata/q35-usb2-multi.args | 2 +- tests/qemuxml2argvdata/q35-usb2-reorder.args | 2 +- tests/qemuxml2argvdata/q35-usb2.args | 2 +- tests/qemuxml2argvdata/q35.args | 2 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 3 +- .../qemu-ns-commandline-ns0.args | 3 +- .../qemu-ns-commandline-ns1.args | 3 +- .../qemuxml2argvdata/qemu-ns-commandline.args | 3 +- .../qemu-ns-domain-commandline-ns0.args | 3 +- .../qemu-ns-domain-commandline.args | 3 +- .../qemuxml2argvdata/qemu-ns-domain-ns0.args | 3 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 3 +- tests/qemuxml2argvdata/qemu-ns.args | 3 +- tests/qemuxml2argvdata/restore-v2-fd.args | 3 +- tests/qemuxml2argvdata/restore-v2.args | 3 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 3 +- .../seclabel-dynamic-baselabel.args | 3 +- .../seclabel-dynamic-labelskip.args | 3 +- .../seclabel-dynamic-override.args | 5 ++- .../seclabel-dynamic-relabel.args | 3 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 3 +- tests/qemuxml2argvdata/seclabel-none.args | 3 +- .../seclabel-static-labelskip.args | 3 +- .../seclabel-static-relabel.args | 3 +- tests/qemuxml2argvdata/seclabel-static.args | 3 +- .../serial-dev-chardev-iobase.args | 3 +- .../qemuxml2argvdata/serial-dev-chardev.args | 3 +- .../qemuxml2argvdata/serial-file-chardev.args | 3 +- tests/qemuxml2argvdata/serial-file-log.args | 3 +- .../qemuxml2argvdata/serial-many-chardev.args | 3 +- .../qemuxml2argvdata/serial-pty-chardev.args | 3 +- .../serial-spiceport-nospice.args | 3 +- tests/qemuxml2argvdata/serial-spiceport.args | 3 +- .../qemuxml2argvdata/serial-tcp-chardev.args | 3 +- .../serial-tcp-telnet-chardev.args | 3 +- .../serial-tcp-tlsx509-chardev-notls.args | 3 +- .../serial-tcp-tlsx509-chardev-verify.args | 3 +- .../serial-tcp-tlsx509-chardev.args | 3 +- .../serial-tcp-tlsx509-secret-chardev.args | 3 +- .../qemuxml2argvdata/serial-udp-chardev.args | 3 +- tests/qemuxml2argvdata/serial-vc-chardev.args | 3 +- tests/qemuxml2argvdata/smbios.args | 3 +- tests/qemuxml2argvdata/smp.args | 3 +- tests/qemuxml2argvdata/sound-device.args | 3 +- tests/qemuxml2argvdata/sound.args | 3 +- tests/qemuxml2argvdata/user-aliases.args | 4 +-- .../video-device-pciaddr-default.args | 3 +- tests/qemuxml2argvdata/video-none-device.args | 3 +- .../video-qxl-device-vgamem.args | 3 +- tests/qemuxml2argvdata/video-qxl-device.args | 3 +- tests/qemuxml2argvdata/video-qxl-heads.args | 3 +- .../qemuxml2argvdata/video-qxl-nodevice.args | 3 +- tests/qemuxml2argvdata/video-qxl-noheads.args | 3 +- .../video-qxl-sec-device-vgamem.args | 3 +- .../video-qxl-sec-device.args | 3 +- .../video-vga-device-vgamem.args | 3 +- tests/qemuxml2argvdata/video-vga-device.args | 3 +- .../qemuxml2argvdata/video-vga-nodevice.args | 3 +- .../qemuxml2argvdata/video-vga-qxl-heads.args | 3 +- .../video-virtio-gpu-device.args | 3 +- .../video-virtio-gpu-sdl-gl.args | 3 +- .../video-virtio-gpu-spice-gl.args | 3 +- .../video-virtio-gpu-virgl.args | 3 +- tests/qemuxml2argvdata/video-virtio-vga.args | 3 +- tests/qemuxml2argvdata/vmcoreinfo.args | 3 +- tests/qemuxml2argvdata/watchdog-device.args | 3 +- tests/qemuxml2argvdata/watchdog-dump.args | 3 +- .../qemuxml2argvdata/watchdog-injectnmi.args | 3 +- tests/qemuxml2argvdata/watchdog.args | 3 +- tests/qemuxml2argvtest.c | 10 ++---- 293 files changed, 358 insertions(+), 654 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7033615eb5..ec258a971e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1023,7 +1023,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "qxl", QEMU_CAPS_DEVICE_QXL }, { "sga", QEMU_CAPS_SGA }, { "scsi-block", QEMU_CAPS_SCSI_BLOCK }, - { "ide-cd", QEMU_CAPS_IDE_CD }, { "VGA", QEMU_CAPS_DEVICE_VGA }, { "cirrus-vga", QEMU_CAPS_DEVICE_CIRRUS_VGA }, { "vmware-svga", QEMU_CAPS_DEVICE_VMWARE_SVGA }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index f9810bee92..18abd555f4 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -175,7 +175,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_BLOCKJOB_SYNC, /* old block_job_cancel, block_stream */ QEMU_CAPS_BLOCKJOB_ASYNC, /* new block-job-cancel, block-stream */ X_QEMU_CAPS_SCSI_CD, /* -device scsi-cd */ - QEMU_CAPS_IDE_CD, /* -device ide-cd */ + X_QEMU_CAPS_IDE_CD, /* -device ide-cd */ X_QEMU_CAPS_NO_USER_CONFIG, /* -no-user-config */ /* 95 */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d9f64b8097..77018a2c4b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1761,14 +1761,10 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, /* While this is a frontend attribute, it only makes sense to be used when * legacy -drive is used. In modern qemu the 'ide-cd' or 'scsi-cd' are used. * virtio and other just ignore the attribute anyways */ - if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) { - if (disk->bus == VIR_DOMAIN_DISK_BUS_IDE) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_IDE_CD)) - virBufferAddLit(&opt, ",media=cdrom"); - } else if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { - virBufferAddLit(&opt, ",media=cdrom"); - } - } + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM && + disk->bus != VIR_DOMAIN_DISK_BUS_SCSI && + disk->bus != VIR_DOMAIN_DISK_BUS_IDE) + virBufferAddLit(&opt, ",media=cdrom"); if (disk->src->readonly) virBufferAddLit(&opt, ",readonly=on"); @@ -1930,14 +1926,10 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, goto error; } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_IDE_CD)) { - if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) - virBufferAddLit(&opt, "ide-cd"); - else - virBufferAddLit(&opt, "ide-hd"); - } else { - virBufferAddLit(&opt, "ide-drive"); - } + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + virBufferAddLit(&opt, "ide-cd"); + else + virBufferAddLit(&opt, "ide-hd"); /* When domain has builtin IDE controller we don't put it onto cmd * line. Therefore we can't set its alias. In that case, use the @@ -2052,14 +2044,10 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, goto error; } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_IDE_CD)) { - if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) - virBufferAddLit(&opt, "ide-cd"); - else - virBufferAddLit(&opt, "ide-hd"); - } else { - virBufferAddLit(&opt, "ide-drive"); - } + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + virBufferAddLit(&opt, "ide-cd"); + else + virBufferAddLit(&opt, "ide-hd"); /* When domain has builtin SATA controller we don't put it onto cmd * line. Therefore we can't set its alias. In that case, use the diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 848bc44625..6a0b123993 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 7bc2e6a204..5a91592653 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 3fd785ca2e..0507e02cc6 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 3a72b58427..3c268f8d7a 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index a351802e27..30eafac64f 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -23,7 +23,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index b470336ac0..1c8b5f4237 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index f92c84d5a8..a5b9eecf17 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index cb4d2381d0..38ef7207e8 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 16c4acfc45..67f320cc71 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -23,7 +23,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 575ed88371..e07c1fa6d6 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 7e6a8ea264..94e8c877a2 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 1f69d1ee71..5dff12e745 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index bb30aec3e6..e3e1ca3cad 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 6f2b8e9a91..0371991523 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -25,7 +25,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 2d9cd34e9f..9494a72e3e 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 43b9f022e4..89bdcb116c 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index cf880a0a88..cc555fb48a 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index acfcbd673e..f2dbfe3cde 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index bdf69680ad..cea056f313 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index d2a0d1a8ff..fe900edd92 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 1ef7a911fe..226023a8b2 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index a8c17fd4b9..01703f125c 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index 37c7e3424f..29ff06581a 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 4f74ae70f4..c3bb278c5a 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index dac5d9d07a..24741a0c9e 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -25,7 +25,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index 69f51f166a..8a54767450 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -25,7 +25,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index 205446ed0e..3d4d53023e 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata/autoindex.args index 6a262422f6..56be2d23d4 100644 --- a/tests/qemuxml2argvdata/autoindex.args +++ b/tests/qemuxml2argvdata/autoindex.args @@ -54,4 +54,4 @@ addr=0x2 \ -device ich9-usb-uhci3,masterbus=usb4.0,firstport=4,bus=pci.2,addr=0x2.0x2 \ -device ich9-usb-ehci1,id=usb4,bus=pci.2,addr=0x2.0x7 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \ --device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 +-device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxml2argvdata/balloon-device-auto.args index 503358a73b..547b9ced44 100644 --- a/tests/qemuxml2argvdata/balloon-device-auto.args +++ b/tests/qemuxml2argvdata/balloon-device-auto.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args b/tests/qemuxml2argvdata/balloon-device-deflate-off.args index 2b0469972f..896bb47afe 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12,deflate-on-oom=off diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args b/tests/qemuxml2argvdata/balloon-device-deflate.args index 53f467981b..37304d23b1 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12,deflate-on-oom=on diff --git a/tests/qemuxml2argvdata/balloon-device-period.args b/tests/qemuxml2argvdata/balloon-device-period.args index 9d659f6d43..c703c011f4 100644 --- a/tests/qemuxml2argvdata/balloon-device-period.args +++ b/tests/qemuxml2argvdata/balloon-device-period.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12 diff --git a/tests/qemuxml2argvdata/balloon-device.args b/tests/qemuxml2argvdata/balloon-device.args index 9d659f6d43..c703c011f4 100644 --- a/tests/qemuxml2argvdata/balloon-device.args +++ b/tests/qemuxml2argvdata/balloon-device.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12 diff --git a/tests/qemuxml2argvdata/bios-nvram.args b/tests/qemuxml2argvdata/bios-nvram.args index 7435192a02..731675ae63 100644 --- a/tests/qemuxml2argvdata/bios-nvram.args +++ b/tests/qemuxml2argvdata/bios-nvram.args @@ -25,7 +25,6 @@ server,nowait \ -boot menu=on \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device usb-tablet,id=input0,bus=usb.0,port=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/bios.args b/tests/qemuxml2argvdata/bios.args index 4d5cea9f24..8ecc696194 100644 --- a/tests/qemuxml2argvdata/bios.args +++ b/tests/qemuxml2argvdata/bios.args @@ -25,8 +25,7 @@ server,nowait \ -boot menu=on \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev pty,id=charserial0 \ -device isa-serial,chardev=charserial0,id=serial0 \ -device usb-tablet,id=input0,bus=usb.0,port=1 \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.args b/tests/qemuxml2argvdata/blkdeviotune-group-num.args index 1ef0934e51..a9e66c430e 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-group-num.args +++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.args @@ -25,13 +25,12 @@ server,nowait \ cache=none,throttling.bps-total=5000,throttling.iops-total=6000,\ throttling.bps-total-max=10000,throttling.iops-total-max=11000,\ throttling.group=libvirt_iotune_group1 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-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,\ cache=none,throttling.bps-read=5000,throttling.bps-write=5500,\ throttling.iops-read=3500,throttling.iops-write=4000,\ throttling.bps-read-max=6000,throttling.bps-write-max=6500,\ throttling.iops-read-max=7000,throttling.iops-write-max=7500,\ throttling.iops-size=2000,throttling.group=libvirt_iotune_group2 \ --device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ +-device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.args b/tests/qemuxml2argvdata/blkdeviotune-max-length.args index 295fa84825..482220705c 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max-length.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.args @@ -25,8 +25,7 @@ server,nowait \ cache=none,throttling.bps-total=5000,throttling.iops-total=6000,\ throttling.bps-total-max=10000,throttling.iops-total-max=11000,\ throttling.bps-total-max-length=3,throttling.iops-total-max-length=5 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-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,\ cache=none,throttling.bps-read=5000,throttling.bps-write=5500,\ throttling.iops-read=3500,throttling.iops-write=4000,\ @@ -35,5 +34,5 @@ throttling.iops-read-max=7000,throttling.iops-write-max=7500,\ throttling.iops-size=2000,throttling.bps-read-max-length=3,\ throttling.bps-write-max-length=5,throttling.iops-read-max-length=7,\ throttling.iops-write-max-length=9 \ --device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ +-device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.args b/tests/qemuxml2argvdata/blkdeviotune-max.args index 031a9cc626..c9cd42708b 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max.args @@ -24,13 +24,12 @@ server,nowait \ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\ cache=none,throttling.bps-total=5000,throttling.iops-total=6000,\ throttling.bps-total-max=10000,throttling.iops-total-max=11000 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-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,\ cache=none,throttling.bps-read=5000,throttling.bps-write=5500,\ throttling.iops-read=3500,throttling.iops-write=4000,\ throttling.bps-read-max=6000,throttling.bps-write-max=6500,\ throttling.iops-read-max=7000,throttling.iops-write-max=7500,\ throttling.iops-size=2000 \ --device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ +-device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2argvdata/blkiotune-device.args index 503358a73b..547b9ced44 100644 --- a/tests/qemuxml2argvdata/blkiotune-device.args +++ b/tests/qemuxml2argvdata/blkiotune-device.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata/blkiotune.args index 503358a73b..547b9ced44 100644 --- a/tests/qemuxml2argvdata/blkiotune.args +++ b/tests/qemuxml2argvdata/blkiotune.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/boot-cdrom.args b/tests/qemuxml2argvdata/boot-cdrom.args index df4cf6e387..3b15374ee9 100644 --- a/tests/qemuxml2argvdata/boot-cdrom.args +++ b/tests/qemuxml2argvdata/boot-cdrom.args @@ -21,7 +21,5 @@ server,nowait \ -no-shutdown \ -no-acpi \ -usb \ --drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,media=cdrom,\ -readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ -bootindex=1 +-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 diff --git a/tests/qemuxml2argvdata/boot-complex.args b/tests/qemuxml2argvdata/boot-complex.args index 56cefb60a5..4cdb1452cd 100644 --- a/tests/qemuxml2argvdata/boot-complex.args +++ b/tests/qemuxml2argvdata/boot-complex.args @@ -28,13 +28,11 @@ id=virtio-disk0,bootindex=3 \ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,\ id=virtio-disk1 \ -drive file=/dev/HostVG/hda,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-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-drive,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,media=cdrom,\ -readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ -bootindex=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 \ diff --git a/tests/qemuxml2argvdata/boot-floppy.args b/tests/qemuxml2argvdata/boot-floppy.args index eac04dc7df..3211106512 100644 --- a/tests/qemuxml2argvdata/boot-floppy.args +++ b/tests/qemuxml2argvdata/boot-floppy.args @@ -22,7 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -drive file=/tmp/firmware.img,format=raw,if=none,id=drive-fdc0-0-0 \ -global isa-fdc.driveA=drive-fdc0-0-0 \ -global isa-fdc.bootindexA=1 diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.args b/tests/qemuxml2argvdata/boot-menu-disable-drive.args index f4c37fb31d..0cf54a786f 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable-drive.args +++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.args @@ -22,8 +22,6 @@ server,nowait \ -no-acpi \ -boot menu=off \ -usb \ --drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,media=cdrom,\ -readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ -bootindex=1 \ +-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 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/boot-menu-disable.args b/tests/qemuxml2argvdata/boot-menu-disable.args index f4c37fb31d..0cf54a786f 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable.args +++ b/tests/qemuxml2argvdata/boot-menu-disable.args @@ -22,8 +22,6 @@ server,nowait \ -no-acpi \ -boot menu=off \ -usb \ --drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,media=cdrom,\ -readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ -bootindex=1 \ +-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 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args index 0f44ce5b43..1fd9977142 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args +++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args @@ -22,8 +22,6 @@ server,nowait \ -no-acpi \ -boot menu=on,splash-time=3000 \ -usb \ --drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,media=cdrom,\ -readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ -bootindex=1 \ +-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 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/boot-menu-enable.args b/tests/qemuxml2argvdata/boot-menu-enable.args index 91f73213b7..46494445cc 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable.args +++ b/tests/qemuxml2argvdata/boot-menu-enable.args @@ -22,8 +22,6 @@ server,nowait \ -no-acpi \ -boot menu=on \ -usb \ --drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,media=cdrom,\ -readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ -bootindex=1 \ +-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 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/boot-multi.args b/tests/qemuxml2argvdata/boot-multi.args index 91f73213b7..46494445cc 100644 --- a/tests/qemuxml2argvdata/boot-multi.args +++ b/tests/qemuxml2argvdata/boot-multi.args @@ -22,8 +22,6 @@ server,nowait \ -no-acpi \ -boot menu=on \ -usb \ --drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,media=cdrom,\ -readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ -bootindex=1 \ +-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 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/boot-network.args b/tests/qemuxml2argvdata/boot-network.args index 713e1f1c85..6b441dd6b4 100644 --- a/tests/qemuxml2argvdata/boot-network.args +++ b/tests/qemuxml2argvdata/boot-network.args @@ -22,4 +22,4 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 diff --git a/tests/qemuxml2argvdata/boot-order.args b/tests/qemuxml2argvdata/boot-order.args index eda63fc3a2..c22ee6fdd4 100644 --- a/tests/qemuxml2argvdata/boot-order.args +++ b/tests/qemuxml2argvdata/boot-order.args @@ -22,11 +22,9 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-1-0,media=cdrom,\ -readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ -drive file=sheepdog:example.org:6000:image,format=raw,if=none,\ id=drive-virtio-disk0 \ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ diff --git a/tests/qemuxml2argvdata/boot-strict.args b/tests/qemuxml2argvdata/boot-strict.args index 9dc90454fd..b062c0d1df 100644 --- a/tests/qemuxml2argvdata/boot-strict.args +++ b/tests/qemuxml2argvdata/boot-strict.args @@ -29,13 +29,11 @@ id=virtio-disk0,bootindex=3 \ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,\ id=virtio-disk1 \ -drive file=/dev/HostVG/hda,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-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-drive,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,media=cdrom,\ -readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ -bootindex=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 \ diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2argvdata/channel-guestfwd.args index 392e5dd8d7..a82d5b6d4e 100644 --- a/tests/qemuxml2argvdata/channel-guestfwd.args +++ b/tests/qemuxml2argvdata/channel-guestfwd.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev pipe,id=charchannel0,path=/tmp/guestfwd \ -netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=user-channel0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2argvdata/channel-spicevmc.args index 4baeda8165..f4ae7f6ef6 100644 --- a/tests/qemuxml2argvdata/channel-spicevmc.args +++ b/tests/qemuxml2argvdata/channel-spicevmc.args @@ -22,8 +22,7 @@ server,nowait \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev spicevmc,id=charchannel0,name=vdagent \ -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\ id=channel0,name=com.redhat.spice.0 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxml2argvdata/channel-virtio-auto.args index 045b691b7e..14c7da0577 100644 --- a/tests/qemuxml2argvdata/channel-virtio-auto.args +++ b/tests/qemuxml2argvdata/channel-virtio-auto.args @@ -26,8 +26,7 @@ addr=0x3 \ -device virtio-serial-pci,id=virtio-serial2,bus=pci.0,addr=0x4 \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev pty,id=charchannel0 \ -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ id=channel0,name=org.linux-kvm.port.0 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qemuxml2argvdata/channel-virtio-autoadd.args index 0bec138d58..a0cde544b7 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args @@ -25,8 +25,7 @@ addr=0x3 \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0x4 \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev pty,id=charchannel0 \ -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ id=channel0,name=org.linux-kvm.port.0 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/qemuxml2argvdata/channel-virtio-autoassign.args index ab511564e2..497f6b09d7 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args @@ -25,8 +25,7 @@ addr=0x3 \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev pty,id=charchannel0 \ -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel0,\ id=channel0,name=org.linux-kvm.port.0 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qemuxml2argvdata/channel-virtio-default.args index fa964bf60a..88f2a78a55 100644 --- a/tests/qemuxml2argvdata/channel-virtio-default.args +++ b/tests/qemuxml2argvdata/channel-virtio-default.args @@ -24,8 +24,7 @@ server,nowait \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev pty,id=charchannel0 \ -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ id=channel0 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemuxml2argvdata/channel-virtio-state.args index 7814464fc0..2e820dda05 100644 --- a/tests/qemuxml2argvdata/channel-virtio-state.args +++ b/tests/qemuxml2argvdata/channel-virtio-state.args @@ -23,8 +23,7 @@ server,nowait \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev pty,id=charchannel0 \ -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\ id=channel0,name=org.linux-kvm.port.foo \ diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxml2argvdata/channel-virtio-unix.args index b95b770530..63658e9e87 100644 --- a/tests/qemuxml2argvdata/channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/channel-virtio-unix.args @@ -24,8 +24,7 @@ server,nowait \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev socket,id=charchannel0,\ path=/tmp/channel/domain--1-QEMUGuest1/org.qemu.guest_agent.0,server,nowait \ -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2argvdata/channel-virtio.args index 0b899b4d88..4207b6929b 100644 --- a/tests/qemuxml2argvdata/channel-virtio.args +++ b/tests/qemuxml2argvdata/channel-virtio.args @@ -23,8 +23,7 @@ server,nowait \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev pty,id=charchannel0 \ -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\ id=channel0,name=org.linux-kvm.port.foo \ diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argvdata/clock-catchup.args index 878198627a..849ad3a57b 100644 --- a/tests/qemuxml2argvdata/clock-catchup.args +++ b/tests/qemuxml2argvdata/clock-catchup.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvdata/clock-france.args index a7948dad81..c177501f1a 100644 --- a/tests/qemuxml2argvdata/clock-france.args +++ b/tests/qemuxml2argvdata/clock-france.args @@ -23,6 +23,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2argvdata/clock-hpet-off.args index bd367dea2f..ffb24321da 100644 --- a/tests/qemuxml2argvdata/clock-hpet-off.args +++ b/tests/qemuxml2argvdata/clock-hpet-off.args @@ -23,6 +23,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args index 888f7a42da..7bf5261f52 100644 --- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/clock-localtime.args b/tests/qemuxml2argvdata/clock-localtime.args index 33bd4477f8..6880264ded 100644 --- a/tests/qemuxml2argvdata/clock-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime.args @@ -22,5 +22,4 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 diff --git a/tests/qemuxml2argvdata/clock-utc.args b/tests/qemuxml2argvdata/clock-utc.args index 6757d848a3..44ba322eb1 100644 --- a/tests/qemuxml2argvdata/clock-utc.args +++ b/tests/qemuxml2argvdata/clock-utc.args @@ -22,5 +22,4 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2argvdata/clock-variable.args index ae49fc2325..643b74d6bf 100644 --- a/tests/qemuxml2argvdata/clock-variable.args +++ b/tests/qemuxml2argvdata/clock-variable.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/console-compat-auto.args b/tests/qemuxml2argvdata/console-compat-auto.args index cac821d5b9..40f70e5c9d 100644 --- a/tests/qemuxml2argvdata/console-compat-auto.args +++ b/tests/qemuxml2argvdata/console-compat-auto.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev pty,id=charserial0 \ -device isa-serial,chardev=charserial0,id=serial0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args b/tests/qemuxml2argvdata/console-compat-chardev.args index cac821d5b9..40f70e5c9d 100644 --- a/tests/qemuxml2argvdata/console-compat-chardev.args +++ b/tests/qemuxml2argvdata/console-compat-chardev.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev pty,id=charserial0 \ -device isa-serial,chardev=charserial0,id=serial0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/console-compat.args b/tests/qemuxml2argvdata/console-compat.args index 101811a732..dc9a254997 100644 --- a/tests/qemuxml2argvdata/console-compat.args +++ b/tests/qemuxml2argvdata/console-compat.args @@ -22,7 +22,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev pty,id=charserial0 \ -device isa-serial,chardev=charserial0,id=serial0 diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxml2argvdata/console-virtio-many.args index 20af473dca..3e0ee28863 100644 --- a/tests/qemuxml2argvdata/console-virtio-many.args +++ b/tests/qemuxml2argvdata/console-virtio-many.args @@ -23,8 +23,7 @@ server,nowait \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev pty,id=charserial0 \ -device isa-serial,chardev=charserial0,id=serial0 \ -chardev pty,id=charconsole1 \ diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2argvdata/console-virtio.args index 63741346e9..5fb562a7f3 100644 --- a/tests/qemuxml2argvdata/console-virtio.args +++ b/tests/qemuxml2argvdata/console-virtio.args @@ -23,8 +23,7 @@ server,nowait \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev pty,id=charconsole0 \ -device virtconsole,chardev=charconsole0,id=console0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2argvdata/controller-order.args index 6bb4942223..f151ef1637 100644 --- a/tests/qemuxml2argvdata/controller-order.args +++ b/tests/qemuxml2argvdata/controller-order.args @@ -28,8 +28,8 @@ aio=native \ -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\ id=virtio-disk0,bootindex=1 \ -drive file=/tmp/Fedora-17-x86_64-Live-Desktop.iso,format=raw,if=none,\ -id=drive-ide0-1-0,media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +id=drive-ide0-1-0,readonly=on \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -netdev user,id=hostnet0 \ -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:4d:4b:19,bus=pci.0,\ addr=0x3,bootindex=2 \ diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args index 65248988e6..dc88596025 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args @@ -23,6 +23,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.args b/tests/qemuxml2argvdata/cputune-zero-shares.args index bd7a506256..2343d2a0a1 100644 --- a/tests/qemuxml2argvdata/cputune-zero-shares.args +++ b/tests/qemuxml2argvdata/cputune-zero-shares.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/cputune.args b/tests/qemuxml2argvdata/cputune.args index bd7a506256..2343d2a0a1 100644 --- a/tests/qemuxml2argvdata/cputune.args +++ b/tests/qemuxml2argvdata/cputune.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/debug-threads.args b/tests/qemuxml2argvdata/debug-threads.args index e01dda1e40..03bb5b57b9 100644 --- a/tests/qemuxml2argvdata/debug-threads.args +++ b/tests/qemuxml2argvdata/debug-threads.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-aio.args b/tests/qemuxml2argvdata/disk-aio.args index d256b1fecc..bab4191125 100644 --- a/tests/qemuxml2argvdata/disk-aio.args +++ b/tests/qemuxml2argvdata/disk-aio.args @@ -23,9 +23,8 @@ server,nowait \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\ cache=none,aio=native \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-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,\ -media=cdrom,readonly=on,aio=threads \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=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=0x3 diff --git a/tests/qemuxml2argvdata/disk-boot-cdrom.args b/tests/qemuxml2argvdata/disk-boot-cdrom.args index 92e0fcd03c..5ad698eb27 100644 --- a/tests/qemuxml2argvdata/disk-boot-cdrom.args +++ b/tests/qemuxml2argvdata/disk-boot-cdrom.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-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,\ -media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ -bootindex=1 +readonly=on \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 diff --git a/tests/qemuxml2argvdata/disk-boot-disk.args b/tests/qemuxml2argvdata/disk-boot-disk.args index 853acfd44c..e912203945 100644 --- a/tests/qemuxml2argvdata/disk-boot-disk.args +++ b/tests/qemuxml2argvdata/disk-boot-disk.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-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,\ -media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 +readonly=on \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.args b/tests/qemuxml2argvdata/disk-cdrom-network.args index 2b5186d12c..f8803754e0 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.args @@ -21,16 +21,15 @@ server,nowait \ -no-shutdown \ -usb \ -drive file=ftp://host.name:21/url/path/file.iso,format=raw,if=none,\ -id=drive-ide0-0-0,media=cdrom,readonly=on \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +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,media=cdrom,readonly=on \ --device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ +id=drive-ide0-0-1,readonly=on \ +-device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -drive file=https://host.name:443/url/path/file.iso,format=raw,if=none,\ -id=drive-ide0-1-0,media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +id=drive-ide0-1-0,readonly=on \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -drive file=tftp://host.name:69/url/path/file.iso,format=raw,if=none,\ -id=drive-ide0-1-1,media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 \ +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=0x3 diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.args b/tests/qemuxml2argvdata/disk-cdrom-tray.args index 15bbeb4a60..a928de4cbe 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-tray.args +++ b/tests/qemuxml2argvdata/disk-cdrom-tray.args @@ -27,9 +27,8 @@ 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,media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ -bootindex=1 \ --drive if=none,id=drive-ide0-1-1,media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 \ +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=0x3 diff --git a/tests/qemuxml2argvdata/disk-cdrom.args b/tests/qemuxml2argvdata/disk-cdrom.args index 4823ae82de..005668952c 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.args +++ b/tests/qemuxml2argvdata/disk-cdrom.args @@ -22,12 +22,10 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ --drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-0-1,media=cdrom,\ -readonly=on \ --device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive if=none,id=drive-ide0-1-0,media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --drive if=none,id=drive-ide0-1-1,media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ +-drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-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 diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.args b/tests/qemuxml2argvdata/disk-copy_on_read.args index 1af7725579..f5e62e99b5 100644 --- a/tests/qemuxml2argvdata/disk-copy_on_read.args +++ b/tests/qemuxml2argvdata/disk-copy_on_read.args @@ -28,9 +28,8 @@ 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,media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ -bootindex=1 \ +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=0x3 \ diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.args b/tests/qemuxml2argvdata/disk-detect-zeroes.args index 72e28c18d9..3541d2100f 100644 --- a/tests/qemuxml2argvdata/disk-detect-zeroes.args +++ b/tests/qemuxml2argvdata/disk-detect-zeroes.args @@ -27,7 +27,6 @@ id=drive-virtio-disk0,discard=unmap,detect-zeroes=unmap \ -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,media=cdrom,readonly=on,discard=ignore,detect-zeroes=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ -bootindex=1 \ +id=drive-ide0-1-0,readonly=on,discard=ignore,detect-zeroes=on \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-discard.args b/tests/qemuxml2argvdata/disk-discard.args index 8e1422b50f..b093c2a694 100644 --- a/tests/qemuxml2argvdata/disk-discard.args +++ b/tests/qemuxml2argvdata/disk-discard.args @@ -27,7 +27,6 @@ id=drive-virtio-disk0,discard=unmap \ -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,media=cdrom,readonly=on,discard=ignore \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ -bootindex=1 \ +id=drive-ide0-1-0,readonly=on,discard=ignore \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-error-policy.args b/tests/qemuxml2argvdata/disk-error-policy.args index c4e1d9a68b..66ccf09f9c 100644 --- a/tests/qemuxml2argvdata/disk-error-policy.args +++ b/tests/qemuxml2argvdata/disk-error-policy.args @@ -23,11 +23,10 @@ server,nowait \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\ werror=stop,rerror=stop,cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-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-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ +-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-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 +-device ide-hd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.args b/tests/qemuxml2argvdata/disk-floppy-tray.args index 25138661e2..cc64a09e74 100644 --- a/tests/qemuxml2argvdata/disk-floppy-tray.args +++ b/tests/qemuxml2argvdata/disk-floppy-tray.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-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 \ diff --git a/tests/qemuxml2argvdata/disk-floppy.args b/tests/qemuxml2argvdata/disk-floppy.args index a7cd66af42..432549b85f 100644 --- a/tests/qemuxml2argvdata/disk-floppy.args +++ b/tests/qemuxml2argvdata/disk-floppy.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-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 \ diff --git a/tests/qemuxml2argvdata/disk-fmt-qcow.args b/tests/qemuxml2argvdata/disk-fmt-qcow.args index c627d284ee..154f7c15e6 100644 --- a/tests/qemuxml2argvdata/disk-fmt-qcow.args +++ b/tests/qemuxml2argvdata/disk-fmt-qcow.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-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,\ -media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 +readonly=on \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 diff --git a/tests/qemuxml2argvdata/disk-geometry.args b/tests/qemuxml2argvdata/disk-geometry.args index be864f15b1..e377244cde 100644 --- a/tests/qemuxml2argvdata/disk-geometry.args +++ b/tests/qemuxml2argvdata/disk-geometry.args @@ -22,6 +22,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1,cyls=16383,heads=16,secs=63,bios-chs-trans=lba \ +-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=0x3 diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.args b/tests/qemuxml2argvdata/disk-ioeventfd.args index d51b972a5f..c7a028006c 100644 --- a/tests/qemuxml2argvdata/disk-ioeventfd.args +++ b/tests/qemuxml2argvdata/disk-ioeventfd.args @@ -28,9 +28,8 @@ 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,media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ -bootindex=1 \ +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=0x3 \ diff --git a/tests/qemuxml2argvdata/disk-iscsi.args b/tests/qemuxml2argvdata/disk-iscsi.args index 036f2b47ac..2b889c8f9a 100644 --- a/tests/qemuxml2argvdata/disk-iscsi.args +++ b/tests/qemuxml2argvdata/disk-iscsi.args @@ -24,5 +24,4 @@ server,nowait \ -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-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.args b/tests/qemuxml2argvdata/disk-network-sheepdog.args index 0a848147a5..da42030f79 100644 --- a/tests/qemuxml2argvdata/disk-network-sheepdog.args +++ b/tests/qemuxml2argvdata/disk-network-sheepdog.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMU,,Guest,,,,1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-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=0x3,drive=drive-virtio-disk0,\ diff --git a/tests/qemuxml2argvdata/disk-no-boot.args b/tests/qemuxml2argvdata/disk-no-boot.args index 048dc71337..f461a19091 100644 --- a/tests/qemuxml2argvdata/disk-no-boot.args +++ b/tests/qemuxml2argvdata/disk-no-boot.args @@ -22,12 +22,10 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=2 \ +-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,\ -media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ -bootindex=1 \ +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 diff --git a/tests/qemuxml2argvdata/disk-order.args b/tests/qemuxml2argvdata/disk-order.args index 4a811ed87a..f798280a57 100644 --- a/tests/qemuxml2argvdata/disk-order.args +++ b/tests/qemuxml2argvdata/disk-order.args @@ -22,11 +22,10 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-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,\ -media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=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=0x3,drive=drive-virtio-disk0,\ id=virtio-disk0 \ diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.args b/tests/qemuxml2argvdata/disk-readonly-disk.args index dcc3c01b0e..75c215e95a 100644 --- a/tests/qemuxml2argvdata/disk-readonly-disk.args +++ b/tests/qemuxml2argvdata/disk-readonly-disk.args @@ -22,9 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ --drive file=/dev/sr0,format=raw,if=none,id=drive-ide0-1-0,media=cdrom,\ -readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +-device 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=0x3 diff --git a/tests/qemuxml2argvdata/disk-sata-device.args b/tests/qemuxml2argvdata/disk-sata-device.args index 5d99b16ac1..a081ef1e69 100644 --- a/tests/qemuxml2argvdata/disk-sata-device.args +++ b/tests/qemuxml2argvdata/disk-sata-device.args @@ -23,5 +23,5 @@ server,nowait \ -device ahci,id=sata0,bus=pci.0,addr=0x3 \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \ --device ide-drive,bus=sata0.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \ +-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=0x4 diff --git a/tests/qemuxml2argvdata/disk-serial.args b/tests/qemuxml2argvdata/disk-serial.args index 834cffab13..3455308d2a 100644 --- a/tests/qemuxml2argvdata/disk-serial.args +++ b/tests/qemuxml2argvdata/disk-serial.args @@ -22,10 +22,10 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1 \ --device 'ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,\ -bootindex=1,serial=\ \ WD-WMAP9A966149' \ +-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-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=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=0x3 diff --git a/tests/qemuxml2argvdata/disk-snapshot.args b/tests/qemuxml2argvdata/disk-snapshot.args index 4ea0603c7c..b35d6b8cf5 100644 --- a/tests/qemuxml2argvdata/disk-snapshot.args +++ b/tests/qemuxml2argvdata/disk-snapshot.args @@ -23,12 +23,11 @@ server,nowait \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\ cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-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-drive,bus=ide.2,unit=0,drive=drive-ide0-2-0,id=ide0-2-0 \ +-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,\ -media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=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=0x3 diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.args b/tests/qemuxml2argvdata/disk-source-pool-mode.args index 930d360d16..4d7e085045 100644 --- a/tests/qemuxml2argvdata/disk-source-pool-mode.args +++ b/tests/qemuxml2argvdata/disk-source-pool-mode.args @@ -22,15 +22,14 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/some/block/device/unit:0:0:1,format=raw,if=none,id=drive-ide0-0-1,\ -media=cdrom,readonly=on \ --device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ +readonly=on \ +-device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -drive file=iscsi://iscsi.example.com:3260/demo-target/2,format=raw,if=none,\ -id=drive-ide0-0-2,media=cdrom,readonly=on \ --device ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \ +id=drive-ide0-0-2,readonly=on \ +-device ide-cd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \ -drive file=/tmp/idedisk.img,format=raw,if=none,id=drive-ide0-0-3 \ --device ide-drive,bus=ide.0,unit=3,drive=drive-ide0-0-3,id=ide0-0-3,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=3,drive=drive-ide0-0-3,id=ide0-0-3,bootindex=1 \ -drive file=iscsi://iscsi.example.com:3260/demo-target/3,format=raw,if=none,\ -id=drive-ide0-0-4,media=cdrom,readonly=on \ --device ide-drive,bus=ide.0,unit=4,drive=drive-ide0-0-4,id=ide0-0-4 \ +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=0x3 diff --git a/tests/qemuxml2argvdata/disk-source-pool.args b/tests/qemuxml2argvdata/disk-source-pool.args index fe95aa2250..9e54828724 100644 --- a/tests/qemuxml2argvdata/disk-source-pool.args +++ b/tests/qemuxml2argvdata/disk-source-pool.args @@ -22,11 +22,10 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/some/block/device/cdrom,format=raw,if=none,id=drive-ide0-0-1,\ -media=cdrom,readonly=on \ --device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive if=none,id=drive-ide0-1-0,media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +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 file=/tmp/idedisk.img,format=raw,if=none,id=drive-ide0-0-2 \ --device ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,\ -bootindex=1 \ +-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=0x3 diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.args b/tests/qemuxml2argvdata/disk-usb-device-removable.args index 9ead12b770..7c5347bcc0 100644 --- a/tests/qemuxml2argvdata/disk-usb-device-removable.args +++ b/tests/qemuxml2argvdata/disk-usb-device-removable.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-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 \ diff --git a/tests/qemuxml2argvdata/disk-usb-device.args b/tests/qemuxml2argvdata/disk-usb-device.args index 2460426d08..724a75f8d1 100644 --- a/tests/qemuxml2argvdata/disk-usb-device.args +++ b/tests/qemuxml2argvdata/disk-usb-device.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-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=0x3 diff --git a/tests/qemuxml2argvdata/disk-virtio.args b/tests/qemuxml2argvdata/disk-virtio.args index 66804a2025..901fe7acdf 100644 --- a/tests/qemuxml2argvdata/disk-virtio.args +++ b/tests/qemuxml2argvdata/disk-virtio.args @@ -22,11 +22,10 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-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,\ -media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=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=0x3,drive=drive-virtio-disk0,\ id=virtio-disk0 \ diff --git a/tests/qemuxml2argvdata/event_idx.args b/tests/qemuxml2argvdata/event_idx.args index 12ce551014..f4c0304c15 100644 --- a/tests/qemuxml2argvdata/event_idx.args +++ b/tests/qemuxml2argvdata/event_idx.args @@ -28,9 +28,8 @@ 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,media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ -bootindex=1 \ +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=0x3 \ diff --git a/tests/qemuxml2argvdata/fips-enabled.args b/tests/qemuxml2argvdata/fips-enabled.args index ae46e99825..1fcefbbf7f 100644 --- a/tests/qemuxml2argvdata/fips-enabled.args +++ b/tests/qemuxml2argvdata/fips-enabled.args @@ -23,6 +23,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/fs9p.args b/tests/qemuxml2argvdata/fs9p.args index 0067225647..5d9e7d3ad0 100644 --- a/tests/qemuxml2argvdata/fs9p.args +++ b/tests/qemuxml2argvdata/fs9p.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -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=0x3 \ diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args b/tests/qemuxml2argvdata/graphics-egl-headless.args index 6428dbb121..4a41ce33fe 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless.args +++ b/tests/qemuxml2argvdata/graphics-egl-headless.args @@ -20,7 +20,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -display egl-headless \ -vga cirrus diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args index f21e8bb88a..01833337dd 100644 --- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args +++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -full-screen \ -display sdl \ -vga cirrus diff --git a/tests/qemuxml2argvdata/graphics-sdl.args b/tests/qemuxml2argvdata/graphics-sdl.args index 718c1bdbb0..8896af8639 100644 --- a/tests/qemuxml2argvdata/graphics-sdl.args +++ b/tests/qemuxml2argvdata/graphics-sdl.args @@ -22,7 +22,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -display sdl \ -vga std diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args index 7c428bd70b..1f6dac2431 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args +++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args @@ -21,8 +21,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ tls-channel=main,plaintext-channel=inputs,disable-agent-file-xfer \ -vga qxl \ diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args index 4011133ca1..9eae477c85 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args +++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args @@ -22,8 +22,7 @@ server,nowait \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev spicevmc,id=charchannel0,name=vdagent \ -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\ id=channel0,name=com.redhat.spice.0 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.args b/tests/qemuxml2argvdata/graphics-spice-compression.args index c3d0318695..5c81f55571 100644 --- a/tests/qemuxml2argvdata/graphics-spice-compression.args +++ b/tests/qemuxml2argvdata/graphics-spice-compression.args @@ -21,8 +21,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ image-compression=auto_glz,jpeg-wan-compression=auto,\ zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter \ diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args index 60eba443f2..c2297bc6cc 100644 --- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args +++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args @@ -21,8 +21,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -spice port=5903,addr=127.0.0.1 \ -display egl-headless \ -vga qxl \ diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args index 250283dba7..bc12f64a54 100644 --- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args +++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args @@ -21,8 +21,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ tls-channel=main,plaintext-channel=inputs \ -vga qxl \ diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.args b/tests/qemuxml2argvdata/graphics-spice-sasl.args index eb6fd82563..95b41ab501 100644 --- a/tests/qemuxml2argvdata/graphics-spice-sasl.args +++ b/tests/qemuxml2argvdata/graphics-spice-sasl.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,sasl,\ x509-dir=/etc/pki/libvirt-spice,tls-channel=default \ -vga qxl \ diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.args b/tests/qemuxml2argvdata/graphics-spice-timeout.args index 6d62584892..9e7bcd4e33 100644 --- a/tests/qemuxml2argvdata/graphics-spice-timeout.args +++ b/tests/qemuxml2argvdata/graphics-spice-timeout.args @@ -28,9 +28,8 @@ 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,media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ -bootindex=1 \ +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 tap,fd=3,id=hostnet0 \ -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:71:70:89,bus=pci.0,\ addr=0x7 \ diff --git a/tests/qemuxml2argvdata/graphics-spice.args b/tests/qemuxml2argvdata/graphics-spice.args index 50fa4c2504..c2d31af8cd 100644 --- a/tests/qemuxml2argvdata/graphics-spice.args +++ b/tests/qemuxml2argvdata/graphics-spice.args @@ -21,8 +21,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ tls-channel=default,tls-channel=main,plaintext-channel=inputs,\ image-compression=auto_glz,jpeg-wan-compression=auto,\ diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args index 87f80d428a..1a5e2b565c 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args +++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args @@ -21,7 +21,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -vnc unix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock \ -vga cirrus diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args index bb615da859..bb8fe4e0df 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args +++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args @@ -21,8 +21,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -vnc '[2001:1:2:3:4:5:1234:1234]:3' \ -display egl-headless \ -vga cirrus diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args index 7dd2865305..122d973459 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args +++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args @@ -21,7 +21,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -vnc '[2001:1:2:3:4:5:1234:1234]:3' \ -vga cirrus diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.args b/tests/qemuxml2argvdata/graphics-vnc-policy.args index 96bfca2315..9b0571c198 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-policy.args +++ b/tests/qemuxml2argvdata/graphics-vnc-policy.args @@ -21,7 +21,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -vnc '[::]:59630,share=allow-exclusive' \ -vga cirrus diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args index 1e2230af0d..f295c42d72 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args +++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args @@ -21,7 +21,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -vnc 127.0.0.1:0 \ -vga cirrus diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.args b/tests/qemuxml2argvdata/graphics-vnc-sasl.args index 302bc5c636..9d41bea2bc 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-sasl.args +++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.args @@ -22,7 +22,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -vnc 127.0.0.1:3,sasl \ -vga cirrus diff --git a/tests/qemuxml2argvdata/graphics-vnc.args b/tests/qemuxml2argvdata/graphics-vnc.args index 7dd2865305..122d973459 100644 --- a/tests/qemuxml2argvdata/graphics-vnc.args +++ b/tests/qemuxml2argvdata/graphics-vnc.args @@ -21,7 +21,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -vnc '[2001:1:2:3:4:5:1234:1234]:3' \ -vga cirrus diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.args b/tests/qemuxml2argvdata/hostdev-pci-address-device.args index 149826d4c9..b72d7591bc 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-address-device.args +++ b/tests/qemuxml2argvdata/hostdev-pci-address-device.args @@ -22,7 +22,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device pci-assign,host=06:12.5,id=hostdev0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.args b/tests/qemuxml2argvdata/hostdev-pci-address.args index 4060480e0b..8e50f2345e 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-address.args +++ b/tests/qemuxml2argvdata/hostdev-pci-address.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device pci-assign,host=06:12.5,id=hostdev0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args index 9b1610376d..01215efeb3 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args @@ -23,8 +23,7 @@ server,nowait \ -device lsi,id=scsi0,bus=pci.0,addr=0x3 \ -usb \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ 3260/iqn.1992-01.com.example%3Astorage/1,if=none,format=raw,id=drive-hostdev0 \ -device scsi-generic,bus=scsi0.0,scsi-id=4,drive=drive-hostdev0,id=hostdev0 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args index 8576041150..e7b89551e6 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args @@ -23,8 +23,7 @@ server,nowait \ -device lsi,id=scsi0,bus=pci.0,addr=0x3 \ -usb \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -drive file=iscsi://example.org:3260/iqn.1992-01.com.example/0,if=none,\ format=raw,id=drive-hostdev0 \ -device scsi-generic,bus=scsi0.0,scsi-id=4,drive=drive-hostdev0,id=hostdev0 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi.args index f2048fe920..344a4b1b70 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.args @@ -23,8 +23,7 @@ server,nowait \ -device lsi,id=scsi0,bus=pci.0,addr=0x3 \ -usb \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev0 \ -device scsi-generic,bus=scsi0.0,scsi-id=7,drive=drive-hostdev0,id=hostdev0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/hostdev-scsi-readonly.args b/tests/qemuxml2argvdata/hostdev-scsi-readonly.args index 0d5a0d327d..74899724cf 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-readonly.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-readonly.args @@ -23,8 +23,7 @@ server,nowait \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -usb \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev0,readonly=on \ -device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,\ drive=drive-hostdev0,id=hostdev0 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args index a3a63cf5e8..da53ef2b19 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args @@ -23,8 +23,7 @@ server,nowait \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -usb \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device vhost-scsi-pci,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,\ bus=pci.0,addr=0x5 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args index c7b420bff9..8cdde3dcce 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args @@ -23,8 +23,7 @@ server,nowait \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -usb \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ 3260/iqn.1992-01.com.example%3Astorage/1,if=none,format=raw,id=drive-hostdev0 \ -device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=4,\ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args index 8e633a3170..c464fbea49 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args @@ -23,8 +23,7 @@ server,nowait \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -usb \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -drive file=iscsi://example.org:3260/iqn.1992-01.com.example/0,if=none,\ format=raw,id=drive-hostdev0 \ -device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=4,\ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args index 13a1e9fe95..2e36e6f87f 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args @@ -23,8 +23,7 @@ server,nowait \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -usb \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev0 \ -device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,\ drive=drive-hostdev0,id=hostdev0 \ diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args index 367446312b..d9c29aab75 100644 --- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args +++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args @@ -22,7 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bootindex=1,bus=usb.0,\ port=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.args b/tests/qemuxml2argvdata/hostdev-usb-address-device.args index 1c8684aad8..43f03aa835 100644 --- a/tests/qemuxml2argvdata/hostdev-usb-address-device.args +++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.args @@ -22,7 +22,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=usb.0,port=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.args b/tests/qemuxml2argvdata/hostdev-usb-address.args index bd78ad48d2..3a8cf42dac 100644 --- a/tests/qemuxml2argvdata/hostdev-usb-address.args +++ b/tests/qemuxml2argvdata/hostdev-usb-address.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=usb.0,port=1 diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args index 2e5afccc03..a18945c0a9 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args @@ -22,7 +22,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device vfio-pci,host=55aa:20:0f.3,id=hostdev0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args b/tests/qemuxml2argvdata/hostdev-vfio.args index 1cadf610d4..92cc15eef8 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio.args +++ b/tests/qemuxml2argvdata/hostdev-vfio.args @@ -22,7 +22,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device vfio-pci,host=06:12.5,id=hostdev0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.args b/tests/qemuxml2argvdata/hugepages-memaccess.args index da1aaf3183..030e7f31ef 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess.args @@ -42,6 +42,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args b/tests/qemuxml2argvdata/hugepages-memaccess2.args index 4e7a48bc34..03667f28de 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess2.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess2.args @@ -42,6 +42,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/hugepages-shared.args b/tests/qemuxml2argvdata/hugepages-shared.args index 8c31db5fe7..30f27682de 100644 --- a/tests/qemuxml2argvdata/hugepages-shared.args +++ b/tests/qemuxml2argvdata/hugepages-shared.args @@ -38,6 +38,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxml2argvdata/input-usbmouse-addr.args index 8a41a67b6c..92eb6c88f1 100644 --- a/tests/qemuxml2argvdata/input-usbmouse-addr.args +++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args @@ -22,7 +22,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device usb-mouse,id=input0,bus=usb.0,port=2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/input-usbmouse.args b/tests/qemuxml2argvdata/input-usbmouse.args index f0e8627d1a..ecd81c02c5 100644 --- a/tests/qemuxml2argvdata/input-usbmouse.args +++ b/tests/qemuxml2argvdata/input-usbmouse.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device usb-mouse,id=input0,bus=usb.0,port=1 diff --git a/tests/qemuxml2argvdata/input-usbtablet.args b/tests/qemuxml2argvdata/input-usbtablet.args index 6762ded434..038e4a3e8f 100644 --- a/tests/qemuxml2argvdata/input-usbtablet.args +++ b/tests/qemuxml2argvdata/input-usbtablet.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device usb-tablet,id=input0,bus=usb.0,port=1 diff --git a/tests/qemuxml2argvdata/iothreads-disk.args b/tests/qemuxml2argvdata/iothreads-disk.args index 9f24233c09..8ec1faedae 100644 --- a/tests/qemuxml2argvdata/iothreads-disk.args +++ b/tests/qemuxml2argvdata/iothreads-disk.args @@ -24,8 +24,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -drive file=/var/lib/libvirt/images/iothrtest1.img,format=raw,if=none,\ id=drive-virtio-disk1 \ -device virtio-blk-pci,iothread=iothread1,bus=pci.0,addr=0x4,\ diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.args b/tests/qemuxml2argvdata/iothreads-ids-partial.args index 2181810bc0..8edf72fdbd 100644 --- a/tests/qemuxml2argvdata/iothreads-ids-partial.args +++ b/tests/qemuxml2argvdata/iothreads-ids-partial.args @@ -26,5 +26,4 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 diff --git a/tests/qemuxml2argvdata/iothreads-ids.args b/tests/qemuxml2argvdata/iothreads-ids.args index b2803df02b..3473050326 100644 --- a/tests/qemuxml2argvdata/iothreads-ids.args +++ b/tests/qemuxml2argvdata/iothreads-ids.args @@ -24,5 +24,4 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 diff --git a/tests/qemuxml2argvdata/iothreads.args b/tests/qemuxml2argvdata/iothreads.args index 487c00bdc1..39c934ec80 100644 --- a/tests/qemuxml2argvdata/iothreads.args +++ b/tests/qemuxml2argvdata/iothreads.args @@ -24,5 +24,4 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argvdata/kvm-pit-delay.args index 01588e26ed..f430ac7060 100644 --- a/tests/qemuxml2argvdata/kvm-pit-delay.args +++ b/tests/qemuxml2argvdata/kvm-pit-delay.args @@ -23,6 +23,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args b/tests/qemuxml2argvdata/kvm-pit-discard.args index 0633c36c6a..867e5c2d31 100644 --- a/tests/qemuxml2argvdata/kvm-pit-discard.args +++ b/tests/qemuxml2argvdata/kvm-pit-discard.args @@ -23,6 +23,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/machine-aliases1.args b/tests/qemuxml2argvdata/machine-aliases1.args index 7f3b21a1b3..4570f4684c 100644 --- a/tests/qemuxml2argvdata/machine-aliases1.args +++ b/tests/qemuxml2argvdata/machine-aliases1.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/machine-aliases2.args b/tests/qemuxml2argvdata/machine-aliases2.args index 4fa5208425..e952b8c28f 100644 --- a/tests/qemuxml2argvdata/machine-aliases2.args +++ b/tests/qemuxml2argvdata/machine-aliases2.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/machine-core-off.args b/tests/qemuxml2argvdata/machine-core-off.args index 6757d848a3..44ba322eb1 100644 --- a/tests/qemuxml2argvdata/machine-core-off.args +++ b/tests/qemuxml2argvdata/machine-core-off.args @@ -22,5 +22,4 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 diff --git a/tests/qemuxml2argvdata/machine-core-on.args b/tests/qemuxml2argvdata/machine-core-on.args index 34fa867553..b5f453533a 100644 --- a/tests/qemuxml2argvdata/machine-core-on.args +++ b/tests/qemuxml2argvdata/machine-core-on.args @@ -22,5 +22,4 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml2argvdata/machine-vmport-opt.args index 0ffd6552f4..4830deea57 100644 --- a/tests/qemuxml2argvdata/machine-vmport-opt.args +++ b/tests/qemuxml2argvdata/machine-vmport-opt.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/master-key.args b/tests/qemuxml2argvdata/master-key.args index 9b9a14aedd..1b0f9e3d6f 100644 --- a/tests/qemuxml2argvdata/master-key.args +++ b/tests/qemuxml2argvdata/master-key.args @@ -24,5 +24,4 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args index c60343c915..5fd90dabb0 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args @@ -29,6 +29,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.args index 5e8fdb8b6a..4dd6c2a0a9 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args @@ -29,6 +29,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2argvdata/memory-hotplug.args index 0420e3753f..4d95efc713 100644 --- a/tests/qemuxml2argvdata/memory-hotplug.args +++ b/tests/qemuxml2argvdata/memory-hotplug.args @@ -23,6 +23,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2argvdata/memtune-unlimited.args index 503358a73b..547b9ced44 100644 --- a/tests/qemuxml2argvdata/memtune-unlimited.args +++ b/tests/qemuxml2argvdata/memtune-unlimited.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args index 503358a73b..547b9ced44 100644 --- a/tests/qemuxml2argvdata/memtune.args +++ b/tests/qemuxml2argvdata/memtune.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/migrate.args b/tests/qemuxml2argvdata/migrate.args index 27e142cb84..f633031860 100644 --- a/tests/qemuxml2argvdata/migrate.args +++ b/tests/qemuxml2argvdata/migrate.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -incoming tcp:10.0.0.1:5000 diff --git a/tests/qemuxml2argvdata/minimal-msg-timestamp.args b/tests/qemuxml2argvdata/minimal-msg-timestamp.args index 6a449b287d..36a1d27074 100644 --- a/tests/qemuxml2argvdata/minimal-msg-timestamp.args +++ b/tests/qemuxml2argvdata/minimal-msg-timestamp.args @@ -22,7 +22,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/minimal-sandbox.args b/tests/qemuxml2argvdata/minimal-sandbox.args index ea74510d6f..373f91141e 100644 --- a/tests/qemuxml2argvdata/minimal-sandbox.args +++ b/tests/qemuxml2argvdata/minimal-sandbox.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args index 503358a73b..547b9ced44 100644 --- a/tests/qemuxml2argvdata/minimal.args +++ b/tests/qemuxml2argvdata/minimal.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/misc-acpi.args b/tests/qemuxml2argvdata/misc-acpi.args index 9cf9a2ecdd..d714bfaba6 100644 --- a/tests/qemuxml2argvdata/misc-acpi.args +++ b/tests/qemuxml2argvdata/misc-acpi.args @@ -21,5 +21,4 @@ server,nowait \ -no-shutdown \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args b/tests/qemuxml2argvdata/misc-disable-s3.args index 20a4233787..2aa8ff3c6a 100644 --- a/tests/qemuxml2argvdata/misc-disable-s3.args +++ b/tests/qemuxml2argvdata/misc-disable-s3.args @@ -23,5 +23,4 @@ server,nowait \ -global PIIX4_PM.disable_s3=1 \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args b/tests/qemuxml2argvdata/misc-disable-suspends.args index 84ed0a6235..e420a2344f 100644 --- a/tests/qemuxml2argvdata/misc-disable-suspends.args +++ b/tests/qemuxml2argvdata/misc-disable-suspends.args @@ -24,5 +24,4 @@ server,nowait \ -global PIIX4_PM.disable_s4=1 \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args b/tests/qemuxml2argvdata/misc-enable-s4.args index 0ad2dae258..adbba6befd 100644 --- a/tests/qemuxml2argvdata/misc-enable-s4.args +++ b/tests/qemuxml2argvdata/misc-enable-s4.args @@ -23,5 +23,4 @@ server,nowait \ -global PIIX4_PM.disable_s4=0 \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 diff --git a/tests/qemuxml2argvdata/misc-no-reboot.args b/tests/qemuxml2argvdata/misc-no-reboot.args index 79259e8ea3..5c927afd45 100644 --- a/tests/qemuxml2argvdata/misc-no-reboot.args +++ b/tests/qemuxml2argvdata/misc-no-reboot.args @@ -22,5 +22,4 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 diff --git a/tests/qemuxml2argvdata/misc-uuid.args b/tests/qemuxml2argvdata/misc-uuid.args index 9cf9a2ecdd..d714bfaba6 100644 --- a/tests/qemuxml2argvdata/misc-uuid.args +++ b/tests/qemuxml2argvdata/misc-uuid.args @@ -21,5 +21,4 @@ server,nowait \ -no-shutdown \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 diff --git a/tests/qemuxml2argvdata/monitor-json.args b/tests/qemuxml2argvdata/monitor-json.args index c2262d1279..d46543a57e 100644 --- a/tests/qemuxml2argvdata/monitor-json.args +++ b/tests/qemuxml2argvdata/monitor-json.args @@ -22,6 +22,5 @@ path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server,nowait \ -no-acpi \ -usb \ -drive file=/dev/hda1,format=qcow2,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/name-escape.args b/tests/qemuxml2argvdata/name-escape.args index d314ed409a..d0ccc01d21 100644 --- a/tests/qemuxml2argvdata/name-escape.args +++ b/tests/qemuxml2argvdata/name-escape.args @@ -28,8 +28,7 @@ bar=2/monitor.sock,server,nowait \ cache=none,throttling.bps-total=5000,throttling.iops-total=6000,\ throttling.bps-total-max=10000,throttling.iops-total-max=11000,\ throttling.group=libvirt_iotune_group1,,foo \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device ccid-card-emulated,backend=certificates,cert1=cert1,,foo,cert2=cert2,\ cert3=cert3,db=/etc/pki/nssdb,,foo,id=smartcard0,bus=ccid0.0 \ -chardev tty,id=charserial0,path=/dev/ttyS2,,foo \ diff --git a/tests/qemuxml2argvdata/net-client.args b/tests/qemuxml2argvdata/net-client.args index 2fbe0c6d8b..054064f0b2 100644 --- a/tests/qemuxml2argvdata/net-client.args +++ b/tests/qemuxml2argvdata/net-client.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -netdev socket,connect=192.168.0.1:5558,id=hostnet0 \ -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,\ addr=0x3 \ diff --git a/tests/qemuxml2argvdata/net-eth-hostip.args b/tests/qemuxml2argvdata/net-eth-hostip.args index 34450eb64a..0a18fd7ae7 100644 --- a/tests/qemuxml2argvdata/net-eth-hostip.args +++ b/tests/qemuxml2argvdata/net-eth-hostip.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -netdev tap,fd=3,id=hostnet0 \ -device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,\ addr=0x3 diff --git a/tests/qemuxml2argvdata/net-eth-ifname.args b/tests/qemuxml2argvdata/net-eth-ifname.args index 34450eb64a..0a18fd7ae7 100644 --- a/tests/qemuxml2argvdata/net-eth-ifname.args +++ b/tests/qemuxml2argvdata/net-eth-ifname.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -netdev tap,fd=3,id=hostnet0 \ -device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,\ addr=0x3 diff --git a/tests/qemuxml2argvdata/net-eth-names.args b/tests/qemuxml2argvdata/net-eth-names.args index b321716a08..7d6f0e9578 100644 --- a/tests/qemuxml2argvdata/net-eth-names.args +++ b/tests/qemuxml2argvdata/net-eth-names.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -netdev tap,fd=3,id=hostnet0 \ -device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,\ addr=0x3 \ diff --git a/tests/qemuxml2argvdata/net-eth.args b/tests/qemuxml2argvdata/net-eth.args index 34450eb64a..0a18fd7ae7 100644 --- a/tests/qemuxml2argvdata/net-eth.args +++ b/tests/qemuxml2argvdata/net-eth.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -netdev tap,fd=3,id=hostnet0 \ -device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,\ addr=0x3 diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.args b/tests/qemuxml2argvdata/net-hostdev-bootorder.args index e632d9b195..f3c332b405 100644 --- a/tests/qemuxml2argvdata/net-hostdev-bootorder.args +++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=2 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=2 \ -device pci-assign,host=03:07.1,id=hostdev0,bootindex=1,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-multidomain.args index 2fffb95dee..5df24f5d18 100644 --- a/tests/qemuxml2argvdata/net-hostdev-multidomain.args +++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.args @@ -22,7 +22,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device pci-assign,host=2424:21:1c.6,id=hostdev0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args index 8a6611e042..6903d878d1 100644 --- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args @@ -22,7 +22,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device vfio-pci,host=0021:de:1f.1,id=hostdev0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.args b/tests/qemuxml2argvdata/net-hostdev-vfio.args index 739734ecce..d8a669b836 100644 --- a/tests/qemuxml2argvdata/net-hostdev-vfio.args +++ b/tests/qemuxml2argvdata/net-hostdev-vfio.args @@ -22,7 +22,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device vfio-pci,host=03:07.1,id=hostdev0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/net-hostdev.args b/tests/qemuxml2argvdata/net-hostdev.args index e2c4e9059f..c9515b2671 100644 --- a/tests/qemuxml2argvdata/net-hostdev.args +++ b/tests/qemuxml2argvdata/net-hostdev.args @@ -22,7 +22,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device pci-assign,host=03:07.1,id=hostdev0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/net-mcast.args b/tests/qemuxml2argvdata/net-mcast.args index 945c869c9f..43668f8839 100644 --- a/tests/qemuxml2argvdata/net-mcast.args +++ b/tests/qemuxml2argvdata/net-mcast.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -netdev socket,mcast=192.0.0.1:5558,id=hostnet0 \ -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,\ addr=0x3 \ diff --git a/tests/qemuxml2argvdata/net-server.args b/tests/qemuxml2argvdata/net-server.args index 69cffb295d..06de02d698 100644 --- a/tests/qemuxml2argvdata/net-server.args +++ b/tests/qemuxml2argvdata/net-server.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -netdev socket,listen=192.168.0.1:5558,id=hostnet0 \ -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,\ addr=0x3 \ diff --git a/tests/qemuxml2argvdata/net-udp.args b/tests/qemuxml2argvdata/net-udp.args index 08729a7b96..c3c32933d0 100644 --- a/tests/qemuxml2argvdata/net-udp.args +++ b/tests/qemuxml2argvdata/net-udp.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -netdev socket,udp=192.168.10.1:5555,localaddr=192.168.10.1:5556,id=hostnet0 \ -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,\ addr=0x3 \ diff --git a/tests/qemuxml2argvdata/net-user-addr.args b/tests/qemuxml2argvdata/net-user-addr.args index 9b4cecfcec..cb2f46d294 100644 --- a/tests/qemuxml2argvdata/net-user-addr.args +++ b/tests/qemuxml2argvdata/net-user-addr.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -netdev user,net=172.17.2.0/24,ipv6-net=2001:db8:ac10:fd01::/64,id=hostnet0 \ -device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,\ addr=0x3 diff --git a/tests/qemuxml2argvdata/net-user.args b/tests/qemuxml2argvdata/net-user.args index 071da4937f..c796031c37 100644 --- a/tests/qemuxml2argvdata/net-user.args +++ b/tests/qemuxml2argvdata/net-user.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -netdev user,id=hostnet0 \ -device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,\ addr=0x3 diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.args b/tests/qemuxml2argvdata/net-vhostuser-multiq.args index f2e1b219a5..a211216381 100644 --- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args +++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev socket,id=charnet0,path=/tmp/vhost0.sock,server \ -netdev vhost-user,chardev=charnet0,id=hostnet0 \ -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,\ diff --git a/tests/qemuxml2argvdata/net-virtio-device.args b/tests/qemuxml2argvdata/net-virtio-device.args index d6b14c83cc..3d73551162 100644 --- a/tests/qemuxml2argvdata/net-virtio-device.args +++ b/tests/qemuxml2argvdata/net-virtio-device.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -netdev user,id=hostnet0 \ -device virtio-net-pci,tx=bh,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,\ bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args index 3c23d116e0..fe1c985e3c 100644 --- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args +++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest7,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -netdev user,id=hostnet0 \ -device virtio-net-pci,csum=off,gso=off,host_tso4=off,host_tso6=off,\ host_ecn=off,host_ufo=off,mrg_rxbuf=off,guest_csum=off,guest_tso4=off,\ diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.args b/tests/qemuxml2argvdata/net-virtio-netdev.args index 2ba5f20919..3db1196dea 100644 --- a/tests/qemuxml2argvdata/net-virtio-netdev.args +++ b/tests/qemuxml2argvdata/net-virtio-netdev.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -netdev user,id=hostnet0 \ -device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,\ addr=0x3 \ diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args index 30f5f3fd70..f75a79eb58 100644 --- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args +++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -netdev user,id=hostnet0 \ -device virtio-net-pci,rx_queue_size=512,tx_queue_size=1024,netdev=hostnet0,\ id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/net-virtio.args b/tests/qemuxml2argvdata/net-virtio.args index 3379064806..39ca2c035c 100644 --- a/tests/qemuxml2argvdata/net-virtio.args +++ b/tests/qemuxml2argvdata/net-virtio.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -netdev user,id=hostnet0 \ -device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,\ addr=0x3 diff --git a/tests/qemuxml2argvdata/nosharepages.args b/tests/qemuxml2argvdata/nosharepages.args index 4ccca528ca..bfac1b25c6 100644 --- a/tests/qemuxml2argvdata/nosharepages.args +++ b/tests/qemuxml2argvdata/nosharepages.args @@ -22,5 +22,4 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args index bd7a506256..2343d2a0a1 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args index bd7a506256..2343d2a0a1 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args index bd7a506256..2343d2a0a1 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args index bd7a506256..2343d2a0a1 100644 --- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args +++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args index bd7a506256..2343d2a0a1 100644 --- a/tests/qemuxml2argvdata/numad.args +++ b/tests/qemuxml2argvdata/numad.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args index bd7a506256..2343d2a0a1 100644 --- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args +++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/numatune-memory.args b/tests/qemuxml2argvdata/numatune-memory.args index bd7a506256..2343d2a0a1 100644 --- a/tests/qemuxml2argvdata/numatune-memory.args +++ b/tests/qemuxml2argvdata/numatune-memory.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/panic-no-address.args b/tests/qemuxml2argvdata/panic-no-address.args index 59395fa4a9..efd287ba96 100644 --- a/tests/qemuxml2argvdata/panic-no-address.args +++ b/tests/qemuxml2argvdata/panic-no-address.args @@ -22,7 +22,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -device pvpanic diff --git a/tests/qemuxml2argvdata/panic.args b/tests/qemuxml2argvdata/panic.args index 6cdf618626..5307da1d7f 100644 --- a/tests/qemuxml2argvdata/panic.args +++ b/tests/qemuxml2argvdata/panic.args @@ -22,7 +22,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -device pvpanic,ioport=1285 diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args b/tests/qemuxml2argvdata/parallel-parport-chardev.args index 66515c1860..f03efd361f 100644 --- a/tests/qemuxml2argvdata/parallel-parport-chardev.args +++ b/tests/qemuxml2argvdata/parallel-parport-chardev.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev parport,id=charparallel0,path=/dev/parport0 \ -device isa-parallel,chardev=charparallel0,id=parallel0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.args b/tests/qemuxml2argvdata/parallel-tcp-chardev.args index 709bd5f1c3..e1befe14aa 100644 --- a/tests/qemuxml2argvdata/parallel-tcp-chardev.args +++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev socket,id=charparallel0,host=127.0.0.1,port=9999,server,nowait \ -device isa-parallel,chardev=charparallel0,id=parallel0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2argvdata/pci-autoadd-addr.args index fab64502e7..1ec645d8dc 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-addr.args +++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args @@ -28,7 +28,7 @@ server,nowait \ -device pci-bridge,chassis_nr=7,id=pci.7,bus=pci.0,addr=0x9 \ -usb \ -drive file=/var/iso/f18kde.iso,format=raw,if=none,id=drive-ide0-1-0,\ -media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +readonly=on \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -vga cirrus \ -device virtio-balloon-pci,id=balloon0,bus=pci.7,addr=0x6 diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2argvdata/pci-autoadd-idx.args index a181202c46..e56c648536 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-idx.args +++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args @@ -29,7 +29,7 @@ server,nowait \ -device pci-bridge,chassis_nr=7,id=pci.7,bus=pci.0,addr=0xa \ -usb \ -drive file=/var/iso/f18kde.iso,format=raw,if=none,id=drive-ide0-1-0,\ -media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +readonly=on \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -vga cirrus \ -device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x6 diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdata/pci-bridge.args index cd40dc5d46..4df7953f2b 100644 --- a/tests/qemuxml2argvdata/pci-bridge.args +++ b/tests/qemuxml2argvdata/pci-bridge.args @@ -22,8 +22,8 @@ server,nowait \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x4 \ -usb \ -drive file=/var/iso/f18kde.iso,format=raw,if=none,id=drive-ide0-1-0,\ -media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +readonly=on \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -netdev user,id=hostnet0 \ -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:f1:95:51,bus=pci.0,\ addr=0x5 \ diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args index 2c448906c1..7b06be8b15 100644 --- a/tests/qemuxml2argvdata/pci-many.args +++ b/tests/qemuxml2argvdata/pci-many.args @@ -21,8 +21,8 @@ server,nowait \ -no-shutdown \ -usb \ -drive file=/var/iso/f18kde.iso,format=raw,if=none,id=drive-ide0-1-0,\ -media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +readonly=on \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -drive file=/var/lib/libvirt/images/test.img,format=raw,if=none,\ id=drive-virtio-disk0 \ -device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args index d1d8ddda03..64d7b16632 100644 --- a/tests/qemuxml2argvdata/pci-rom.args +++ b/tests/qemuxml2argvdata/pci-rom.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -netdev user,id=hostnet0 \ -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,\ addr=0x3,rombar=1 \ diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args index 406716075b..d127dd46c7 100644 --- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev tty,id=charserial0,path=/dev/ttyS2 \ -device pci-serial,chardev=charserial0,id=serial0,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2argvdata/pcie-expander-bus.args index 6de62ceba8..9328f98390 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus.args @@ -58,7 +58,7 @@ path=/tmp/lib/domain--1-pcie-expander-bus-te/monitor.sock,server,nowait \ -device xio3130-downstream,port=0x1e,chassis=34,id=pci.34,bus=pci.3,addr=0x1e \ -device xio3130-downstream,port=0x1f,chassis=35,id=pci.35,bus=pci.3,addr=0x1f \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \ --device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \ +-device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \ -netdev user,id=hostnet0 \ -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:f1:95:51,bus=pci.4,\ addr=0x0 \ diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2argvdata/pcie-root-port.args index 91e05fcb78..7d96a5aa5c 100644 --- a/tests/qemuxml2argvdata/pcie-root-port.args +++ b/tests/qemuxml2argvdata/pcie-root-port.args @@ -24,6 +24,6 @@ server,nowait \ addr=0x2 \ -device ioh3420,port=0x1a,chassis=40,id=pci.2,bus=pcie.0,addr=0x2.0x1 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \ --device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \ +-device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,\ addr=0x1 diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args index d86f8fdfaa..a670850b0d 100644 --- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args @@ -31,6 +31,6 @@ server,nowait \ -device xio3130-downstream,port=0x5,chassis=9,id=pci.9,bus=pci.2,addr=0x5 \ -device xio3130-downstream,port=0x6,chassis=10,id=pci.10,bus=pci.2,addr=0x6 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \ --device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \ +-device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,\ addr=0x1 diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args index 12bfdbb938..9ef2bb0269 100644 --- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args @@ -26,6 +26,6 @@ addr=0x2 \ -device x3130-upstream,id=pci.3,bus=pci.1,addr=0x0 \ -device x3130-upstream,id=pci.4,bus=pci.2,addr=0x0 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \ --device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \ +-device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,\ addr=0x1 diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argvdata/pcihole64-q35.args index 139ee92b56..08163189ec 100644 --- a/tests/qemuxml2argvdata/pcihole64-q35.args +++ b/tests/qemuxml2argvdata/pcihole64-q35.args @@ -22,6 +22,6 @@ server,nowait \ -no-acpi \ -global q35-pcihost.pci-hole64-size=1048576K \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \ --device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \ +-device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,\ addr=0x1 diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2argvdata/q35-usb2-multi.args index ffd05a86c4..85427bbb49 100644 --- a/tests/qemuxml2argvdata/q35-usb2-multi.args +++ b/tests/qemuxml2argvdata/q35-usb2-multi.args @@ -38,6 +38,6 @@ addr=0x1 \ -device ich9-usb-uhci2,masterbus=usb2.0,firstport=2,bus=pci.2,addr=0x1.0x1 \ -device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.2,addr=0x1.0x2 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \ --device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \ +-device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,\ addr=0x1 diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2argvdata/q35-usb2-reorder.args index 92e6fe9994..2e9a6d595e 100644 --- a/tests/qemuxml2argvdata/q35-usb2-reorder.args +++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args @@ -38,6 +38,6 @@ multifunction=on,addr=0x1a \ -device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.2,multifunction=on,\ addr=0x1 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \ --device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \ +-device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,\ addr=0x1 diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/q35-usb2.args index c8de3158a1..03ae90892d 100644 --- a/tests/qemuxml2argvdata/q35-usb2.args +++ b/tests/qemuxml2argvdata/q35-usb2.args @@ -28,6 +28,6 @@ addr=0x1d \ -device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pcie.0,addr=0x1d.0x1 \ -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \ --device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \ +-device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,\ addr=0x1 diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.args index 4c34afec91..10f3d48a8d 100644 --- a/tests/qemuxml2argvdata/q35.args +++ b/tests/qemuxml2argvdata/q35.args @@ -26,6 +26,6 @@ addr=0x1d \ -device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pcie.0,addr=0x1d.0x1 \ -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \ --device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \ +-device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,\ addr=0x1 diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvdata/qemu-ns-alt.args index 3f1612ebe8..b72aed97b5 100644 --- a/tests/qemuxml2argvdata/qemu-ns-alt.args +++ b/tests/qemuxml2argvdata/qemu-ns-alt.args @@ -24,7 +24,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -unknown parameter diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args index ee776c1314..2fd0bfa444 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 ARGUMENT diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args index ee776c1314..2fd0bfa444 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 ARGUMENT diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args b/tests/qemuxml2argvdata/qemu-ns-commandline.args index ee776c1314..2fd0bfa444 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 ARGUMENT diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args index ee776c1314..2fd0bfa444 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 ARGUMENT diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args index ee776c1314..2fd0bfa444 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 ARGUMENT diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args index ee776c1314..2fd0bfa444 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 ARGUMENT diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemu-ns-no-env.args index 1873eb1764..6de707e0cb 100644 --- a/tests/qemuxml2argvdata/qemu-ns-no-env.args +++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -unknown parameter diff --git a/tests/qemuxml2argvdata/qemu-ns.args b/tests/qemuxml2argvdata/qemu-ns.args index 3f1612ebe8..b72aed97b5 100644 --- a/tests/qemuxml2argvdata/qemu-ns.args +++ b/tests/qemuxml2argvdata/qemu-ns.args @@ -24,7 +24,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -unknown parameter diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args b/tests/qemuxml2argvdata/restore-v2-fd.args index 6d92ceec56..0d6752ea3f 100644 --- a/tests/qemuxml2argvdata/restore-v2-fd.args +++ b/tests/qemuxml2argvdata/restore-v2-fd.args @@ -22,7 +22,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -incoming fd:7 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/restore-v2.args b/tests/qemuxml2argvdata/restore-v2.args index ad70c5d840..35180eb836 100644 --- a/tests/qemuxml2argvdata/restore-v2.args +++ b/tests/qemuxml2argvdata/restore-v2.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -incoming exec:cat diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2argvdata/seclabel-dac-none.args index 503358a73b..547b9ced44 100644 --- a/tests/qemuxml2argvdata/seclabel-dac-none.args +++ b/tests/qemuxml2argvdata/seclabel-dac-none.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args index 503358a73b..547b9ced44 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args index 503358a73b..547b9ced44 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args b/tests/qemuxml2argvdata/seclabel-dynamic-override.args index cb2c49cdba..a1993c1800 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-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-0-1 \ --device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ +-device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args index 503358a73b..547b9ced44 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args b/tests/qemuxml2argvdata/seclabel-dynamic.args index 503358a73b..547b9ced44 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/seclabel-none.args b/tests/qemuxml2argvdata/seclabel-none.args index 503358a73b..547b9ced44 100644 --- a/tests/qemuxml2argvdata/seclabel-none.args +++ b/tests/qemuxml2argvdata/seclabel-none.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args b/tests/qemuxml2argvdata/seclabel-static-labelskip.args index 503358a73b..547b9ced44 100644 --- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args b/tests/qemuxml2argvdata/seclabel-static-relabel.args index 503358a73b..547b9ced44 100644 --- a/tests/qemuxml2argvdata/seclabel-static-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/seclabel-static.args b/tests/qemuxml2argvdata/seclabel-static.args index 503358a73b..547b9ced44 100644 --- a/tests/qemuxml2argvdata/seclabel-static.args +++ b/tests/qemuxml2argvdata/seclabel-static.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args index b68030a641..c2bf28b160 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev tty,id=charserial0,path=/dev/ttyS2 \ -device isa-serial,chardev=charserial0,id=serial0,iobase=0x3f8,irq=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args b/tests/qemuxml2argvdata/serial-dev-chardev.args index d91d8c6b33..87ade2468f 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev tty,id=charserial0,path=/dev/ttyS2 \ -device isa-serial,chardev=charserial0,id=serial0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args b/tests/qemuxml2argvdata/serial-file-chardev.args index 4a363e2cd7..ae1c2a322e 100644 --- a/tests/qemuxml2argvdata/serial-file-chardev.args +++ b/tests/qemuxml2argvdata/serial-file-chardev.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev file,id=charserial0,path=/tmp/serial.log,append=on \ -device isa-serial,chardev=charserial0,id=serial0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/serial-file-log.args b/tests/qemuxml2argvdata/serial-file-log.args index 29665d1cd8..d3ef2f15b1 100644 --- a/tests/qemuxml2argvdata/serial-file-log.args +++ b/tests/qemuxml2argvdata/serial-file-log.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev file,id=charserial0,path=/tmp/serial.log,\ logfile=/var/lib/libvirt/qemu/demo-serial.log,logappend=off \ -device isa-serial,chardev=charserial0,id=serial0 diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args b/tests/qemuxml2argvdata/serial-many-chardev.args index 6c7d0867d0..c0aa52a235 100644 --- a/tests/qemuxml2argvdata/serial-many-chardev.args +++ b/tests/qemuxml2argvdata/serial-many-chardev.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev pty,id=charserial0 \ -device isa-serial,chardev=charserial0,id=serial0 \ -chardev file,id=charserial1,path=/tmp/serial.log \ diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args b/tests/qemuxml2argvdata/serial-pty-chardev.args index cac821d5b9..40f70e5c9d 100644 --- a/tests/qemuxml2argvdata/serial-pty-chardev.args +++ b/tests/qemuxml2argvdata/serial-pty-chardev.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev pty,id=charserial0 \ -device isa-serial,chardev=charserial0,id=serial0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/serial-spiceport-nospice.args b/tests/qemuxml2argvdata/serial-spiceport-nospice.args index 503358a73b..547b9ced44 100644 --- a/tests/qemuxml2argvdata/serial-spiceport-nospice.args +++ b/tests/qemuxml2argvdata/serial-spiceport-nospice.args @@ -22,6 +22,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/serial-spiceport.args b/tests/qemuxml2argvdata/serial-spiceport.args index 1d2677f9ba..f43c003645 100644 --- a/tests/qemuxml2argvdata/serial-spiceport.args +++ b/tests/qemuxml2argvdata/serial-spiceport.args @@ -21,8 +21,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev spiceport,id=charserial0,name=org.qemu.console.serial.0 \ -device isa-serial,chardev=charserial0,id=serial0 \ -device usb-tablet,id=input0,bus=usb.0,port=1 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args b/tests/qemuxml2argvdata/serial-tcp-chardev.args index a3e892e010..968a81a9af 100644 --- a/tests/qemuxml2argvdata/serial-tcp-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-chardev.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev socket,id=charserial0,host=127.0.0.1,port=9999 \ -device isa-serial,chardev=charserial0,id=serial0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args index 28dc45a244..175cb24de1 100644 --- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev socket,id=charserial0,host=127.0.0.1,port=9999,telnet,server,nowait \ -device isa-serial,chardev=charserial0,id=serial0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args index 144e28e013..ec6b5cb7f3 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev udp,id=charserial0,host=127.0.0.1,port=2222,localaddr=127.0.0.1,\ localport=1111 \ -device isa-serial,chardev=charserial0,id=serial0 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args index 9f7ea17037..cf0bc9bba9 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev udp,id=charserial0,host=127.0.0.1,port=2222,localaddr=127.0.0.1,\ localport=1111 \ -device isa-serial,chardev=charserial0,id=serial0 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args index 9f7ea17037..cf0bc9bba9 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev udp,id=charserial0,host=127.0.0.1,port=2222,localaddr=127.0.0.1,\ localport=1111 \ -device isa-serial,chardev=charserial0,id=serial0 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args index e8279f209a..98eb9b0392 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args @@ -24,8 +24,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev udp,id=charserial0,host=127.0.0.1,port=2222,localaddr=127.0.0.1,\ localport=1111 \ -device isa-serial,chardev=charserial0,id=serial0 \ diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args b/tests/qemuxml2argvdata/serial-udp-chardev.args index 7fd6c639ac..9f8502653e 100644 --- a/tests/qemuxml2argvdata/serial-udp-chardev.args +++ b/tests/qemuxml2argvdata/serial-udp-chardev.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev udp,id=charserial0,host=127.0.0.1,port=9998,localaddr=127.0.0.1,\ localport=9999 \ -device isa-serial,chardev=charserial0,id=serial0 \ diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args b/tests/qemuxml2argvdata/serial-vc-chardev.args index a9aeafff84..3c5b808e83 100644 --- a/tests/qemuxml2argvdata/serial-vc-chardev.args +++ b/tests/qemuxml2argvdata/serial-vc-chardev.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev vc,id=charserial0 \ -device isa-serial,chardev=charserial0,id=serial0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args index b9100e17ad..faf4068557 100644 --- a/tests/qemuxml2argvdata/smbios.args +++ b/tests/qemuxml2argvdata/smbios.args @@ -32,6 +32,5 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args index 24e7663ca8..a275ce12e3 100644 --- a/tests/qemuxml2argvdata/smp.args +++ b/tests/qemuxml2argvdata/smp.args @@ -22,5 +22,4 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 diff --git a/tests/qemuxml2argvdata/sound-device.args b/tests/qemuxml2argvdata/sound-device.args index 6677111a21..52ff53f2a9 100644 --- a/tests/qemuxml2argvdata/sound-device.args +++ b/tests/qemuxml2argvdata/sound-device.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -soundhw pcspk \ -device ES1370,id=sound1,bus=pci.0,addr=0x3 \ -device sb16,id=sound2 \ diff --git a/tests/qemuxml2argvdata/sound.args b/tests/qemuxml2argvdata/sound.args index 42190d1603..7097de5719 100644 --- a/tests/qemuxml2argvdata/sound.args +++ b/tests/qemuxml2argvdata/sound.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -soundhw pcspk \ -device ES1370,id=sound1,bus=pci.0,addr=0x3 \ -device sb16,id=sound2 \ diff --git a/tests/qemuxml2argvdata/user-aliases.args b/tests/qemuxml2argvdata/user-aliases.args index 7fd3b4a6e1..faa8ad02d4 100644 --- a/tests/qemuxml2argvdata/user-aliases.args +++ b/tests/qemuxml2argvdata/user-aliases.args @@ -53,8 +53,8 @@ id=drive-ua-myEncryptedDisk1 \ -device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-ua-myEncryptedDisk1,\ id=ua-myEncryptedDisk1 \ -drive file=/home/zippy/tmp/install-amd64-minimal-20140619.iso,format=raw,\ -if=none,id=drive-ua-WhatAnAwesomeCDROM,media=cdrom,readonly=on,cache=none \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ua-WhatAnAwesomeCDROM,\ +if=none,id=drive-ua-WhatAnAwesomeCDROM,readonly=on,cache=none \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ua-WhatAnAwesomeCDROM,\ id=ua-WhatAnAwesomeCDROM,bootindex=2 \ -global isa-fdc.driveA=drive-ua-myDisk1 \ -netdev tap,fd=3,id=hostua-CheckoutThisNIC,vhost=on,vhostfd=44 \ diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args b/tests/qemuxml2argvdata/video-device-pciaddr-default.args index 6d336eee28..b158efff85 100644 --- a/tests/qemuxml2argvdata/video-device-pciaddr-default.args +++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.args @@ -22,8 +22,7 @@ server,nowait \ -usb \ -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,\ id=drive-ide0-0-0,cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -vnc 127.0.0.1:0 \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,\ addr=0x3 \ diff --git a/tests/qemuxml2argvdata/video-none-device.args b/tests/qemuxml2argvdata/video-none-device.args index fbd6332cb5..f89485f478 100644 --- a/tests/qemuxml2argvdata/video-none-device.args +++ b/tests/qemuxml2argvdata/video-none-device.args @@ -21,7 +21,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -vnc 127.0.0.1:0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args index b8e39d059d..2860b24977 100644 --- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args @@ -23,8 +23,7 @@ server,nowait \ -usb \ -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,\ id=drive-ide0-0-0,cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=16,\ bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/video-qxl-device.args b/tests/qemuxml2argvdata/video-qxl-device.args index ce6b329bfe..faeab8a8ff 100644 --- a/tests/qemuxml2argvdata/video-qxl-device.args +++ b/tests/qemuxml2argvdata/video-qxl-device.args @@ -23,8 +23,7 @@ server,nowait \ -usb \ -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,\ id=drive-ide0-0-0,cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,\ addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/video-qxl-heads.args b/tests/qemuxml2argvdata/video-qxl-heads.args index 6ef5d4937d..9d1df0d0dd 100644 --- a/tests/qemuxml2argvdata/video-qxl-heads.args +++ b/tests/qemuxml2argvdata/video-qxl-heads.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,max_outputs=1,\ bus=pci.0,addr=0x2 \ -device qxl,id=video1,ram_size=67108864,vram_size=33554432,max_outputs=3,\ diff --git a/tests/qemuxml2argvdata/video-qxl-nodevice.args b/tests/qemuxml2argvdata/video-qxl-nodevice.args index 3c21b6fa66..05664fe472 100644 --- a/tests/qemuxml2argvdata/video-qxl-nodevice.args +++ b/tests/qemuxml2argvdata/video-qxl-nodevice.args @@ -23,8 +23,7 @@ server,nowait \ -usb \ -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,\ id=drive-ide0-0-0,cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -vga qxl \ -global qxl-vga.ram_size=67108864 \ -global qxl-vga.vram_size=67108864 \ diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.args b/tests/qemuxml2argvdata/video-qxl-noheads.args index e3370565fb..eb0bf2ae38 100644 --- a/tests/qemuxml2argvdata/video-qxl-noheads.args +++ b/tests/qemuxml2argvdata/video-qxl-noheads.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,max_outputs=1,\ bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args index ba2a7dfd92..1550c4382c 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args @@ -23,8 +23,7 @@ server,nowait \ -usb \ -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,\ id=drive-ide0-0-0,cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=16,\ bus=pci.0,addr=0x2 \ -device qxl,id=video1,ram_size=67108864,vram_size=67108864,vgamem_mb=16,\ diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args b/tests/qemuxml2argvdata/video-qxl-sec-device.args index 56622f788b..88997a0bfa 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args @@ -23,8 +23,7 @@ server,nowait \ -usb \ -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,\ id=drive-ide0-0-0,cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,\ addr=0x2 \ -device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \ diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.args b/tests/qemuxml2argvdata/video-vga-device-vgamem.args index 83d9256103..b12a146681 100644 --- a/tests/qemuxml2argvdata/video-vga-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.args @@ -23,7 +23,6 @@ server,nowait \ -usb \ -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,\ id=drive-ide0-0-0,cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device VGA,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/video-vga-device.args b/tests/qemuxml2argvdata/video-vga-device.args index 31497f446c..74fe2e4294 100644 --- a/tests/qemuxml2argvdata/video-vga-device.args +++ b/tests/qemuxml2argvdata/video-vga-device.args @@ -23,7 +23,6 @@ server,nowait \ -usb \ -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,\ id=drive-ide0-0-0,cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device VGA,id=video0,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/video-vga-nodevice.args b/tests/qemuxml2argvdata/video-vga-nodevice.args index d007c67f87..00a34ce89d 100644 --- a/tests/qemuxml2argvdata/video-vga-nodevice.args +++ b/tests/qemuxml2argvdata/video-vga-nodevice.args @@ -23,7 +23,6 @@ server,nowait \ -usb \ -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,\ id=drive-ide0-0-0,cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -vga std \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args b/tests/qemuxml2argvdata/video-vga-qxl-heads.args index e74976b604..0be5676daa 100644 --- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args +++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -vga qxl \ -global qxl-vga.ram_size=67108864 \ -global qxl-vga.vram_size=67108864 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args b/tests/qemuxml2argvdata/video-virtio-gpu-device.args index 7590338556..2e624328a2 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args @@ -23,7 +23,6 @@ server,nowait \ -usb \ -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,\ id=drive-ide0-0-0,cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-gpu-pci,id=video0,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args index c4e63dbf06..506e243f12 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args @@ -21,8 +21,7 @@ server,nowait \ -usb \ -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,\ id=drive-ide0-0-0,cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -display sdl,gl=on \ -device virtio-gpu-pci,id=video0,virgl=on,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args index 2e90098130..be8af429c1 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args @@ -22,8 +22,7 @@ server,nowait \ -usb \ -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,\ id=drive-ide0-0-0,cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -spice port=0,gl=on,rendernode=/dev/dri/foo \ -device virtio-gpu-pci,id=video0,virgl=on,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args index 02cc5ed97c..2cefd44142 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args @@ -23,7 +23,6 @@ server,nowait \ -usb \ -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,\ id=drive-ide0-0-0,cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-gpu-pci,id=video0,virgl=on,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/video-virtio-vga.args b/tests/qemuxml2argvdata/video-virtio-vga.args index 463e9d97ff..7b97fa7bc3 100644 --- a/tests/qemuxml2argvdata/video-virtio-vga.args +++ b/tests/qemuxml2argvdata/video-virtio-vga.args @@ -23,7 +23,6 @@ server,nowait \ -usb \ -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,\ id=drive-ide0-0-0,cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-vga,id=video0,max_outputs=1,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdata/vmcoreinfo.args index d093fdbd94..c2f746cc8d 100644 --- a/tests/qemuxml2argvdata/vmcoreinfo.args +++ b/tests/qemuxml2argvdata/vmcoreinfo.args @@ -22,7 +22,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -device vmcoreinfo diff --git a/tests/qemuxml2argvdata/watchdog-device.args b/tests/qemuxml2argvdata/watchdog-device.args index e7f4c658a3..a226951bc8 100644 --- a/tests/qemuxml2argvdata/watchdog-device.args +++ b/tests/qemuxml2argvdata/watchdog-device.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device ib700,id=watchdog0 \ -watchdog-action poweroff \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/watchdog-dump.args b/tests/qemuxml2argvdata/watchdog-dump.args index 5065308b13..ec1394f7f3 100644 --- a/tests/qemuxml2argvdata/watchdog-dump.args +++ b/tests/qemuxml2argvdata/watchdog-dump.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device ib700,id=watchdog0 \ -watchdog-action pause \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.args b/tests/qemuxml2argvdata/watchdog-injectnmi.args index 51a55fe569..176dca6769 100644 --- a/tests/qemuxml2argvdata/watchdog-injectnmi.args +++ b/tests/qemuxml2argvdata/watchdog-injectnmi.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device ib700,id=watchdog0 \ -watchdog-action inject-nmi \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/watchdog.args b/tests/qemuxml2argvdata/watchdog.args index 5f79028bad..99eb95b5ef 100644 --- a/tests/qemuxml2argvdata/watchdog.args +++ b/tests/qemuxml2argvdata/watchdog.args @@ -22,7 +22,6 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device ib700,id=watchdog0 \ -watchdog-action poweroff diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a873977d81..b42dd0b28e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1972,15 +1972,11 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_MMIO); DO_TEST_PARSE_ERROR("mach-virt-serial-invalid-machine", NONE); - DO_TEST("disk-ide-split", - QEMU_CAPS_IDE_CD); - DO_TEST("disk-ide-wwn", - QEMU_CAPS_IDE_CD, - QEMU_CAPS_IDE_DRIVE_WWN); + DO_TEST("disk-ide-split", NONE); + DO_TEST("disk-ide-wwn", QEMU_CAPS_IDE_DRIVE_WWN); DO_TEST("disk-geometry", NONE); - DO_TEST("disk-blockio", - QEMU_CAPS_IDE_CD, QEMU_CAPS_BLOCKIO); + DO_TEST("disk-blockio", QEMU_CAPS_BLOCKIO); DO_TEST("video-device-pciaddr-default", QEMU_CAPS_KVM, -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:56PM +0100, Peter Krempa wrote:
The split of scsi-disk into the two separate devices was introduced by
s/scsi-disk/ide-drive/
qemu commit 1f56e32a7f4b3 released in qemu v0.15.
Note that when compared to the previous commit which made sure that no disk related tests were touched, in this case it's not as careful.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 36 +++++++------------ .../caps_1.5.3.x86_64.xml | 1 - .../caps_1.6.0.x86_64.xml | 1 - .../caps_1.7.0.x86_64.xml | 1 - .../caps_2.1.1.x86_64.xml | 1 - .../caps_2.10.0.aarch64.xml | 1 - .../caps_2.10.0.ppc64.xml | 1 - .../caps_2.10.0.x86_64.xml | 1 - .../caps_2.11.0.x86_64.xml | 1 - .../caps_2.12.0.aarch64.xml | 1 - .../caps_2.12.0.ppc64.xml | 1 - .../caps_2.12.0.x86_64.xml | 1 - .../caps_2.4.0.x86_64.xml | 1 - .../caps_2.5.0.x86_64.xml | 1 - .../caps_2.6.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - .../caps_2.6.0.x86_64.xml | 1 - .../caps_2.7.0.x86_64.xml | 1 - .../caps_2.8.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - .../caps_2.9.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 - .../caps_3.0.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - .../caps_3.1.0.x86_64.xml | 1 - .../caps_4.0.0.riscv32.xml | 1 - .../caps_4.0.0.riscv64.xml | 1 - .../caps_4.0.0.x86_64.xml | 1 - tests/qemuxml2argvdata/autoindex.args | 2 +- .../qemuxml2argvdata/balloon-device-auto.args | 3 +- [...] tests/qemuxml2argvdata/watchdog-device.args | 3 +- tests/qemuxml2argvdata/watchdog-dump.args | 3 +- .../qemuxml2argvdata/watchdog-injectnmi.args | 3 +- tests/qemuxml2argvdata/watchdog.args | 3 +- tests/qemuxml2argvtest.c | 10 ++---- 293 files changed, 358 insertions(+), 654 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Cast disk->bus to proper type and add missing values to the enum so it's more obvious what types are supported. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_command.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 77018a2c4b..7c79223812 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1910,7 +1910,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, if (disk->iothread && !qemuCheckIOThreads(def, disk)) goto error; - switch (disk->bus) { + switch ((virDomainDiskBus) disk->bus) { case VIR_DOMAIN_DISK_BUS_IDE: if (disk->info.addr.drive.target != 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -2132,6 +2132,10 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virBufferAsprintf(&opt, "floppy,unit=%d", disk->info.addr.drive.unit); break; + case VIR_DOMAIN_DISK_BUS_XEN: + case VIR_DOMAIN_DISK_BUS_UML: + case VIR_DOMAIN_DISK_BUS_SD: + case VIR_DOMAIN_DISK_BUS_LAST: default: virReportError(VIR_ERR_INTERNAL_ERROR, _("unsupported disk bus '%s' with device setup"), bus); -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:57PM +0100, Peter Krempa wrote:
Cast disk->bus to proper type and add missing values to the enum so it's more obvious what types are supported.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_command.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Add full and empty cdroms on 'usb', 'virtio', and 'sd' bus to have test coverage. Note that this does not guarantee that qemu will accept them. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../disk-cdrom-bus-other.x86_64-latest.args | 45 +++++++++++++ .../qemuxml2argvdata/disk-cdrom-bus-other.xml | 58 +++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../disk-cdrom-bus-other.xml | 64 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 5 files changed, 169 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom-bus-other.xml create mode 100644 tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args new file mode 100644 index 0000000000..9dd45133fc --- /dev/null +++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args @@ -0,0 +1,45 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-drive file=/root/boot.iso,format=raw,if=none,id=drive-usb-disk0,media=cdrom,\ +readonly=on \ +-device usb-storage,bus=usb.0,port=1,drive=drive-usb-disk0,id=usb-disk0,\ +removable=off \ +-drive if=none,id=drive-usb-disk1,media=cdrom,readonly=on \ +-device usb-storage,bus=usb.0,port=2,drive=drive-usb-disk1,id=usb-disk1,\ +removable=off \ +-drive file=/root/boot1.iso,format=raw,if=none,id=drive-virtio-disk0,\ +media=cdrom,readonly=on,cache=none \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,\ +id=virtio-disk0,write-cache=on \ +-drive if=none,id=drive-virtio-disk1,media=cdrom,readonly=on \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,\ +id=virtio-disk1,write-cache=on \ +-drive file=/root/boot2.iso,format=raw,if=sd,index=2,media=cdrom,readonly=on \ +-drive if=sd,index=3,media=cdrom,readonly=on \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.xml b/tests/qemuxml2argvdata/disk-cdrom-bus-other.xml new file mode 100644 index 0000000000..2ed86b0900 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.xml @@ -0,0 +1,58 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <description>This test is meant for testing CDROMS with buses which don't really support them</description> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/root/boot.iso'/> + <target dev='sda' bus='usb'/> + <readonly/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <target dev='sdb' bus='usb'/> + <readonly/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw' cache='none'/> + <source file='/root/boot1.iso'/> + <target dev='vda' bus='virtio'/> + <readonly/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw' cache='none'/> + <target dev='vdb' bus='virtio'/> + <readonly/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/root/boot2.iso'/> + <target dev='sdc' bus='sd'/> + <readonly/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <target dev='sdd' bus='sd'/> + <readonly/> + </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 b42dd0b28e..dd4f73a5fb 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1011,6 +1011,7 @@ mymain(void) DO_TEST("disk-cdrom", NONE); DO_TEST_CAPS_VER("disk-cdrom", "2.12.0"); DO_TEST_CAPS_LATEST("disk-cdrom"); + DO_TEST_CAPS_LATEST("disk-cdrom-bus-other"); DO_TEST("disk-iscsi", NONE); DO_TEST("disk-cdrom-network", QEMU_CAPS_KVM); DO_TEST_CAPS_VER("disk-cdrom-network", "2.12.0"); diff --git a/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml b/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml new file mode 100644 index 0000000000..a9f2806777 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml @@ -0,0 +1,64 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <description>This test is meant for testing CDROMS with buses which don't really support them</description> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/root/boot.iso'/> + <target dev='sda' bus='usb'/> + <readonly/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <target dev='sdb' bus='usb'/> + <readonly/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw' cache='none'/> + <source file='/root/boot1.iso'/> + <target dev='vda' bus='virtio'/> + <readonly/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw' cache='none'/> + <target dev='vdb' bus='virtio'/> + <readonly/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/root/boot2.iso'/> + <target dev='sdc' bus='sd'/> + <readonly/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <target dev='sdd' bus='sd'/> + <readonly/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 370920f926..b38cbd6994 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -346,6 +346,7 @@ mymain(void) DO_TEST("qemu-ns-no-env", NONE); DO_TEST("disk-aio", NONE); DO_TEST("disk-cdrom", NONE); + DO_TEST("disk-cdrom-bus-other", NONE); DO_TEST("disk-floppy", NONE); DO_TEST("disk-usb-device", NONE); DO_TEST("disk-virtio", NONE); -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:58PM +0100, Peter Krempa wrote:
Add full and empty cdroms on 'usb', 'virtio', and 'sd' bus to have test
Feels odd to add 'virtio' here if you remove it in the next patch.
coverage. Note that this does not guarantee that qemu will accept them.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../disk-cdrom-bus-other.x86_64-latest.args | 45 +++++++++++++ .../qemuxml2argvdata/disk-cdrom-bus-other.xml | 58 +++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../disk-cdrom-bus-other.xml | 64 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 5 files changed, 169 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom-bus-other.xml create mode 100644 tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Attempting to create an empty virtio-blk drive results into: -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0xc,drive=drive-virtio-disk1,id=virtio-disk1: Device needs media, but drive is empty Attempting to eject media from virtio-blk based drive results into: error: internal error: unable to execute QEMU command 'eject': Device 'drive-virtio-disk0' is not removable Forbid configurations where users would attempt to use cdroms in virtio bus. Test fallout apart from the recently added case contains one more wrong example which is not really relevant to the tested code, thus I've changed the type. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_domain.c | 8 ++++++++ .../disk-cdrom-bus-other.x86_64-latest.args | 7 ------- tests/qemuxml2argvdata/disk-cdrom-bus-other.xml | 11 ----------- .../disk-scsi-disk-vpd-build-error.xml | 2 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 4 ++-- tests/qemuxml2argvdata/pci-autofill-addr.xml | 2 +- tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml | 13 ------------- tests/qemuxml2xmloutdata/pci-autofill-addr.xml | 2 +- 8 files changed, 13 insertions(+), 36 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e2b0bd87b4..f27ba9b740 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5078,6 +5078,14 @@ qemuDomainDeviceDefValidateDisk(const virDomainDiskDef *disk, return -1; } + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM && + disk->bus == VIR_DOMAIN_DISK_BUS_VIRTIO) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("disk type 'virtio' of '%s' does not support ejectable media"), + disk->dst); + return -1; + } + return 0; } diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args index 9dd45133fc..a64da3edd6 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args @@ -31,13 +31,6 @@ removable=off \ -drive if=none,id=drive-usb-disk1,media=cdrom,readonly=on \ -device usb-storage,bus=usb.0,port=2,drive=drive-usb-disk1,id=usb-disk1,\ removable=off \ --drive file=/root/boot1.iso,format=raw,if=none,id=drive-virtio-disk0,\ -media=cdrom,readonly=on,cache=none \ --device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,\ -id=virtio-disk0,write-cache=on \ --drive if=none,id=drive-virtio-disk1,media=cdrom,readonly=on \ --device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,\ -id=virtio-disk1,write-cache=on \ -drive file=/root/boot2.iso,format=raw,if=sd,index=2,media=cdrom,readonly=on \ -drive if=sd,index=3,media=cdrom,readonly=on \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.xml b/tests/qemuxml2argvdata/disk-cdrom-bus-other.xml index 2ed86b0900..a142373afb 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.xml +++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.xml @@ -26,17 +26,6 @@ <target dev='sdb' bus='usb'/> <readonly/> </disk> - <disk type='file' device='cdrom'> - <driver name='qemu' type='raw' cache='none'/> - <source file='/root/boot1.iso'/> - <target dev='vda' bus='virtio'/> - <readonly/> - </disk> - <disk type='file' device='cdrom'> - <driver name='qemu' type='raw' cache='none'/> - <target dev='vdb' bus='virtio'/> - <readonly/> - </disk> <disk type='file' device='cdrom'> <driver name='qemu' type='raw'/> <source file='/root/boot2.iso'/> diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.xml b/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.xml index e116aff114..6c83715be2 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.xml +++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.xml @@ -14,7 +14,7 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='cdrom'> + <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sda' bus='virtio'/> <vendor>SEAGATE</vendor> diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2argvdata/pci-autofill-addr.args index b546443db3..1508787f8b 100644 --- a/tests/qemuxml2argvdata/pci-autofill-addr.args +++ b/tests/qemuxml2argvdata/pci-autofill-addr.args @@ -22,8 +22,8 @@ server,nowait \ -no-acpi \ -usb \ -drive file=/var/iso/f18kde.iso,format=raw,if=none,id=drive-virtio-disk0,\ -media=cdrom,readonly=on \ +readonly=on \ -device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ -id=virtio-disk0 \ +id=virtio-disk0,bootindex=1 \ -vga cirrus \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.xml b/tests/qemuxml2argvdata/pci-autofill-addr.xml index 0d10ec8635..a601c50ab9 100644 --- a/tests/qemuxml2argvdata/pci-autofill-addr.xml +++ b/tests/qemuxml2argvdata/pci-autofill-addr.xml @@ -10,7 +10,7 @@ </os> <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='file' device='cdrom'> + <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/var/iso/f18kde.iso'/> <target dev='vda' bus='virtio'/> diff --git a/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml b/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml index a9f2806777..e5eb7d6a98 100644 --- a/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml +++ b/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml @@ -26,19 +26,6 @@ <target dev='sdb' bus='usb'/> <readonly/> </disk> - <disk type='file' device='cdrom'> - <driver name='qemu' type='raw' cache='none'/> - <source file='/root/boot1.iso'/> - <target dev='vda' bus='virtio'/> - <readonly/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </disk> - <disk type='file' device='cdrom'> - <driver name='qemu' type='raw' cache='none'/> - <target dev='vdb' bus='virtio'/> - <readonly/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </disk> <disk type='file' device='cdrom'> <driver name='qemu' type='raw'/> <source file='/root/boot2.iso'/> diff --git a/tests/qemuxml2xmloutdata/pci-autofill-addr.xml b/tests/qemuxml2xmloutdata/pci-autofill-addr.xml index 581d42f11e..84cf1043e3 100644 --- a/tests/qemuxml2xmloutdata/pci-autofill-addr.xml +++ b/tests/qemuxml2xmloutdata/pci-autofill-addr.xml @@ -14,7 +14,7 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='file' device='cdrom'> + <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/var/iso/f18kde.iso'/> <target dev='vda' bus='virtio'/> -- 2.20.1
On Mon, Feb 04, 2019 at 04:46:59PM +0100, Peter Krempa wrote:
Attempting to create an empty virtio-blk drive results into: -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0xc,drive=drive-virtio-disk1,id=virtio-disk1: Device needs media, but drive is empty
Attempting to eject media from virtio-blk based drive results into: error: internal error: unable to execute QEMU command 'eject': Device 'drive-virtio-disk0' is not removable
Forbid configurations where users would attempt to use cdroms in virtio bus.
Test fallout apart from the recently added case contains one more wrong example which is not really relevant to the tested code, thus I've changed the type.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_domain.c | 8 ++++++++ .../disk-cdrom-bus-other.x86_64-latest.args | 7 ------- tests/qemuxml2argvdata/disk-cdrom-bus-other.xml | 11 ----------- .../disk-scsi-disk-vpd-build-error.xml | 2 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 4 ++-- tests/qemuxml2argvdata/pci-autofill-addr.xml | 2 +- tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml | 13 ------------- tests/qemuxml2xmloutdata/pci-autofill-addr.xml | 2 +- 8 files changed, 13 insertions(+), 36 deletions(-)
diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args index 9dd45133fc..a64da3edd6 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args @@ -31,13 +31,6 @@ removable=off \ -drive if=none,id=drive-usb-disk1,media=cdrom,readonly=on \ -device usb-storage,bus=usb.0,port=2,drive=drive-usb-disk1,id=usb-disk1,\ removable=off \ --drive file=/root/boot1.iso,format=raw,if=none,id=drive-virtio-disk0,\ -media=cdrom,readonly=on,cache=none \ --device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,\ -id=virtio-disk0,write-cache=on \ --drive if=none,id=drive-virtio-disk1,media=cdrom,readonly=on \ --device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,\ -id=virtio-disk1,write-cache=on \ -drive file=/root/boot2.iso,format=raw,if=sd,index=2,media=cdrom,readonly=on \ -drive if=sd,index=3,media=cdrom,readonly=on \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.xml b/tests/qemuxml2argvdata/disk-cdrom-bus-other.xml index 2ed86b0900..a142373afb 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.xml +++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.xml @@ -26,17 +26,6 @@ <target dev='sdb' bus='usb'/> <readonly/> </disk> - <disk type='file' device='cdrom'> - <driver name='qemu' type='raw' cache='none'/> - <source file='/root/boot1.iso'/> - <target dev='vda' bus='virtio'/> - <readonly/> - </disk> - <disk type='file' device='cdrom'> - <driver name='qemu' type='raw' cache='none'/> - <target dev='vdb' bus='virtio'/> - <readonly/> - </disk> <disk type='file' device='cdrom'> <driver name='qemu' type='raw'/> <source file='/root/boot2.iso'/>
Consider squashing these hunks into the previous patch. Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
For SCSI, IDE, and AHCI cdroms the appropriate device types which select the correct media are used. In qemu there's one other code path that looks at -drive media=cdrom in the XEN pv code. Thankfully we don't support it with qemu (see qemuBuildDiskDeviceStr). All other devices ignore it as the comment states, thus we can drop that code. The test fallout is expectedly only in the test added for uncommon cdrom types. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_command.c | 9 --------- .../disk-cdrom-bus-other.x86_64-latest.args | 9 ++++----- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7c79223812..eaeeb3a05d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1757,15 +1757,6 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_STORAGE_WERROR)) qemuBuildDiskFrontendAttributeErrorPolicy(disk, &opt); - - /* While this is a frontend attribute, it only makes sense to be used when - * legacy -drive is used. In modern qemu the 'ide-cd' or 'scsi-cd' are used. - * virtio and other just ignore the attribute anyways */ - if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM && - disk->bus != VIR_DOMAIN_DISK_BUS_SCSI && - disk->bus != VIR_DOMAIN_DISK_BUS_IDE) - virBufferAddLit(&opt, ",media=cdrom"); - if (disk->src->readonly) virBufferAddLit(&opt, ",readonly=on"); diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args index a64da3edd6..cb7902dfd0 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args @@ -24,15 +24,14 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -no-acpi \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ --drive file=/root/boot.iso,format=raw,if=none,id=drive-usb-disk0,media=cdrom,\ -readonly=on \ +-drive file=/root/boot.iso,format=raw,if=none,id=drive-usb-disk0,readonly=on \ -device usb-storage,bus=usb.0,port=1,drive=drive-usb-disk0,id=usb-disk0,\ removable=off \ --drive if=none,id=drive-usb-disk1,media=cdrom,readonly=on \ +-drive if=none,id=drive-usb-disk1,readonly=on \ -device usb-storage,bus=usb.0,port=2,drive=drive-usb-disk1,id=usb-disk1,\ removable=off \ --drive file=/root/boot2.iso,format=raw,if=sd,index=2,media=cdrom,readonly=on \ --drive if=sd,index=3,media=cdrom,readonly=on \ +-drive file=/root/boot2.iso,format=raw,if=sd,index=2,readonly=on \ +-drive if=sd,index=3,readonly=on \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ -msg timestamp=on -- 2.20.1
On Mon, Feb 04, 2019 at 04:47:00PM +0100, Peter Krempa wrote:
For SCSI, IDE, and AHCI cdroms the appropriate device types which select the correct media are used. In qemu there's one other code path that looks at -drive media=cdrom in the XEN pv code. Thankfully we don't support it with qemu (see qemuBuildDiskDeviceStr). All other devices ignore it as the comment states, thus we can drop that code.
The test fallout is expectedly only in the test added for uncommon cdrom types.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_command.c | 9 --------- .../disk-cdrom-bus-other.x86_64-latest.args | 9 ++++----- 2 files changed, 4 insertions(+), 14 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Upcoming addition of a new field will need to make sure that SCSI disk serial is tested as well. Add a case to one of the existing tests. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-scsi.xml | 1 + tests/qemuxml2xmloutdata/disk-scsi.xml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args index ac9f3ff02e..68a8b2921d 100644 --- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args @@ -34,7 +34,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \ -drive file=/tmp/scsidisk2.img,format=raw,if=none,id=drive-scsi1-0-0-0 \ -device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,\ -id=scsi1-0-0-0 \ +id=scsi1-0-0-0,serial=abcdefghijklmn \ -drive file=/tmp/scsidisk3.img,format=raw,if=none,id=drive-scsi2-0-0-0 \ -device scsi-hd,bus=scsi2.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi2-0-0-0,\ id=scsi2-0-0-0,wwn=0x5000c50015ea71ac \ diff --git a/tests/qemuxml2argvdata/disk-scsi.xml b/tests/qemuxml2argvdata/disk-scsi.xml index 496d8cab39..dda413eb0c 100644 --- a/tests/qemuxml2argvdata/disk-scsi.xml +++ b/tests/qemuxml2argvdata/disk-scsi.xml @@ -28,6 +28,7 @@ <source file='/tmp/scsidisk2.img'/> <target dev='sdb' bus='scsi'/> <address type='drive' controller='1' bus='0' target='0' unit='0'/> + <serial>abcdefghijklmn</serial> </disk> <disk type='file' device='disk'> <source file='/tmp/scsidisk3.img'/> diff --git a/tests/qemuxml2xmloutdata/disk-scsi.xml b/tests/qemuxml2xmloutdata/disk-scsi.xml index 96c0cfec74..9cfff4b14e 100644 --- a/tests/qemuxml2xmloutdata/disk-scsi.xml +++ b/tests/qemuxml2xmloutdata/disk-scsi.xml @@ -30,6 +30,7 @@ <driver name='qemu' type='raw'/> <source file='/tmp/scsidisk2.img'/> <target dev='sdb' bus='scsi'/> + <serial>abcdefghijklmn</serial> <address type='drive' controller='1' bus='0' target='0' unit='0'/> </disk> <disk type='file' device='disk'> -- 2.20.1
On Mon, Feb 04, 2019 at 04:47:01PM +0100, Peter Krempa wrote:
Upcoming addition of a new field will need to make sure that SCSI disk serial is tested as well. Add a case to one of the existing tests.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-scsi.xml | 1 + tests/qemuxml2xmloutdata/disk-scsi.xml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Based on qemu commit 'v3.1.0-1445-ga61faa3d02'. Will allow checking for the scsi 'device_id' property. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../caps_4.0.0.x86_64.replies | 2296 +++++++++-------- .../caps_4.0.0.x86_64.xml | 29 +- 2 files changed, 1248 insertions(+), 1077 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies index f39f047f1f..aaa4da4d8e 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies @@ -21,7 +21,7 @@ "minor": 1, "major": 3 }, - "package": "v3.1.0-759-g15bede5541" + "package": "v3.1.0-1445-ga61faa3d02" }, "id": "libvirt-2" } @@ -411,9 +411,6 @@ { "name": "nbd-server-stop" }, - { - "name": "x-nbd-server-add-bitmap" - }, { "name": "nbd-server-remove" }, @@ -502,13 +499,13 @@ "name": "x-debug-block-dirty-bitmap-sha256" }, { - "name": "x-block-dirty-bitmap-merge" + "name": "block-dirty-bitmap-merge" }, { - "name": "x-block-dirty-bitmap-disable" + "name": "block-dirty-bitmap-disable" }, { - "name": "x-block-dirty-bitmap-enable" + "name": "block-dirty-bitmap-enable" }, { "name": "block-dirty-bitmap-clear" @@ -522,6 +519,9 @@ { "name": "drive-mirror" }, + { + "name": "x-debug-query-block-graph" + }, { "name": "query-named-block-nodes" }, @@ -801,10 +801,6 @@ "name": "virtio-keyboard-pci", "parent": "virtio-input-hid-pci" }, - { - "name": "xen-sysbus", - "parent": "bus" - }, { "name": "i440FX", "parent": "pci-device" @@ -841,10 +837,6 @@ "name": "chardev-pty", "parent": "chardev" }, - { - "name": "xen-apic", - "parent": "apic-common" - }, { "name": "SUNW,fdtwo", "parent": "base-sysbus-fdc" @@ -865,14 +857,14 @@ "name": "filter-rewriter", "parent": "netfilter" }, - { - "name": "virtio-serial-pci", - "parent": "virtio-serial-pci-base" - }, { "name": "pc-q35-4.0-machine", "parent": "generic-pc-machine" }, + { + "name": "virtio-serial-pci", + "parent": "virtio-serial-pci-base" + }, { "name": "Nehalem-IBRS-x86_64-cpu", "parent": "x86_64-cpu" @@ -893,6 +885,10 @@ "name": "usb-host", "parent": "usb-device" }, + { + "name": "usb-mtp", + "parent": "usb-device" + }, { "name": "Icelake-Client-x86_64-cpu", "parent": "x86_64-cpu" @@ -906,12 +902,12 @@ "parent": "pci-device" }, { - "name": "qemu64-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pc-i440fx-1.4-machine", + "parent": "generic-pc-machine" }, { - "name": "PIIX3-xen", - "parent": "pci-piix3" + "name": "qemu64-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "virtio-input-host-pci", @@ -930,16 +926,12 @@ "parent": "e1000-base" }, { - "name": "ICH9-LPC", - "parent": "pci-device" - }, - { - "name": "pc-i440fx-1.4-machine", - "parent": "generic-pc-machine" + "name": "PIIX3-xen", + "parent": "pci-piix3" }, { - "name": "ich9-usb-uhci6", - "parent": "pci-uhci-usb" + "name": "ICH9-LPC", + "parent": "pci-device" }, { "name": "sysbus-ahci", @@ -950,12 +942,12 @@ "parent": "pci-uhci-usb" }, { - "name": "pc-q35-2.6-machine", - "parent": "generic-pc-machine" + "name": "ich9-usb-uhci6", + "parent": "pci-uhci-usb" }, { - "name": "usb-mtp", - "parent": "usb-device" + "name": "pc-q35-2.6-machine", + "parent": "generic-pc-machine" }, { "name": "ccid-card-emulated", @@ -1009,10 +1001,6 @@ "name": "rtl8139", "parent": "pci-device" }, - { - "name": "virtio-input-host-pci-transitional", - "parent": "virtio-input-host-pci-base" - }, { "name": "chardev-hci", "parent": "chardev" @@ -1057,10 +1045,6 @@ "name": "unimplemented-device", "parent": "sys-bus-device" }, - { - "name": "tls-creds-anon", - "parent": "tls-creds" - }, { "name": "pc-i440fx-3.0-machine", "parent": "generic-pc-machine" @@ -1082,8 +1066,8 @@ "parent": "object" }, { - "name": "vhost-scsi-pci", - "parent": "vhost-scsi-pci-base" + "name": "pc-i440fx-2.12-machine", + "parent": "generic-pc-machine" }, { "name": "floppy-bus", @@ -1097,21 +1081,21 @@ "name": "virtio-vga", "parent": "virtio-pci" }, - { - "name": "pc-i440fx-2.12-machine", - "parent": "generic-pc-machine" - }, { "name": "vmware-svga", "parent": "pci-device" }, + { + "name": "isa-serial", + "parent": "isa-device" + }, { "name": "pc-0.13-machine", "parent": "generic-pc-machine" }, { - "name": "isa-serial", - "parent": "isa-device" + "name": "virtio-input-host-pci-transitional", + "parent": "virtio-input-host-pci-base" }, { "name": "virtio-serial-device", @@ -1121,6 +1105,10 @@ "name": "isa-debug-exit", "parent": "isa-device" }, + { + "name": "vhost-scsi-pci", + "parent": "vhost-scsi-pci-base" + }, { "name": "chardev-gdb", "parent": "chardev" @@ -1134,8 +1122,8 @@ "parent": "isa-device" }, { - "name": "xen-backend", - "parent": "xen-sysdev" + "name": "tls-creds-anon", + "parent": "tls-creds" }, { "name": "Haswell-noTSX-IBRS-x86_64-cpu", @@ -1521,14 +1509,14 @@ "name": "Westmere-IBRS-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "Cascadelake-Server-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "usb-serial", "parent": "usb-serial-dev" }, + { + "name": "Cascadelake-Server-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "vt82c686b-usb-uhci", "parent": "pci-uhci-usb" @@ -1545,10 +1533,6 @@ "name": "vhost-user-scsi-pci-non-transitional", "parent": "vhost-user-scsi-pci-base" }, - { - "name": "xen-sysdev", - "parent": "sys-bus-device" - }, { "name": "intel-iommu", "parent": "x86-iommu" @@ -1617,10 +1601,6 @@ "name": "ccid-bus", "parent": "bus" }, - { - "name": "xenpv-machine", - "parent": "machine" - }, { "name": "EPYC-IBPB-x86_64-cpu", "parent": "x86_64-cpu" @@ -1874,11 +1854,11 @@ "parent": "virtio-pci" }, { - "name": "ich9-usb-ehci1", + "name": "ich9-usb-ehci2", "parent": "pci-ehci-usb" }, { - "name": "ich9-usb-ehci2", + "name": "ich9-usb-ehci1", "parent": "pci-ehci-usb" }, { @@ -1965,14 +1945,14 @@ "name": "pc-dimm", "parent": "device" }, - { - "name": "vhost-vsock-pci-non-transitional", - "parent": "vhost-vsock-pci-base" - }, { "name": "gus", "parent": "isa-device" }, + { + "name": "vhost-vsock-pci-non-transitional", + "parent": "vhost-vsock-pci-base" + }, { "name": "hyperv-testdev", "parent": "isa-device" @@ -1985,10 +1965,6 @@ "name": "pc-i440fx-2.2-machine", "parent": "generic-pc-machine" }, - { - "name": "xen-pci-passthrough", - "parent": "pci-device" - }, { "name": "cryptodev-backend", "parent": "object" @@ -2113,10 +2089,6 @@ "name": "virtio-9p-device", "parent": "virtio-device" }, - { - "name": "ivshmem", - "parent": "ivshmem-common" - }, { "name": "imx-usdhc", "parent": "generic-sdhci" @@ -2141,18 +2113,10 @@ "name": "virtio-scsi-pci", "parent": "virtio-scsi-pci-base" }, - { - "name": "piix3-ide", - "parent": "pci-ide" - }, { "name": "virtio-pci-bus", "parent": "virtio-bus" }, - { - "name": "xen-pvdevice", - "parent": "pci-device" - }, { "name": "ES1370", "parent": "pci-device" @@ -2162,8 +2126,8 @@ "parent": "pcie-port" }, { - "name": "xenfv-machine", - "parent": "generic-pc-machine" + "name": "piix3-ide", + "parent": "pci-ide" }, { "name": "pci-testdev", @@ -2198,36 +2162,32 @@ "parent": "virtserialport" }, { - "name": "vhost-user-scsi-pci-transitional", - "parent": "vhost-user-scsi-pci-base" + "name": "pci-serial-2x", + "parent": "pci-device" }, { "name": "pentium3-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "pci-serial-2x", - "parent": "pci-device" + "name": "vhost-user-scsi-pci-transitional", + "parent": "vhost-user-scsi-pci-base" }, { "name": "ne2k_isa", "parent": "isa-device" }, - { - "name": "Nehalem-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "isa-fdc", "parent": "isa-device" }, { - "name": "pc-i440fx-2.6-machine", - "parent": "generic-pc-machine" + "name": "Nehalem-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "xen-platform", - "parent": "pci-device" + "name": "pc-i440fx-2.6-machine", + "parent": "generic-pc-machine" }, { "name": "chardev-serial", @@ -2241,14 +2201,14 @@ "name": "colo-compare", "parent": "object" }, - { - "name": "e1000e", - "parent": "pci-device" - }, { "name": "virtio-tablet-pci", "parent": "virtio-input-hid-pci" }, + { + "name": "e1000e", + "parent": "pci-device" + }, { "name": "usb-bus", "parent": "bus" @@ -2317,10 +2277,6 @@ "name": "isa-applesmc", "parent": "isa-device" }, - { - "name": "xen-accel", - "parent": "accel" - }, { "name": "secret", "parent": "object" @@ -2361,22 +2317,22 @@ "name": "sysbus-fdc", "parent": "base-sysbus-fdc" }, - { - "name": "megasas-gen2", - "parent": "megasas-base" - }, - { - "name": "vhost-scsi-pci-transitional", - "parent": "vhost-scsi-pci-base" - }, { "name": "ramfb", "parent": "sys-bus-device" }, + { + "name": "megasas-gen2", + "parent": "megasas-base" + }, { "name": "pc-1.0-machine", "parent": "generic-pc-machine" }, + { + "name": "vhost-scsi-pci-transitional", + "parent": "vhost-scsi-pci-base" + }, { "name": "core2duo-x86_64-cpu", "parent": "x86_64-cpu" @@ -2494,8 +2450,8 @@ "parent": "pit-common" }, { - "name": "virtio-net-pci-non-transitional", - "parent": "virtio-net-pci-base" + "name": "pc-1.2-machine", + "parent": "generic-pc-machine" }, { "name": "vfio-platform", @@ -2506,8 +2462,8 @@ "parent": "pci-device" }, { - "name": "pc-1.2-machine", - "parent": "generic-pc-machine" + "name": "virtio-net-pci-non-transitional", + "parent": "virtio-net-pci-base" }, { "name": "virtio-scsi-pci-non-transitional", @@ -2853,15 +2809,19 @@ "type": "bool" }, { - "name": "x-pcie-pm-init", + "name": "indirect_desc", "description": "on/off", "type": "bool" }, { - "name": "indirect_desc", + "name": "x-pcie-pm-init", "description": "on/off", "type": "bool" }, + { + "name": "rsc_interval", + "type": "uint32" + }, { "name": "guest_csum", "description": "on/off", @@ -3103,6 +3063,11 @@ "description": "on/off", "type": "bool" }, + { + "name": "guest_rsc_ext", + "description": "on/off", + "type": "bool" + }, { "name": "rx_queue_size", "type": "uint16" @@ -3489,106 +3454,109 @@ { "return": [ { - "name": "serial", - "type": "str" + "name": "min_io_size", + "type": "uint16" }, { - "name": "port_index", - "type": "uint16" + "name": "secs", + "type": "uint32" }, { - "name": "dpofua", + "name": "removable", "description": "on/off", "type": "bool" }, { - "name": "lun", + "name": "channel", "type": "uint32" }, { - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "name": "discard_granularity", + "name": "heads", "type": "uint32" }, { - "name": "scsi_version", - "type": "int32" + "name": "lun", + "type": "uint32" }, { - "name": "max_unmap_size", - "type": "uint64" + "name": "dpofua", + "description": "on/off", + "type": "bool" }, { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", + "name": "ver", "type": "str" }, { - "name": "port_wwn", - "type": "uint64" - }, - { - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" + "name": "scsi-id", + "type": "uint32" }, { - "name": "share-rw", - "type": "bool" + "name": "cyls", + "type": "uint32" }, { - "name": "min_io_size", + "name": "logical_block_size", + "description": "A power of two between 512 and 32768", "type": "uint16" }, { - "name": "opt_io_size", - "type": "uint32" + "name": "rotation_rate", + "type": "uint16" }, { - "name": "product", + "name": "drive", + "description": "Node name or ID of a block device to use as a backend", "type": "str" }, { - "name": "scsi-id", - "type": "uint32" - }, - { - "name": "bootindex", + "name": "scsi_version", "type": "int32" }, { - "name": "vendor", - "type": "str" + "name": "werror", + "description": "Error handling policy, report/ignore/enospc/stop/auto", + "type": "BlockdevOnError" }, { - "name": "channel", + "name": "discard_granularity", "type": "uint32" }, { - "name": "wwn", + "name": "port_wwn", "type": "uint64" }, { - "name": "werror", + "name": "max_unmap_size", + "type": "uint64" + }, + { + "name": "rerror", "description": "Error handling policy, report/ignore/enospc/stop/auto", "type": "BlockdevOnError" }, { - "name": "removable", - "description": "on/off", + "name": "max_io_size", + "type": "uint64" + }, + { + "name": "device_id", + "type": "str" + }, + { + "name": "wwn", + "type": "uint64" + }, + { + "name": "share-rw", "type": "bool" }, { - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" + "name": "product", + "type": "str" }, { - "name": "ver", + "name": "vendor", "type": "str" }, { @@ -3597,8 +3565,25 @@ "type": "uint16" }, { - "name": "max_io_size", - "type": "uint64" + "name": "port_index", + "type": "uint16" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "serial", + "type": "str" + }, + { + "name": "write-cache", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "name": "opt_io_size", + "type": "uint32" } ], "id": "libvirt-15" @@ -3618,6 +3603,10 @@ "name": "serial", "type": "str" }, + { + "name": "secs", + "type": "uint32" + }, { "name": "logical_block_size", "description": "A power of two between 512 and 32768", @@ -3627,14 +3616,22 @@ "name": "discard_granularity", "type": "uint32" }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "rotation_rate", + "type": "uint16" + }, { "name": "drive", "description": "Node name or ID of a block device to use as a backend", "type": "str" }, { - "name": "bootindex", - "type": "int32" + "name": "heads", + "type": "uint32" }, { "name": "write-cache", @@ -3653,6 +3650,11 @@ "name": "opt_io_size", "type": "uint32" }, + { + "name": "bios-chs-trans", + "description": "Logical CHS translation algorithm, auto/none/lba/large/rechs", + "type": "BiosAtaTranslation" + }, { "name": "unit", "type": "uint32" @@ -3683,6 +3685,10 @@ "name": "physical_block_size", "description": "A power of two between 512 and 32768", "type": "uint16" + }, + { + "name": "cyls", + "type": "uint32" } ], "id": "libvirt-16" @@ -5312,11 +5318,6 @@ "name": "pc-i440fx-2.7", "cpu-max": 255 }, - { - "hotpluggable-cpus": true, - "name": "xenfv", - "cpu-max": 128 - }, { "hotpluggable-cpus": true, "name": "pc-i440fx-2.3", @@ -5374,11 +5375,6 @@ "name": "pc-q35-3.0", "cpu-max": 288 }, - { - "hotpluggable-cpus": false, - "name": "xenpv", - "cpu-max": 1 - }, { "hotpluggable-cpus": true, "name": "pc-q35-2.10", @@ -5466,12 +5462,12 @@ }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-1.4", + "name": "pc-i440fx-2.10", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-2.10", + "name": "pc-i440fx-1.4", "cpu-max": 255 }, { @@ -5727,7 +5723,9 @@ "misalignsse", "xop", "fma4", - "tbm" + "tbm", + "npt", + "nrip-save" ], "static": false, "migration-safe": true @@ -5739,7 +5737,9 @@ "sse4a", "misalignsse", "xop", - "fma4" + "fma4", + "npt", + "nrip-save" ], "static": false, "migration-safe": true @@ -5916,7 +5916,9 @@ "sse4a", "misalignsse", "osvw", - "ibpb" + "ibpb", + "npt", + "nrip-save" ], "static": false, "migration-safe": true @@ -5931,7 +5933,9 @@ "cr8legacy", "sse4a", "misalignsse", - "osvw" + "osvw", + "npt", + "nrip-save" ], "static": false, "migration-safe": true @@ -7580,223 +7584,229 @@ "meta-type": "command", "arg-type": "0" }, + { + "name": "x-debug-query-block-graph", + "ret-type": "29", + "meta-type": "command", + "arg-type": "0" + }, { "name": "drive-mirror", "ret-type": "0", "meta-type": "command", - "arg-type": "29" + "arg-type": "30" }, { "name": "block-dirty-bitmap-add", "ret-type": "0", "meta-type": "command", - "arg-type": "30" + "arg-type": "31" }, { "name": "block-dirty-bitmap-remove", "ret-type": "0", "meta-type": "command", - "arg-type": "31" + "arg-type": "32" }, { "name": "block-dirty-bitmap-clear", "ret-type": "0", "meta-type": "command", - "arg-type": "31" + "arg-type": "32" }, { - "name": "x-block-dirty-bitmap-enable", + "name": "block-dirty-bitmap-enable", "ret-type": "0", "meta-type": "command", - "arg-type": "31" + "arg-type": "32" }, { - "name": "x-block-dirty-bitmap-disable", + "name": "block-dirty-bitmap-disable", "ret-type": "0", "meta-type": "command", - "arg-type": "31" + "arg-type": "32" }, { - "name": "x-block-dirty-bitmap-merge", + "name": "block-dirty-bitmap-merge", "ret-type": "0", "meta-type": "command", - "arg-type": "32" + "arg-type": "33" }, { "name": "x-debug-block-dirty-bitmap-sha256", - "ret-type": "33", + "ret-type": "34", "meta-type": "command", - "arg-type": "31" + "arg-type": "32" }, { "name": "blockdev-mirror", "ret-type": "0", "meta-type": "command", - "arg-type": "34" + "arg-type": "35" }, { "name": "block_set_io_throttle", "ret-type": "0", "meta-type": "command", - "arg-type": "35" + "arg-type": "36" }, { "name": "block-stream", "ret-type": "0", "meta-type": "command", - "arg-type": "36" + "arg-type": "37" }, { "name": "block-job-set-speed", "ret-type": "0", "meta-type": "command", - "arg-type": "37" + "arg-type": "38" }, { "name": "block-job-cancel", "ret-type": "0", "meta-type": "command", - "arg-type": "38" + "arg-type": "39" }, { "name": "block-job-pause", "ret-type": "0", "meta-type": "command", - "arg-type": "39" + "arg-type": "40" }, { "name": "block-job-resume", "ret-type": "0", "meta-type": "command", - "arg-type": "40" + "arg-type": "41" }, { "name": "block-job-complete", "ret-type": "0", "meta-type": "command", - "arg-type": "41" + "arg-type": "42" }, { "name": "block-job-dismiss", "ret-type": "0", "meta-type": "command", - "arg-type": "42" + "arg-type": "43" }, { "name": "block-job-finalize", "ret-type": "0", "meta-type": "command", - "arg-type": "43" + "arg-type": "44" }, { "name": "blockdev-add", "ret-type": "0", "meta-type": "command", - "arg-type": "44" + "arg-type": "45" }, { "name": "blockdev-del", "ret-type": "0", "meta-type": "command", - "arg-type": "45" + "arg-type": "46" }, { "name": "blockdev-create", "ret-type": "0", "meta-type": "command", - "arg-type": "46" + "arg-type": "47" }, { "name": "blockdev-open-tray", "ret-type": "0", "meta-type": "command", - "arg-type": "47" + "arg-type": "48" }, { "name": "blockdev-close-tray", "ret-type": "0", "meta-type": "command", - "arg-type": "48" + "arg-type": "49" }, { "name": "blockdev-remove-medium", "ret-type": "0", "meta-type": "command", - "arg-type": "49" + "arg-type": "50" }, { "name": "blockdev-insert-medium", "ret-type": "0", "meta-type": "command", - "arg-type": "50" + "arg-type": "51" }, { "name": "blockdev-change-medium", "ret-type": "0", "meta-type": "command", - "arg-type": "51" + "arg-type": "52" }, { "name": "BLOCK_IMAGE_CORRUPTED", "meta-type": "event", - "arg-type": "52" + "arg-type": "53" }, { "name": "BLOCK_IO_ERROR", "meta-type": "event", - "arg-type": "53" + "arg-type": "54" }, { "name": "BLOCK_JOB_COMPLETED", "meta-type": "event", - "arg-type": "54" + "arg-type": "55" }, { "name": "BLOCK_JOB_CANCELLED", "meta-type": "event", - "arg-type": "55" + "arg-type": "56" }, { "name": "BLOCK_JOB_ERROR", "meta-type": "event", - "arg-type": "56" + "arg-type": "57" }, { "name": "BLOCK_JOB_READY", "meta-type": "event", - "arg-type": "57" + "arg-type": "58" }, { "name": "BLOCK_JOB_PENDING", "meta-type": "event", - "arg-type": "58" + "arg-type": "59" }, { "name": "BLOCK_WRITE_THRESHOLD", "meta-type": "event", - "arg-type": "59" + "arg-type": "60" }, { "name": "block-set-write-threshold", "ret-type": "0", "meta-type": "command", - "arg-type": "60" + "arg-type": "61" }, { "name": "x-blockdev-change", "ret-type": "0", "meta-type": "command", - "arg-type": "61" + "arg-type": "62" }, { "name": "x-blockdev-set-iothread", "ret-type": "0", "meta-type": "command", - "arg-type": "62" + "arg-type": "63" }, { "name": "query-pr-managers", - "ret-type": "[63]", + "ret-type": "[64]", "meta-type": "command", "arg-type": "0" }, @@ -7804,40 +7814,34 @@ "name": "blockdev-snapshot-internal-sync", "ret-type": "0", "meta-type": "command", - "arg-type": "64" + "arg-type": "65" }, { "name": "blockdev-snapshot-delete-internal-sync", - "ret-type": "66", + "ret-type": "67", "meta-type": "command", - "arg-type": "65" + "arg-type": "66" }, { "name": "eject", "ret-type": "0", "meta-type": "command", - "arg-type": "67" - }, - { - "name": "nbd-server-start", - "ret-type": "0", - "meta-type": "command", "arg-type": "68" }, { - "name": "nbd-server-add", + "name": "nbd-server-start", "ret-type": "0", "meta-type": "command", "arg-type": "69" }, { - "name": "nbd-server-remove", + "name": "nbd-server-add", "ret-type": "0", "meta-type": "command", "arg-type": "70" }, { - "name": "x-nbd-server-add-bitmap", + "name": "nbd-server-remove", "ret-type": "0", "meta-type": "command", "arg-type": "71" @@ -9559,6 +9563,20 @@ }, { "name": "29", + "members": [ + { + "name": "nodes", + "type": "[234]" + }, + { + "name": "edges", + "type": "[235]" + } + ], + "meta-type": "object" + }, + { + "name": "30", "members": [ { "name": "job-id", @@ -9630,7 +9648,7 @@ { "name": "copy-mode", "default": null, - "type": "234" + "type": "236" }, { "name": "auto-finalize", @@ -9646,7 +9664,7 @@ "meta-type": "object" }, { - "name": "30", + "name": "31", "members": [ { "name": "node", @@ -9672,7 +9690,7 @@ "type": "bool" }, { - "name": "x-disabled", + "name": "disabled", "default": null, "type": "bool" } @@ -9680,7 +9698,7 @@ "meta-type": "object" }, { - "name": "31", + "name": "32", "members": [ { "name": "node", @@ -9694,25 +9712,25 @@ "meta-type": "object" }, { - "name": "32", + "name": "33", "members": [ { "name": "node", "type": "str" }, { - "name": "dst_name", + "name": "target", "type": "str" }, { - "name": "src_name", - "type": "str" + "name": "bitmaps", + "type": "[str]" } ], "meta-type": "object" }, { - "name": "33", + "name": "34", "members": [ { "name": "sha256", @@ -9722,7 +9740,7 @@ "meta-type": "object" }, { - "name": "34", + "name": "35", "members": [ { "name": "job-id", @@ -9779,7 +9797,7 @@ { "name": "copy-mode", "default": null, - "type": "234" + "type": "236" }, { "name": "auto-finalize", @@ -9795,7 +9813,7 @@ "meta-type": "object" }, { - "name": "35", + "name": "36", "members": [ { "name": "device", @@ -9905,7 +9923,7 @@ "meta-type": "object" }, { - "name": "36", + "name": "37", "members": [ { "name": "job-id", @@ -9955,7 +9973,7 @@ "meta-type": "object" }, { - "name": "37", + "name": "38", "members": [ { "name": "device", @@ -9969,7 +9987,7 @@ "meta-type": "object" }, { - "name": "38", + "name": "39", "members": [ { "name": "device", @@ -9984,7 +10002,7 @@ "meta-type": "object" }, { - "name": "39", + "name": "40", "members": [ { "name": "device", @@ -9994,7 +10012,7 @@ "meta-type": "object" }, { - "name": "40", + "name": "41", "members": [ { "name": "device", @@ -10004,7 +10022,7 @@ "meta-type": "object" }, { - "name": "41", + "name": "42", "members": [ { "name": "device", @@ -10014,7 +10032,7 @@ "meta-type": "object" }, { - "name": "42", + "name": "43", "members": [ { "name": "id", @@ -10024,7 +10042,7 @@ "meta-type": "object" }, { - "name": "43", + "name": "44", "members": [ { "name": "id", @@ -10034,170 +10052,170 @@ "meta-type": "object" }, { - "name": "44", + "name": "45", "tag": "driver", "variants": [ { "case": "blkdebug", - "type": "238" + "type": "240" }, { "case": "blklogwrites", - "type": "239" + "type": "241" }, { "case": "blkverify", - "type": "240" + "type": "242" }, { "case": "bochs", - "type": "241" + "type": "243" }, { "case": "cloop", - "type": "241" + "type": "243" }, { "case": "copy-on-read", - "type": "241" + "type": "243" }, { "case": "dmg", - "type": "241" + "type": "243" }, { "case": "file", - "type": "242" + "type": "244" }, { "case": "ftp", - "type": "243" + "type": "245" }, { "case": "ftps", - "type": "244" + "type": "246" }, { "case": "gluster", - "type": "245" + "type": "247" }, { "case": "host_cdrom", - "type": "242" + "type": "244" }, { "case": "host_device", - "type": "242" + "type": "244" }, { "case": "http", - "type": "246" + "type": "248" }, { "case": "https", - "type": "247" + "type": "249" }, { "case": "iscsi", - "type": "248" + "type": "250" }, { "case": "luks", - "type": "249" + "type": "251" }, { "case": "nbd", - "type": "250" + "type": "252" }, { "case": "nfs", - "type": "251" + "type": "253" }, { "case": "null-aio", - "type": "252" + "type": "254" }, { "case": "null-co", - "type": "252" + "type": "254" }, { "case": "nvme", - "type": "253" + "type": "255" }, { "case": "parallels", - "type": "241" + "type": "243" }, { "case": "qcow2", - "type": "254" + "type": "256" }, { "case": "qcow", - "type": "255" + "type": "257" }, { "case": "qed", - "type": "256" + "type": "258" }, { "case": "quorum", - "type": "257" + "type": "259" }, { "case": "raw", - "type": "258" + "type": "260" }, { "case": "rbd", - "type": "259" + "type": "261" }, { "case": "replication", - "type": "260" + "type": "262" }, { "case": "sheepdog", - "type": "261" + "type": "263" }, { "case": "ssh", - "type": "262" + "type": "264" }, { "case": "throttle", - "type": "263" + "type": "265" }, { "case": "vdi", - "type": "241" + "type": "243" }, { "case": "vhdx", - "type": "241" + "type": "243" }, { "case": "vmdk", - "type": "256" + "type": "258" }, { "case": "vpc", - "type": "241" + "type": "243" }, { "case": "vvfat", - "type": "264" + "type": "266" }, { "case": "vxhs", - "type": "265" + "type": "267" } ], "members": [ { "name": "driver", - "type": "235" + "type": "237" }, { "name": "node-name", @@ -10207,12 +10225,12 @@ { "name": "discard", "default": null, - "type": "236" + "type": "238" }, { "name": "cache", "default": null, - "type": "237" + "type": "239" }, { "name": "read-only", @@ -10238,7 +10256,7 @@ "meta-type": "object" }, { - "name": "45", + "name": "46", "members": [ { "name": "node-name", @@ -10248,7 +10266,7 @@ "meta-type": "object" }, { - "name": "46", + "name": "47", "members": [ { "name": "job-id", @@ -10256,13 +10274,13 @@ }, { "name": "options", - "type": "266" + "type": "268" } ], "meta-type": "object" }, { - "name": "47", + "name": "48", "members": [ { "name": "device", @@ -10283,7 +10301,7 @@ "meta-type": "object" }, { - "name": "48", + "name": "49", "members": [ { "name": "device", @@ -10299,7 +10317,7 @@ "meta-type": "object" }, { - "name": "49", + "name": "50", "members": [ { "name": "id", @@ -10309,7 +10327,7 @@ "meta-type": "object" }, { - "name": "50", + "name": "51", "members": [ { "name": "id", @@ -10323,7 +10341,7 @@ "meta-type": "object" }, { - "name": "51", + "name": "52", "members": [ { "name": "device", @@ -10347,13 +10365,13 @@ { "name": "read-only-mode", "default": null, - "type": "267" + "type": "269" } ], "meta-type": "object" }, { - "name": "52", + "name": "53", "members": [ { "name": "device", @@ -10386,7 +10404,7 @@ "meta-type": "object" }, { - "name": "53", + "name": "54", "members": [ { "name": "device", @@ -10399,11 +10417,11 @@ }, { "name": "operation", - "type": "268" + "type": "270" }, { "name": "action", - "type": "269" + "type": "271" }, { "name": "nospace", @@ -10418,7 +10436,7 @@ "meta-type": "object" }, { - "name": "54", + "name": "55", "members": [ { "name": "type", @@ -10449,7 +10467,7 @@ "meta-type": "object" }, { - "name": "55", + "name": "56", "members": [ { "name": "type", @@ -10475,7 +10493,7 @@ "meta-type": "object" }, { - "name": "56", + "name": "57", "members": [ { "name": "device", @@ -10483,17 +10501,17 @@ }, { "name": "operation", - "type": "268" + "type": "270" }, { "name": "action", - "type": "269" + "type": "271" } ], "meta-type": "object" }, { - "name": "57", + "name": "58", "members": [ { "name": "type", @@ -10519,7 +10537,7 @@ "meta-type": "object" }, { - "name": "58", + "name": "59", "members": [ { "name": "type", @@ -10533,7 +10551,7 @@ "meta-type": "object" }, { - "name": "59", + "name": "60", "members": [ { "name": "node-name", @@ -10551,7 +10569,7 @@ "meta-type": "object" }, { - "name": "60", + "name": "61", "members": [ { "name": "node-name", @@ -10565,7 +10583,7 @@ "meta-type": "object" }, { - "name": "61", + "name": "62", "members": [ { "name": "parent", @@ -10585,7 +10603,7 @@ "meta-type": "object" }, { - "name": "62", + "name": "63", "members": [ { "name": "node-name", @@ -10593,7 +10611,7 @@ }, { "name": "iothread", - "type": "270" + "type": "272" }, { "name": "force", @@ -10604,12 +10622,12 @@ "meta-type": "object" }, { - "name": "[63]", - "element-type": "63", + "name": "[64]", + "element-type": "64", "meta-type": "array" }, { - "name": "63", + "name": "64", "members": [ { "name": "id", @@ -10623,7 +10641,7 @@ "meta-type": "object" }, { - "name": "64", + "name": "65", "members": [ { "name": "device", @@ -10637,7 +10655,7 @@ "meta-type": "object" }, { - "name": "65", + "name": "66", "members": [ { "name": "device", @@ -10657,7 +10675,7 @@ "meta-type": "object" }, { - "name": "66", + "name": "67", "members": [ { "name": "id", @@ -10691,7 +10709,7 @@ "meta-type": "object" }, { - "name": "67", + "name": "68", "members": [ { "name": "device", @@ -10712,11 +10730,11 @@ "meta-type": "object" }, { - "name": "68", + "name": "69", "members": [ { "name": "addr", - "type": "271" + "type": "273" }, { "name": "tls-creds", @@ -10727,7 +10745,7 @@ "meta-type": "object" }, { - "name": "69", + "name": "70", "members": [ { "name": "device", @@ -10742,21 +10760,11 @@ "name": "writable", "default": null, "type": "bool" - } - ], - "meta-type": "object" - }, - { - "name": "70", - "members": [ - { - "name": "name", - "type": "str" }, { - "name": "mode", + "name": "bitmap", "default": null, - "type": "272" + "type": "str" } ], "meta-type": "object" @@ -10769,13 +10777,9 @@ "type": "str" }, { - "name": "bitmap", - "type": "str" - }, - { - "name": "bitmap-export-name", + "name": "mode", "default": null, - "type": "str" + "type": "274" } ], "meta-type": "object" @@ -10835,7 +10839,7 @@ "members": [ { "name": "type", - "type": "273" + "type": "275" }, { "name": "error", @@ -10909,7 +10913,7 @@ { "name": "format", "default": null, - "type": "274" + "type": "276" } ], "meta-type": "object" @@ -10928,7 +10932,7 @@ { "name": "format", "default": null, - "type": "274" + "type": "276" } ], "meta-type": "object" @@ -10947,7 +10951,7 @@ }, { "name": "backend", - "type": "275" + "type": "277" } ], "meta-type": "object" @@ -10972,7 +10976,7 @@ }, { "name": "backend", - "type": "275" + "type": "277" } ], "meta-type": "object" @@ -11078,15 +11082,15 @@ }, { "name": "multicast", - "type": "276" + "type": "278" }, { "name": "unicast", - "type": "276" + "type": "278" }, { "name": "vlan", - "type": "276" + "type": "278" }, { "name": "broadcast-allowed", @@ -11220,11 +11224,11 @@ }, { "name": "duplex", - "type": "277" + "type": "279" }, { "name": "autoneg", - "type": "278" + "type": "280" } ], "meta-type": "object" @@ -11262,15 +11266,15 @@ }, { "name": "key", - "type": "279" + "type": "281" }, { "name": "mask", - "type": "280" + "type": "282" }, { "name": "action", - "type": "281" + "type": "283" } ], "meta-type": "object" @@ -11408,7 +11412,7 @@ }, { "name": "options", - "type": "282" + "type": "284" } ], "meta-type": "object" @@ -11504,12 +11508,12 @@ }, { "name": "mouse-mode", - "type": "283" + "type": "285" }, { "name": "channels", "default": null, - "type": "[284]" + "type": "[286]" } ], "meta-type": "object" @@ -11519,11 +11523,11 @@ "members": [ { "name": "server", - "type": "285" + "type": "287" }, { "name": "client", - "type": "285" + "type": "287" } ], "meta-type": "object" @@ -11533,11 +11537,11 @@ "members": [ { "name": "server", - "type": "286" + "type": "288" }, { "name": "client", - "type": "284" + "type": "286" } ], "meta-type": "object" @@ -11547,11 +11551,11 @@ "members": [ { "name": "server", - "type": "285" + "type": "287" }, { "name": "client", - "type": "285" + "type": "287" } ], "meta-type": "object" @@ -11571,7 +11575,7 @@ { "name": "family", "default": null, - "type": "287" + "type": "289" }, { "name": "service", @@ -11586,7 +11590,7 @@ { "name": "clients", "default": null, - "type": "[288]" + "type": "[290]" } ], "meta-type": "object" @@ -11605,20 +11609,20 @@ }, { "name": "server", - "type": "[289]" + "type": "[291]" }, { "name": "clients", - "type": "[288]" + "type": "[290]" }, { "name": "auth", - "type": "290" + "type": "292" }, { "name": "vencrypt", "default": null, - "type": "291" + "type": "293" }, { "name": "display", @@ -11643,11 +11647,11 @@ "members": [ { "name": "server", - "type": "292" + "type": "294" }, { "name": "client", - "type": "293" + "type": "295" } ], "meta-type": "object" @@ -11657,11 +11661,11 @@ "members": [ { "name": "server", - "type": "292" + "type": "294" }, { "name": "client", - "type": "288" + "type": "290" } ], "meta-type": "object" @@ -11671,11 +11675,11 @@ "members": [ { "name": "server", - "type": "292" + "type": "294" }, { "name": "client", - "type": "288" + "type": "290" } ], "meta-type": "object" @@ -11712,7 +11716,7 @@ "members": [ { "name": "keys", - "type": "[294]" + "type": "[296]" }, { "name": "hold-time", @@ -11737,7 +11741,7 @@ }, { "name": "events", - "type": "[295]" + "type": "[297]" } ], "meta-type": "object" @@ -11748,11 +11752,11 @@ "variants": [ { "case": "gtk", - "type": "298" + "type": "300" }, { "case": "egl-headless", - "type": "299" + "type": "301" }, { "case": "default", @@ -11778,7 +11782,7 @@ "members": [ { "name": "type", - "type": "296" + "type": "298" }, { "name": "full-screen", @@ -11793,7 +11797,7 @@ { "name": "gl", "default": null, - "type": "297" + "type": "299" } ], "meta-type": "object" @@ -11804,22 +11808,22 @@ { "name": "status", "default": null, - "type": "300" + "type": "302" }, { "name": "ram", "default": null, - "type": "301" + "type": "303" }, { "name": "disk", "default": null, - "type": "301" + "type": "303" }, { "name": "xbzrle-cache", "default": null, - "type": "302" + "type": "304" }, { "name": "total-time", @@ -11864,7 +11868,7 @@ { "name": "compression", "default": null, - "type": "303" + "type": "305" } ], "meta-type": "object" @@ -11889,7 +11893,7 @@ "members": [ { "name": "capability", - "type": "304" + "type": "306" }, { "name": "state", @@ -11934,12 +11938,12 @@ { "name": "tls-creds", "default": null, - "type": "270" + "type": "272" }, { "name": "tls-hostname", "default": null, - "type": "270" + "type": "272" }, { "name": "max-bandwidth", @@ -12114,7 +12118,7 @@ "members": [ { "name": "status", - "type": "300" + "type": "302" } ], "meta-type": "object" @@ -12134,11 +12138,11 @@ "members": [ { "name": "mode", - "type": "305" + "type": "307" }, { "name": "reason", - "type": "306" + "type": "308" } ], "meta-type": "object" @@ -12148,7 +12152,7 @@ "members": [ { "name": "state", - "type": "300" + "type": "302" } ], "meta-type": "object" @@ -12282,11 +12286,11 @@ "members": [ { "name": "mode", - "type": "305" + "type": "307" }, { "name": "reason", - "type": "306" + "type": "308" } ], "meta-type": "object" @@ -12306,12 +12310,12 @@ "members": [ { "name": "actions", - "type": "[307]" + "type": "[309]" }, { "name": "properties", "default": null, - "type": "308" + "type": "310" } ], "meta-type": "object" @@ -12345,7 +12349,7 @@ }, { "name": "state", - "type": "309" + "type": "311" }, { "name": "vcpu", @@ -12389,31 +12393,31 @@ "variants": [ { "case": "builtin", - "type": "311" + "type": "313" }, { "case": "enum", - "type": "312" + "type": "314" }, { "case": "array", - "type": "313" + "type": "315" }, { "case": "object", - "type": "314" + "type": "316" }, { "case": "alternate", - "type": "315" + "type": "317" }, { "case": "command", - "type": "316" + "type": "318" }, { "case": "event", - "type": "317" + "type": "319" } ], "members": [ @@ -12423,7 +12427,7 @@ }, { "name": "meta-type", - "type": "310" + "type": "312" } ], "meta-type": "object" @@ -12434,7 +12438,7 @@ { "name": "enable", "default": null, - "type": "[318]" + "type": "[320]" } ], "meta-type": "object" @@ -12444,7 +12448,7 @@ "members": [ { "name": "qemu", - "type": "319" + "type": "321" }, { "name": "package", @@ -12553,31 +12557,31 @@ "variants": [ { "case": "x86", - "type": "322" + "type": "324" }, { "case": "sparc", - "type": "323" + "type": "325" }, { "case": "ppc", - "type": "324" + "type": "326" }, { "case": "mips", - "type": "325" + "type": "327" }, { "case": "tricore", - "type": "326" + "type": "328" }, { "case": "s390", - "type": "327" + "type": "329" }, { "case": "riscv", - "type": "328" + "type": "330" }, { "case": "other", @@ -12608,11 +12612,11 @@ { "name": "props", "default": null, - "type": "320" + "type": "322" }, { "name": "arch", - "type": "321" + "type": "323" } ], "meta-type": "object" @@ -12628,7 +12632,7 @@ "variants": [ { "case": "s390x", - "type": "327" + "type": "329" }, { "case": "aarch64", @@ -12767,15 +12771,15 @@ { "name": "props", "default": null, - "type": "320" + "type": "322" }, { "name": "arch", - "type": "321" + "type": "323" }, { "name": "target", - "type": "329" + "type": "331" } ], "meta-type": "object" @@ -12845,7 +12849,7 @@ }, { "name": "devices", - "type": "[330]" + "type": "[332]" } ], "meta-type": "object" @@ -13161,7 +13165,7 @@ { "name": "format", "default": null, - "type": "331" + "type": "333" } ], "meta-type": "object" @@ -13171,7 +13175,7 @@ "members": [ { "name": "status", - "type": "332" + "type": "334" }, { "name": "completed", @@ -13204,7 +13208,7 @@ "members": [ { "name": "formats", - "type": "[331]" + "type": "[333]" } ], "meta-type": "object" @@ -13364,11 +13368,11 @@ "members": [ { "name": "type", - "type": "333" + "type": "335" }, { "name": "model", - "type": "334" + "type": "336" } ], "meta-type": "object" @@ -13378,7 +13382,7 @@ "members": [ { "name": "model", - "type": "334" + "type": "336" } ], "meta-type": "object" @@ -13388,11 +13392,11 @@ "members": [ { "name": "modela", - "type": "334" + "type": "336" }, { "name": "modelb", - "type": "334" + "type": "336" } ], "meta-type": "object" @@ -13402,7 +13406,7 @@ "members": [ { "name": "result", - "type": "335" + "type": "337" }, { "name": "responsible-properties", @@ -13416,11 +13420,11 @@ "members": [ { "name": "modela", - "type": "334" + "type": "336" }, { "name": "modelb", - "type": "334" + "type": "336" } ], "meta-type": "object" @@ -13430,7 +13434,7 @@ "members": [ { "name": "model", - "type": "334" + "type": "336" } ], "meta-type": "object" @@ -13494,7 +13498,7 @@ }, { "name": "fds", - "type": "[336]" + "type": "[338]" } ], "meta-type": "object" @@ -13504,7 +13508,7 @@ "members": [ { "name": "arch", - "type": "329" + "type": "331" } ], "meta-type": "object" @@ -13534,7 +13538,7 @@ }, { "name": "parameters", - "type": "[337]" + "type": "[339]" } ], "meta-type": "object" @@ -13574,7 +13578,7 @@ }, { "name": "policy", - "type": "338" + "type": "340" } ], "meta-type": "object" @@ -13590,17 +13594,17 @@ "variants": [ { "case": "dimm", - "type": "340" + "type": "342" }, { "case": "nvdimm", - "type": "340" + "type": "342" } ], "members": [ { "name": "type", - "type": "339" + "type": "341" } ], "meta-type": "object" @@ -13638,7 +13642,7 @@ }, { "name": "slot-type", - "type": "341" + "type": "343" }, { "name": "source", @@ -13722,7 +13726,7 @@ }, { "name": "props", - "type": "320" + "type": "322" }, { "name": "qom-path", @@ -13767,7 +13771,7 @@ }, { "name": "state", - "type": "342" + "type": "344" }, { "name": "handle", @@ -13814,21 +13818,21 @@ "variants": [ { "case": "node", - "type": "344" + "type": "346" }, { "case": "dist", - "type": "345" + "type": "347" }, { "case": "cpu", - "type": "346" + "type": "348" } ], "members": [ { "name": "type", - "type": "343" + "type": "345" } ], "meta-type": "object" @@ -13904,17 +13908,17 @@ "variants": [ { "case": "hyper-v", - "type": "348" + "type": "350" }, { "case": "s390", - "type": "349" + "type": "351" } ], "members": [ { "name": "type", - "type": "347" + "type": "349" } ], "meta-type": "object" @@ -13984,7 +13988,7 @@ }, { "name": "status", - "type": "350" + "type": "352" } ], "meta-type": "object" @@ -14075,22 +14079,22 @@ }, { "name": "timed_stats", - "type": "[351]" + "type": "[353]" }, { "name": "x_rd_latency_histogram", "default": null, - "type": "352" + "type": "354" }, { "name": "x_wr_latency_histogram", "default": null, - "type": "352" + "type": "354" }, { "name": "x_flush_latency_histogram", "default": null, - "type": "352" + "type": "354" } ], "meta-type": "object" @@ -14191,7 +14195,7 @@ { "name": "snapshots", "default": null, - "type": "[66]" + "type": "[67]" }, { "name": "backing-image", @@ -14201,7 +14205,7 @@ { "name": "format-specific", "default": null, - "type": "353" + "type": "355" } ], "meta-type": "object" @@ -14224,8 +14228,62 @@ ], "meta-type": "object" }, + { + "name": "[234]", + "element-type": "234", + "meta-type": "array" + }, { "name": "234", + "members": [ + { + "name": "id", + "type": "int" + }, + { + "name": "type", + "type": "356" + }, + { + "name": "name", + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "[235]", + "element-type": "235", + "meta-type": "array" + }, + { + "name": "235", + "members": [ + { + "name": "parent", + "type": "int" + }, + { + "name": "child", + "type": "int" + }, + { + "name": "name", + "type": "str" + }, + { + "name": "perm", + "type": "[357]" + }, + { + "name": "shared-perm", + "type": "[357]" + } + ], + "meta-type": "object" + }, + { + "name": "236", "meta-type": "enum", "values": [ "background", @@ -14233,7 +14291,12 @@ ] }, { - "name": "235", + "name": "[str]", + "element-type": "str", + "meta-type": "array" + }, + { + "name": "237", "meta-type": "enum", "values": [ "blkdebug", @@ -14278,7 +14341,7 @@ ] }, { - "name": "236", + "name": "238", "meta-type": "enum", "values": [ "ignore", @@ -14286,7 +14349,7 @@ ] }, { - "name": "237", + "name": "239", "members": [ { "name": "direct", @@ -14302,11 +14365,11 @@ "meta-type": "object" }, { - "name": "238", + "name": "240", "members": [ { "name": "image", - "type": "354" + "type": "358" }, { "name": "config", @@ -14346,26 +14409,26 @@ { "name": "inject-error", "default": null, - "type": "[355]" + "type": "[359]" }, { "name": "set-state", "default": null, - "type": "[356]" + "type": "[360]" } ], "meta-type": "object" }, { - "name": "239", + "name": "241", "members": [ { "name": "file", - "type": "354" + "type": "358" }, { "name": "log", - "type": "354" + "type": "358" }, { "name": "log-sector-size", @@ -14386,31 +14449,31 @@ "meta-type": "object" }, { - "name": "240", + "name": "242", "members": [ { "name": "test", - "type": "354" + "type": "358" }, { "name": "raw", - "type": "354" + "type": "358" } ], "meta-type": "object" }, { - "name": "241", + "name": "243", "members": [ { "name": "file", - "type": "354" + "type": "358" } ], "meta-type": "object" }, { - "name": "242", + "name": "244", "members": [ { "name": "filename", @@ -14424,12 +14487,12 @@ { "name": "locking", "default": null, - "type": "357" + "type": "361" }, { "name": "aio", "default": null, - "type": "358" + "type": "362" }, { "name": "x-check-cache-dropped", @@ -14440,7 +14503,7 @@ "meta-type": "object" }, { - "name": "243", + "name": "245", "members": [ { "name": "url", @@ -14480,7 +14543,7 @@ "meta-type": "object" }, { - "name": "244", + "name": "246", "members": [ { "name": "url", @@ -14525,7 +14588,7 @@ "meta-type": "object" }, { - "name": "245", + "name": "247", "members": [ { "name": "volume", @@ -14537,7 +14600,7 @@ }, { "name": "server", - "type": "[359]" + "type": "[363]" }, { "name": "debug", @@ -14553,7 +14616,7 @@ "meta-type": "object" }, { - "name": "246", + "name": "248", "members": [ { "name": "url", @@ -14603,7 +14666,7 @@ "meta-type": "object" }, { - "name": "247", + "name": "249", "members": [ { "name": "url", @@ -14658,11 +14721,11 @@ "meta-type": "object" }, { - "name": "248", + "name": "250", "members": [ { "name": "transport", - "type": "360" + "type": "364" }, { "name": "portal", @@ -14695,7 +14758,7 @@ { "name": "header-digest", "default": null, - "type": "361" + "type": "365" }, { "name": "timeout", @@ -14706,11 +14769,11 @@ "meta-type": "object" }, { - "name": "249", + "name": "251", "members": [ { "name": "file", - "type": "354" + "type": "358" }, { "name": "key-secret", @@ -14721,11 +14784,11 @@ "meta-type": "object" }, { - "name": "250", + "name": "252", "members": [ { "name": "server", - "type": "359" + "type": "363" }, { "name": "export", @@ -14746,11 +14809,11 @@ "meta-type": "object" }, { - "name": "251", + "name": "253", "members": [ { "name": "server", - "type": "362" + "type": "366" }, { "name": "path", @@ -14790,7 +14853,7 @@ "meta-type": "object" }, { - "name": "252", + "name": "254", "members": [ { "name": "size", @@ -14806,7 +14869,7 @@ "meta-type": "object" }, { - "name": "253", + "name": "255", "members": [ { "name": "device", @@ -14820,16 +14883,16 @@ "meta-type": "object" }, { - "name": "254", + "name": "256", "members": [ { "name": "file", - "type": "354" + "type": "358" }, { "name": "backing", "default": null, - "type": "363" + "type": "367" }, { "name": "lazy-refcounts", @@ -14854,7 +14917,7 @@ { "name": "overlap-check", "default": null, - "type": "364" + "type": "368" }, { "name": "cache-size", @@ -14884,48 +14947,48 @@ { "name": "encrypt", "default": null, - "type": "365" + "type": "369" } ], "meta-type": "object" }, { - "name": "255", + "name": "257", "members": [ { "name": "file", - "type": "354" + "type": "358" }, { "name": "backing", "default": null, - "type": "363" + "type": "367" }, { "name": "encrypt", "default": null, - "type": "366" + "type": "370" } ], "meta-type": "object" }, { - "name": "256", + "name": "258", "members": [ { "name": "file", - "type": "354" + "type": "358" }, { "name": "backing", "default": null, - "type": "363" + "type": "367" } ], "meta-type": "object" }, { - "name": "257", + "name": "259", "members": [ { "name": "blkverify", @@ -14934,7 +14997,7 @@ }, { "name": "children", - "type": "[354]" + "type": "[358]" }, { "name": "vote-threshold", @@ -14948,17 +15011,17 @@ { "name": "read-pattern", "default": null, - "type": "367" + "type": "371" } ], "meta-type": "object" }, { - "name": "258", + "name": "260", "members": [ { "name": "file", - "type": "354" + "type": "358" }, { "name": "offset", @@ -14974,7 +15037,7 @@ "meta-type": "object" }, { - "name": "259", + "name": "261", "members": [ { "name": "pool", @@ -15002,7 +15065,7 @@ { "name": "auth-client-required", "default": null, - "type": "[368]" + "type": "[372]" }, { "name": "key-secret", @@ -15012,21 +15075,21 @@ { "name": "server", "default": null, - "type": "[369]" + "type": "[373]" } ], "meta-type": "object" }, { - "name": "260", + "name": "262", "members": [ { "name": "file", - "type": "354" + "type": "358" }, { "name": "mode", - "type": "370" + "type": "374" }, { "name": "top-id", @@ -15037,11 +15100,11 @@ "meta-type": "object" }, { - "name": "261", + "name": "263", "members": [ { "name": "server", - "type": "359" + "type": "363" }, { "name": "vdi", @@ -15061,11 +15124,11 @@ "meta-type": "object" }, { - "name": "262", + "name": "264", "members": [ { "name": "server", - "type": "371" + "type": "375" }, { "name": "path", @@ -15079,13 +15142,13 @@ { "name": "host-key-check", "default": null, - "type": "372" + "type": "376" } ], "meta-type": "object" }, { - "name": "263", + "name": "265", "members": [ { "name": "throttle-group", @@ -15093,13 +15156,13 @@ }, { "name": "file", - "type": "354" + "type": "358" } ], "meta-type": "object" }, { - "name": "264", + "name": "266", "members": [ { "name": "dir", @@ -15129,7 +15192,7 @@ "meta-type": "object" }, { - "name": "265", + "name": "267", "members": [ { "name": "vdisk-id", @@ -15137,7 +15200,7 @@ }, { "name": "server", - "type": "369" + "type": "373" }, { "name": "tls-creds", @@ -15148,64 +15211,68 @@ "meta-type": "object" }, { - "name": "266", + "name": "268", "tag": "driver", "variants": [ { "case": "file", - "type": "373" + "type": "377" }, { "case": "gluster", - "type": "374" + "type": "378" }, { "case": "luks", - "type": "375" + "type": "379" }, { "case": "nfs", - "type": "376" + "type": "380" }, { "case": "parallels", - "type": "377" + "type": "381" }, { "case": "qcow", - "type": "378" + "type": "382" }, { "case": "qcow2", - "type": "379" + "type": "383" }, { "case": "qed", - "type": "380" + "type": "384" }, { "case": "rbd", - "type": "381" + "type": "385" }, { "case": "sheepdog", - "type": "382" + "type": "386" }, { "case": "ssh", - "type": "383" + "type": "387" }, { "case": "vdi", - "type": "384" + "type": "388" }, { "case": "vhdx", - "type": "385" + "type": "389" + }, + { + "case": "vmdk", + "type": "390" }, { "case": "vpc", - "type": "386" + "type": "391" }, { "case": "blkdebug", @@ -15295,10 +15362,6 @@ "case": "throttle", "type": "0" }, - { - "case": "vmdk", - "type": "0" - }, { "case": "vvfat", "type": "0" @@ -15311,13 +15374,13 @@ "members": [ { "name": "driver", - "type": "235" + "type": "237" } ], "meta-type": "object" }, { - "name": "267", + "name": "269", "meta-type": "enum", "values": [ "retain", @@ -15326,7 +15389,7 @@ ] }, { - "name": "268", + "name": "270", "meta-type": "enum", "values": [ "read", @@ -15334,7 +15397,7 @@ ] }, { - "name": "269", + "name": "271", "meta-type": "enum", "values": [ "ignore", @@ -15343,7 +15406,7 @@ ] }, { - "name": "270", + "name": "272", "members": [ { "type": "str" @@ -15355,36 +15418,36 @@ "meta-type": "alternate" }, { - "name": "271", + "name": "273", "tag": "type", "variants": [ { "case": "inet", - "type": "388" + "type": "393" }, { "case": "unix", - "type": "389" + "type": "394" }, { "case": "vsock", - "type": "390" + "type": "395" }, { "case": "fd", - "type": "391" + "type": "396" } ], "members": [ { "name": "type", - "type": "387" + "type": "392" } ], "meta-type": "object" }, { - "name": "272", + "name": "274", "meta-type": "enum", "values": [ "safe", @@ -15392,7 +15455,7 @@ ] }, { - "name": "273", + "name": "275", "meta-type": "enum", "values": [ "read", @@ -15401,7 +15464,7 @@ ] }, { - "name": "274", + "name": "276", "meta-type": "enum", "values": [ "utf8", @@ -15409,100 +15472,100 @@ ] }, { - "name": "275", + "name": "277", "tag": "type", "variants": [ { "case": "file", - "type": "393" + "type": "398" }, { "case": "serial", - "type": "394" + "type": "399" }, { "case": "parallel", - "type": "394" + "type": "399" }, { "case": "pipe", - "type": "394" + "type": "399" }, { "case": "socket", - "type": "395" + "type": "400" }, { "case": "udp", - "type": "396" + "type": "401" }, { "case": "pty", - "type": "397" + "type": "402" }, { "case": "null", - "type": "397" + "type": "402" }, { "case": "mux", - "type": "398" + "type": "403" }, { "case": "msmouse", - "type": "397" + "type": "402" }, { "case": "wctablet", - "type": "397" + "type": "402" }, { "case": "braille", - "type": "397" + "type": "402" }, { "case": "testdev", - "type": "397" + "type": "402" }, { "case": "stdio", - "type": "399" + "type": "404" }, { "case": "console", - "type": "397" + "type": "402" }, { "case": "spicevmc", - "type": "400" + "type": "405" }, { "case": "spiceport", - "type": "401" + "type": "406" }, { "case": "vc", - "type": "402" + "type": "407" }, { "case": "ringbuf", - "type": "403" + "type": "408" }, { "case": "memory", - "type": "403" + "type": "408" } ], "members": [ { "name": "type", - "type": "392" + "type": "397" } ], "meta-type": "object" }, { - "name": "276", + "name": "278", "meta-type": "enum", "values": [ "normal", @@ -15511,12 +15574,7 @@ ] }, { - "name": "[str]", - "element-type": "str", - "meta-type": "array" - }, - { - "name": "277", + "name": "279", "meta-type": "enum", "values": [ "half", @@ -15524,7 +15582,7 @@ ] }, { - "name": "278", + "name": "280", "meta-type": "enum", "values": [ "off", @@ -15532,7 +15590,7 @@ ] }, { - "name": "279", + "name": "281", "members": [ { "name": "priority", @@ -15591,7 +15649,7 @@ "meta-type": "object" }, { - "name": "280", + "name": "282", "members": [ { "name": "in-pport", @@ -15632,7 +15690,7 @@ "meta-type": "object" }, { - "name": "281", + "name": "283", "members": [ { "name": "goto-tbl", @@ -15668,28 +15726,28 @@ "meta-type": "object" }, { - "name": "282", + "name": "284", "tag": "type", "variants": [ { "case": "passthrough", - "type": "405" + "type": "410" }, { "case": "emulator", - "type": "406" + "type": "411" } ], "members": [ { "name": "type", - "type": "404" + "type": "409" } ], "meta-type": "object" }, { - "name": "283", + "name": "285", "meta-type": "enum", "values": [ "client", @@ -15698,12 +15756,12 @@ ] }, { - "name": "[284]", - "element-type": "284", + "name": "[286]", + "element-type": "286", "meta-type": "array" }, { - "name": "284", + "name": "286", "members": [ { "name": "host", @@ -15715,7 +15773,7 @@ }, { "name": "family", - "type": "287" + "type": "289" }, { "name": "connection-id", @@ -15737,7 +15795,7 @@ "meta-type": "object" }, { - "name": "285", + "name": "287", "members": [ { "name": "host", @@ -15749,13 +15807,13 @@ }, { "name": "family", - "type": "287" + "type": "289" } ], "meta-type": "object" }, { - "name": "286", + "name": "288", "members": [ { "name": "host", @@ -15767,7 +15825,7 @@ }, { "name": "family", - "type": "287" + "type": "289" }, { "name": "auth", @@ -15778,7 +15836,7 @@ "meta-type": "object" }, { - "name": "287", + "name": "289", "meta-type": "enum", "values": [ "ipv4", @@ -15789,12 +15847,12 @@ ] }, { - "name": "[288]", - "element-type": "288", + "name": "[290]", + "element-type": "290", "meta-type": "array" }, { - "name": "288", + "name": "290", "members": [ { "name": "host", @@ -15806,7 +15864,7 @@ }, { "name": "family", - "type": "287" + "type": "289" }, { "name": "websocket", @@ -15826,12 +15884,12 @@ "meta-type": "object" }, { - "name": "[289]", - "element-type": "289", + "name": "[291]", + "element-type": "291", "meta-type": "array" }, { - "name": "289", + "name": "291", "members": [ { "name": "host", @@ -15843,7 +15901,7 @@ }, { "name": "family", - "type": "287" + "type": "289" }, { "name": "websocket", @@ -15851,18 +15909,18 @@ }, { "name": "auth", - "type": "290" + "type": "292" }, { "name": "vencrypt", "default": null, - "type": "291" + "type": "293" } ], "meta-type": "object" }, { - "name": "290", + "name": "292", "meta-type": "enum", "values": [ "none", @@ -15877,7 +15935,7 @@ ] }, { - "name": "291", + "name": "293", "meta-type": "enum", "values": [ "plain", @@ -15892,7 +15950,7 @@ ] }, { - "name": "292", + "name": "294", "members": [ { "name": "host", @@ -15904,7 +15962,7 @@ }, { "name": "family", - "type": "287" + "type": "289" }, { "name": "websocket", @@ -15919,7 +15977,7 @@ "meta-type": "object" }, { - "name": "293", + "name": "295", "members": [ { "name": "host", @@ -15931,7 +15989,7 @@ }, { "name": "family", - "type": "287" + "type": "289" }, { "name": "websocket", @@ -15941,67 +15999,67 @@ "meta-type": "object" }, { - "name": "[294]", - "element-type": "294", + "name": "[296]", + "element-type": "296", "meta-type": "array" }, { - "name": "294", + "name": "296", "tag": "type", "variants": [ { "case": "number", - "type": "408" + "type": "413" }, { "case": "qcode", - "type": "409" + "type": "414" } ], "members": [ { "name": "type", - "type": "407" + "type": "412" } ], "meta-type": "object" }, { - "name": "[295]", - "element-type": "295", + "name": "[297]", + "element-type": "297", "meta-type": "array" }, { - "name": "295", + "name": "297", "tag": "type", "variants": [ { "case": "key", - "type": "411" + "type": "416" }, { "case": "btn", - "type": "412" + "type": "417" }, { "case": "rel", - "type": "413" + "type": "418" }, { "case": "abs", - "type": "413" + "type": "418" } ], "members": [ { "name": "type", - "type": "410" + "type": "415" } ], "meta-type": "object" }, { - "name": "296", + "name": "298", "meta-type": "enum", "values": [ "default", @@ -16014,7 +16072,7 @@ ] }, { - "name": "297", + "name": "299", "meta-type": "enum", "values": [ "off", @@ -16024,7 +16082,7 @@ ] }, { - "name": "298", + "name": "300", "members": [ { "name": "grab-on-hover", @@ -16040,7 +16098,7 @@ "meta-type": "object" }, { - "name": "299", + "name": "301", "members": [ { "name": "rendernode", @@ -16051,7 +16109,7 @@ "meta-type": "object" }, { - "name": "300", + "name": "302", "meta-type": "enum", "values": [ "none", @@ -16070,7 +16128,7 @@ ] }, { - "name": "301", + "name": "303", "members": [ { "name": "transferred", @@ -16123,12 +16181,16 @@ { "name": "multifd-bytes", "type": "int" + }, + { + "name": "pages-per-second", + "type": "int" } ], "meta-type": "object" }, { - "name": "302", + "name": "304", "members": [ { "name": "cache-size", @@ -16158,7 +16220,7 @@ "meta-type": "object" }, { - "name": "303", + "name": "305", "members": [ { "name": "pages", @@ -16184,7 +16246,7 @@ "meta-type": "object" }, { - "name": "304", + "name": "306", "meta-type": "enum", "values": [ "xbzrle", @@ -16206,7 +16268,7 @@ ] }, { - "name": "305", + "name": "307", "meta-type": "enum", "values": [ "none", @@ -16215,7 +16277,7 @@ ] }, { - "name": "306", + "name": "308", "meta-type": "enum", "values": [ "none", @@ -16229,80 +16291,80 @@ "meta-type": "builtin" }, { - "name": "[307]", - "element-type": "307", + "name": "[309]", + "element-type": "309", "meta-type": "array" }, { - "name": "307", + "name": "309", "tag": "type", "variants": [ { "case": "abort", - "type": "415" + "type": "420" }, { "case": "block-dirty-bitmap-add", - "type": "416" + "type": "421" }, { "case": "block-dirty-bitmap-clear", - "type": "417" + "type": "422" }, { - "case": "x-block-dirty-bitmap-enable", - "type": "417" + "case": "block-dirty-bitmap-enable", + "type": "422" }, { - "case": "x-block-dirty-bitmap-disable", - "type": "417" + "case": "block-dirty-bitmap-disable", + "type": "422" }, { - "case": "x-block-dirty-bitmap-merge", - "type": "418" + "case": "block-dirty-bitmap-merge", + "type": "423" }, { "case": "blockdev-backup", - "type": "419" + "type": "424" }, { "case": "blockdev-snapshot", - "type": "420" + "type": "425" }, { "case": "blockdev-snapshot-internal-sync", - "type": "421" + "type": "426" }, { "case": "blockdev-snapshot-sync", - "type": "422" + "type": "427" }, { "case": "drive-backup", - "type": "423" + "type": "428" } ], "members": [ { "name": "type", - "type": "414" + "type": "419" } ], "meta-type": "object" }, { - "name": "308", + "name": "310", "members": [ { "name": "completion-mode", "default": null, - "type": "424" + "type": "429" } ], "meta-type": "object" }, { - "name": "309", + "name": "311", "meta-type": "enum", "values": [ "unavailable", @@ -16311,7 +16373,7 @@ ] }, { - "name": "310", + "name": "312", "meta-type": "enum", "values": [ "builtin", @@ -16324,17 +16386,17 @@ ] }, { - "name": "311", + "name": "313", "members": [ { "name": "json-type", - "type": "425" + "type": "430" } ], "meta-type": "object" }, { - "name": "312", + "name": "314", "members": [ { "name": "values", @@ -16344,7 +16406,7 @@ "meta-type": "object" }, { - "name": "313", + "name": "315", "members": [ { "name": "element-type", @@ -16354,11 +16416,11 @@ "meta-type": "object" }, { - "name": "314", + "name": "316", "members": [ { "name": "members", - "type": "[426]" + "type": "[431]" }, { "name": "tag", @@ -16368,23 +16430,23 @@ { "name": "variants", "default": null, - "type": "[427]" + "type": "[432]" } ], "meta-type": "object" }, { - "name": "315", + "name": "317", "members": [ { "name": "members", - "type": "[428]" + "type": "[433]" } ], "meta-type": "object" }, { - "name": "316", + "name": "318", "members": [ { "name": "arg-type", @@ -16403,7 +16465,7 @@ "meta-type": "object" }, { - "name": "317", + "name": "319", "members": [ { "name": "arg-type", @@ -16413,19 +16475,19 @@ "meta-type": "object" }, { - "name": "[318]", - "element-type": "318", + "name": "[320]", + "element-type": "320", "meta-type": "array" }, { - "name": "318", + "name": "320", "meta-type": "enum", "values": [ "oob" ] }, { - "name": "319", + "name": "321", "members": [ { "name": "major", @@ -16443,7 +16505,7 @@ "meta-type": "object" }, { - "name": "320", + "name": "322", "members": [ { "name": "node-id", @@ -16469,7 +16531,7 @@ "meta-type": "object" }, { - "name": "321", + "name": "323", "meta-type": "enum", "values": [ "x86", @@ -16483,7 +16545,7 @@ ] }, { - "name": "322", + "name": "324", "members": [ { "name": "pc", @@ -16493,7 +16555,7 @@ "meta-type": "object" }, { - "name": "323", + "name": "325", "members": [ { "name": "pc", @@ -16507,7 +16569,7 @@ "meta-type": "object" }, { - "name": "324", + "name": "326", "members": [ { "name": "nip", @@ -16517,7 +16579,7 @@ "meta-type": "object" }, { - "name": "325", + "name": "327", "members": [ { "name": "PC", @@ -16527,7 +16589,7 @@ "meta-type": "object" }, { - "name": "326", + "name": "328", "members": [ { "name": "PC", @@ -16537,17 +16599,17 @@ "meta-type": "object" }, { - "name": "327", + "name": "329", "members": [ { "name": "cpu-state", - "type": "429" + "type": "434" } ], "meta-type": "object" }, { - "name": "328", + "name": "330", "members": [ { "name": "pc", @@ -16557,7 +16619,7 @@ "meta-type": "object" }, { - "name": "329", + "name": "331", "meta-type": "enum", "values": [ "aarch64", @@ -16594,12 +16656,12 @@ ] }, { - "name": "[330]", - "element-type": "330", + "name": "[332]", + "element-type": "332", "meta-type": "array" }, { - "name": "330", + "name": "332", "members": [ { "name": "bus", @@ -16615,11 +16677,11 @@ }, { "name": "class_info", - "type": "430" + "type": "435" }, { "name": "id", - "type": "431" + "type": "436" }, { "name": "irq", @@ -16633,17 +16695,17 @@ { "name": "pci_bridge", "default": null, - "type": "432" + "type": "437" }, { "name": "regions", - "type": "[433]" + "type": "[438]" } ], "meta-type": "object" }, { - "name": "331", + "name": "333", "meta-type": "enum", "values": [ "elf", @@ -16654,7 +16716,7 @@ ] }, { - "name": "332", + "name": "334", "meta-type": "enum", "values": [ "none", @@ -16664,12 +16726,12 @@ ] }, { - "name": "[331]", - "element-type": "331", + "name": "[333]", + "element-type": "333", "meta-type": "array" }, { - "name": "333", + "name": "335", "meta-type": "enum", "values": [ "static", @@ -16677,7 +16739,7 @@ ] }, { - "name": "334", + "name": "336", "members": [ { "name": "name", @@ -16692,7 +16754,7 @@ "meta-type": "object" }, { - "name": "335", + "name": "337", "meta-type": "enum", "values": [ "incompatible", @@ -16702,12 +16764,12 @@ ] }, { - "name": "[336]", - "element-type": "336", + "name": "[338]", + "element-type": "338", "meta-type": "array" }, { - "name": "336", + "name": "338", "members": [ { "name": "fd", @@ -16722,12 +16784,12 @@ "meta-type": "object" }, { - "name": "[337]", - "element-type": "337", + "name": "[339]", + "element-type": "339", "meta-type": "array" }, { - "name": "337", + "name": "339", "members": [ { "name": "name", @@ -16735,7 +16797,7 @@ }, { "name": "type", - "type": "434" + "type": "439" }, { "name": "help", @@ -16751,7 +16813,7 @@ "meta-type": "object" }, { - "name": "338", + "name": "340", "meta-type": "enum", "values": [ "default", @@ -16761,7 +16823,7 @@ ] }, { - "name": "339", + "name": "341", "meta-type": "enum", "values": [ "dimm", @@ -16769,17 +16831,17 @@ ] }, { - "name": "340", + "name": "342", "members": [ { "name": "data", - "type": "435" + "type": "440" } ], "meta-type": "object" }, { - "name": "341", + "name": "343", "meta-type": "enum", "values": [ "DIMM", @@ -16787,7 +16849,7 @@ ] }, { - "name": "342", + "name": "344", "meta-type": "enum", "values": [ "uninit", @@ -16799,7 +16861,7 @@ ] }, { - "name": "343", + "name": "345", "meta-type": "enum", "values": [ "node", @@ -16808,7 +16870,7 @@ ] }, { - "name": "344", + "name": "346", "members": [ { "name": "nodeid", @@ -16834,7 +16896,7 @@ "meta-type": "object" }, { - "name": "345", + "name": "347", "members": [ { "name": "src", @@ -16852,7 +16914,7 @@ "meta-type": "object" }, { - "name": "346", + "name": "348", "members": [ { "name": "node-id", @@ -16878,7 +16940,7 @@ "meta-type": "object" }, { - "name": "347", + "name": "349", "meta-type": "enum", "values": [ "hyper-v", @@ -16886,7 +16948,7 @@ ] }, { - "name": "348", + "name": "350", "members": [ { "name": "arg1", @@ -16912,7 +16974,7 @@ "meta-type": "object" }, { - "name": "349", + "name": "351", "members": [ { "name": "core", @@ -16928,13 +16990,13 @@ }, { "name": "reason", - "type": "436" + "type": "441" } ], "meta-type": "object" }, { - "name": "350", + "name": "352", "meta-type": "enum", "values": [ "active", @@ -16944,12 +17006,12 @@ ] }, { - "name": "[351]", - "element-type": "351", + "name": "[353]", + "element-type": "353", "meta-type": "array" }, { - "name": "351", + "name": "353", "members": [ { "name": "interval_length", @@ -17003,7 +17065,7 @@ "meta-type": "object" }, { - "name": "352", + "name": "354", "members": [ { "name": "boundaries", @@ -17017,40 +17079,65 @@ "meta-type": "object" }, { - "name": "[66]", - "element-type": "66", + "name": "[67]", + "element-type": "67", "meta-type": "array" }, { - "name": "353", + "name": "355", "tag": "type", "variants": [ { "case": "qcow2", - "type": "438" + "type": "443" }, { "case": "vmdk", - "type": "439" + "type": "444" }, { "case": "luks", - "type": "440" + "type": "445" } ], "members": [ { "name": "type", - "type": "437" + "type": "442" } ], "meta-type": "object" }, { - "name": "354", + "name": "356", + "meta-type": "enum", + "values": [ + "block-backend", + "block-job", + "block-driver" + ] + }, + { + "name": "[357]", + "element-type": "357", + "meta-type": "array" + }, + { + "name": "357", + "meta-type": "enum", + "values": [ + "consistent-read", + "write", + "write-unchanged", + "resize", + "graph-mod" + ] + }, + { + "name": "358", "members": [ { - "type": "44" + "type": "45" }, { "type": "str" @@ -17059,16 +17146,16 @@ "meta-type": "alternate" }, { - "name": "[355]", - "element-type": "355", + "name": "[359]", + "element-type": "359", "meta-type": "array" }, { - "name": "355", + "name": "359", "members": [ { "name": "event", - "type": "441" + "type": "446" }, { "name": "state", @@ -17099,16 +17186,16 @@ "meta-type": "object" }, { - "name": "[356]", - "element-type": "356", + "name": "[360]", + "element-type": "360", "meta-type": "array" }, { - "name": "356", + "name": "360", "members": [ { "name": "event", - "type": "441" + "type": "446" }, { "name": "state", @@ -17123,7 +17210,7 @@ "meta-type": "object" }, { - "name": "357", + "name": "361", "meta-type": "enum", "values": [ "auto", @@ -17132,7 +17219,7 @@ ] }, { - "name": "358", + "name": "362", "meta-type": "enum", "values": [ "threads", @@ -17140,41 +17227,41 @@ ] }, { - "name": "[359]", - "element-type": "359", + "name": "[363]", + "element-type": "363", "meta-type": "array" }, { - "name": "359", + "name": "363", "tag": "type", "variants": [ { "case": "inet", - "type": "371" + "type": "375" }, { "case": "unix", - "type": "443" + "type": "448" }, { "case": "vsock", - "type": "444" + "type": "449" }, { "case": "fd", - "type": "445" + "type": "450" } ], "members": [ { "name": "type", - "type": "442" + "type": "447" } ], "meta-type": "object" }, { - "name": "360", + "name": "364", "meta-type": "enum", "values": [ "tcp", @@ -17182,7 +17269,7 @@ ] }, { - "name": "361", + "name": "365", "meta-type": "enum", "values": [ "crc32c", @@ -17192,11 +17279,11 @@ ] }, { - "name": "362", + "name": "366", "members": [ { "name": "type", - "type": "446" + "type": "451" }, { "name": "host", @@ -17206,10 +17293,10 @@ "meta-type": "object" }, { - "name": "363", + "name": "367", "members": [ { - "type": "44" + "type": "45" }, { "type": "str" @@ -17221,62 +17308,62 @@ "meta-type": "alternate" }, { - "name": "364", + "name": "368", "members": [ { - "type": "447" + "type": "452" }, { - "type": "448" + "type": "453" } ], "meta-type": "alternate" }, { - "name": "365", + "name": "369", "tag": "format", "variants": [ { "case": "aes", - "type": "450" + "type": "455" }, { "case": "luks", - "type": "451" + "type": "456" } ], "members": [ { "name": "format", - "type": "449" + "type": "454" } ], "meta-type": "object" }, { - "name": "366", + "name": "370", "tag": "format", "variants": [ { "case": "aes", - "type": "450" + "type": "455" } ], "members": [ { "name": "format", - "type": "452" + "type": "457" } ], "meta-type": "object" }, { - "name": "[354]", - "element-type": "354", + "name": "[358]", + "element-type": "358", "meta-type": "array" }, { - "name": "367", + "name": "371", "meta-type": "enum", "values": [ "quorum", @@ -17284,12 +17371,12 @@ ] }, { - "name": "[368]", - "element-type": "368", + "name": "[372]", + "element-type": "372", "meta-type": "array" }, { - "name": "368", + "name": "372", "meta-type": "enum", "values": [ "cephx", @@ -17297,12 +17384,12 @@ ] }, { - "name": "[369]", - "element-type": "369", + "name": "[373]", + "element-type": "373", "meta-type": "array" }, { - "name": "369", + "name": "373", "members": [ { "name": "host", @@ -17316,7 +17403,7 @@ "meta-type": "object" }, { - "name": "370", + "name": "374", "meta-type": "enum", "values": [ "primary", @@ -17324,7 +17411,7 @@ ] }, { - "name": "371", + "name": "375", "members": [ { "name": "host", @@ -17358,12 +17445,12 @@ "meta-type": "object" }, { - "name": "372", + "name": "376", "tag": "mode", "variants": [ { "case": "hash", - "type": "454" + "type": "459" }, { "case": "none", @@ -17377,13 +17464,13 @@ "members": [ { "name": "mode", - "type": "453" + "type": "458" } ], "meta-type": "object" }, { - "name": "373", + "name": "377", "members": [ { "name": "filename", @@ -17396,7 +17483,7 @@ { "name": "preallocation", "default": null, - "type": "455" + "type": "460" }, { "name": "nocow", @@ -17407,11 +17494,11 @@ "meta-type": "object" }, { - "name": "374", + "name": "378", "members": [ { "name": "location", - "type": "245" + "type": "247" }, { "name": "size", @@ -17420,13 +17507,13 @@ { "name": "preallocation", "default": null, - "type": "455" + "type": "460" } ], "meta-type": "object" }, { - "name": "375", + "name": "379", "members": [ { "name": "key-secret", @@ -17436,27 +17523,27 @@ { "name": "cipher-alg", "default": null, - "type": "456" + "type": "461" }, { "name": "cipher-mode", "default": null, - "type": "457" + "type": "462" }, { "name": "ivgen-alg", "default": null, - "type": "458" + "type": "463" }, { "name": "ivgen-hash-alg", "default": null, - "type": "459" + "type": "464" }, { "name": "hash-alg", "default": null, - "type": "459" + "type": "464" }, { "name": "iter-time", @@ -17465,7 +17552,7 @@ }, { "name": "file", - "type": "354" + "type": "358" }, { "name": "size", @@ -17475,11 +17562,11 @@ "meta-type": "object" }, { - "name": "376", + "name": "380", "members": [ { "name": "location", - "type": "251" + "type": "253" }, { "name": "size", @@ -17489,11 +17576,11 @@ "meta-type": "object" }, { - "name": "377", + "name": "381", "members": [ { "name": "file", - "type": "354" + "type": "358" }, { "name": "size", @@ -17508,11 +17595,11 @@ "meta-type": "object" }, { - "name": "378", + "name": "382", "members": [ { "name": "file", - "type": "354" + "type": "358" }, { "name": "size", @@ -17526,17 +17613,17 @@ { "name": "encrypt", "default": null, - "type": "460" + "type": "465" } ], "meta-type": "object" }, { - "name": "379", + "name": "383", "members": [ { "name": "file", - "type": "354" + "type": "358" }, { "name": "size", @@ -17545,7 +17632,7 @@ { "name": "version", "default": null, - "type": "461" + "type": "466" }, { "name": "backing-file", @@ -17555,12 +17642,12 @@ { "name": "backing-fmt", "default": null, - "type": "235" + "type": "237" }, { "name": "encrypt", "default": null, - "type": "460" + "type": "465" }, { "name": "cluster-size", @@ -17570,7 +17657,7 @@ { "name": "preallocation", "default": null, - "type": "455" + "type": "460" }, { "name": "lazy-refcounts", @@ -17586,11 +17673,11 @@ "meta-type": "object" }, { - "name": "380", + "name": "384", "members": [ { "name": "file", - "type": "354" + "type": "358" }, { "name": "size", @@ -17604,7 +17691,7 @@ { "name": "backing-fmt", "default": null, - "type": "235" + "type": "237" }, { "name": "cluster-size", @@ -17620,11 +17707,11 @@ "meta-type": "object" }, { - "name": "381", + "name": "385", "members": [ { "name": "location", - "type": "259" + "type": "261" }, { "name": "size", @@ -17639,11 +17726,11 @@ "meta-type": "object" }, { - "name": "382", + "name": "386", "members": [ { "name": "location", - "type": "261" + "type": "263" }, { "name": "size", @@ -17657,12 +17744,12 @@ { "name": "preallocation", "default": null, - "type": "455" + "type": "460" }, { "name": "redundancy", "default": null, - "type": "462" + "type": "467" }, { "name": "object-size", @@ -17673,11 +17760,11 @@ "meta-type": "object" }, { - "name": "383", + "name": "387", "members": [ { "name": "location", - "type": "262" + "type": "264" }, { "name": "size", @@ -17687,11 +17774,11 @@ "meta-type": "object" }, { - "name": "384", + "name": "388", "members": [ { "name": "file", - "type": "354" + "type": "358" }, { "name": "size", @@ -17700,17 +17787,17 @@ { "name": "preallocation", "default": null, - "type": "455" + "type": "460" } ], "meta-type": "object" }, { - "name": "385", + "name": "389", "members": [ { "name": "file", - "type": "354" + "type": "358" }, { "name": "size", @@ -17729,7 +17816,7 @@ { "name": "subformat", "default": null, - "type": "463" + "type": "468" }, { "name": "block-state-zero", @@ -17740,20 +17827,64 @@ "meta-type": "object" }, { - "name": "386", + "name": "390", "members": [ { "name": "file", - "type": "354" + "type": "358" }, { "name": "size", "type": "int" }, + { + "name": "extents", + "default": null, + "type": "[358]" + }, { "name": "subformat", "default": null, - "type": "464" + "type": "469" + }, + { + "name": "backing-file", + "default": null, + "type": "str" + }, + { + "name": "adapter-type", + "default": null, + "type": "470" + }, + { + "name": "hwversion", + "default": null, + "type": "str" + }, + { + "name": "zeroed-grain", + "default": null, + "type": "bool" + } + ], + "meta-type": "object" + }, + { + "name": "391", + "members": [ + { + "name": "file", + "type": "358" + }, + { + "name": "size", + "type": "int" + }, + { + "name": "subformat", + "default": null, + "type": "471" }, { "name": "force-size", @@ -17769,7 +17900,7 @@ "meta-type": "builtin" }, { - "name": "387", + "name": "392", "meta-type": "enum", "values": [ "inet", @@ -17779,47 +17910,47 @@ ] }, { - "name": "388", + "name": "393", "members": [ { "name": "data", - "type": "371" + "type": "375" } ], "meta-type": "object" }, { - "name": "389", + "name": "394", "members": [ { "name": "data", - "type": "443" + "type": "448" } ], "meta-type": "object" }, { - "name": "390", + "name": "395", "members": [ { "name": "data", - "type": "444" + "type": "449" } ], "meta-type": "object" }, { - "name": "391", + "name": "396", "members": [ { "name": "data", - "type": "445" + "type": "450" } ], "meta-type": "object" }, { - "name": "392", + "name": "397", "meta-type": "enum", "values": [ "file", @@ -17845,117 +17976,117 @@ ] }, { - "name": "393", + "name": "398", "members": [ { "name": "data", - "type": "465" + "type": "472" } ], "meta-type": "object" }, { - "name": "394", + "name": "399", "members": [ { "name": "data", - "type": "466" + "type": "473" } ], "meta-type": "object" }, { - "name": "395", + "name": "400", "members": [ { "name": "data", - "type": "467" + "type": "474" } ], "meta-type": "object" }, { - "name": "396", + "name": "401", "members": [ { "name": "data", - "type": "468" + "type": "475" } ], "meta-type": "object" }, { - "name": "397", + "name": "402", "members": [ { "name": "data", - "type": "469" + "type": "476" } ], "meta-type": "object" }, { - "name": "398", + "name": "403", "members": [ { "name": "data", - "type": "470" + "type": "477" } ], "meta-type": "object" }, { - "name": "399", + "name": "404", "members": [ { "name": "data", - "type": "471" + "type": "478" } ], "meta-type": "object" }, { - "name": "400", + "name": "405", "members": [ { "name": "data", - "type": "472" + "type": "479" } ], "meta-type": "object" }, { - "name": "401", + "name": "406", "members": [ { "name": "data", - "type": "473" + "type": "480" } ], "meta-type": "object" }, { - "name": "402", + "name": "407", "members": [ { "name": "data", - "type": "474" + "type": "481" } ], "meta-type": "object" }, { - "name": "403", + "name": "408", "members": [ { "name": "data", - "type": "475" + "type": "482" } ], "meta-type": "object" }, { - "name": "404", + "name": "409", "meta-type": "enum", "values": [ "passthrough", @@ -17963,27 +18094,27 @@ ] }, { - "name": "405", + "name": "410", "members": [ { "name": "data", - "type": "476" + "type": "483" } ], "meta-type": "object" }, { - "name": "406", + "name": "411", "members": [ { "name": "data", - "type": "477" + "type": "484" } ], "meta-type": "object" }, { - "name": "407", + "name": "412", "meta-type": "enum", "values": [ "number", @@ -17991,7 +18122,7 @@ ] }, { - "name": "408", + "name": "413", "members": [ { "name": "data", @@ -18001,17 +18132,17 @@ "meta-type": "object" }, { - "name": "409", + "name": "414", "members": [ { "name": "data", - "type": "478" + "type": "485" } ], "meta-type": "object" }, { - "name": "410", + "name": "415", "meta-type": "enum", "values": [ "key", @@ -18021,45 +18152,45 @@ ] }, { - "name": "411", + "name": "416", "members": [ { "name": "data", - "type": "479" + "type": "486" } ], "meta-type": "object" }, { - "name": "412", + "name": "417", "members": [ { "name": "data", - "type": "480" + "type": "487" } ], "meta-type": "object" }, { - "name": "413", + "name": "418", "members": [ { "name": "data", - "type": "481" + "type": "488" } ], "meta-type": "object" }, { - "name": "414", + "name": "419", "meta-type": "enum", "values": [ "abort", "block-dirty-bitmap-add", "block-dirty-bitmap-clear", - "x-block-dirty-bitmap-enable", - "x-block-dirty-bitmap-disable", - "x-block-dirty-bitmap-merge", + "block-dirty-bitmap-enable", + "block-dirty-bitmap-disable", + "block-dirty-bitmap-merge", "blockdev-backup", "blockdev-snapshot", "blockdev-snapshot-internal-sync", @@ -18068,47 +18199,47 @@ ] }, { - "name": "415", + "name": "420", "members": [ { "name": "data", - "type": "482" + "type": "489" } ], "meta-type": "object" }, { - "name": "416", + "name": "421", "members": [ { "name": "data", - "type": "30" + "type": "31" } ], "meta-type": "object" }, { - "name": "417", + "name": "422", "members": [ { "name": "data", - "type": "31" + "type": "32" } ], "meta-type": "object" }, { - "name": "418", + "name": "423", "members": [ { "name": "data", - "type": "32" + "type": "33" } ], "meta-type": "object" }, { - "name": "419", + "name": "424", "members": [ { "name": "data", @@ -18118,7 +18249,7 @@ "meta-type": "object" }, { - "name": "420", + "name": "425", "members": [ { "name": "data", @@ -18128,17 +18259,17 @@ "meta-type": "object" }, { - "name": "421", + "name": "426", "members": [ { "name": "data", - "type": "64" + "type": "65" } ], "meta-type": "object" }, { - "name": "422", + "name": "427", "members": [ { "name": "data", @@ -18148,7 +18279,7 @@ "meta-type": "object" }, { - "name": "423", + "name": "428", "members": [ { "name": "data", @@ -18158,7 +18289,7 @@ "meta-type": "object" }, { - "name": "424", + "name": "429", "meta-type": "enum", "values": [ "individual", @@ -18166,7 +18297,7 @@ ] }, { - "name": "425", + "name": "430", "meta-type": "enum", "values": [ "string", @@ -18180,12 +18311,12 @@ ] }, { - "name": "[426]", - "element-type": "426", + "name": "[431]", + "element-type": "431", "meta-type": "array" }, { - "name": "426", + "name": "431", "members": [ { "name": "name", @@ -18204,12 +18335,12 @@ "meta-type": "object" }, { - "name": "[427]", - "element-type": "427", + "name": "[432]", + "element-type": "432", "meta-type": "array" }, { - "name": "427", + "name": "432", "members": [ { "name": "case", @@ -18223,12 +18354,12 @@ "meta-type": "object" }, { - "name": "[428]", - "element-type": "428", + "name": "[433]", + "element-type": "433", "meta-type": "array" }, { - "name": "428", + "name": "433", "members": [ { "name": "type", @@ -18238,7 +18369,7 @@ "meta-type": "object" }, { - "name": "429", + "name": "434", "meta-type": "enum", "values": [ "uninitialized", @@ -18249,7 +18380,7 @@ ] }, { - "name": "430", + "name": "435", "members": [ { "name": "desc", @@ -18264,7 +18395,7 @@ "meta-type": "object" }, { - "name": "431", + "name": "436", "members": [ { "name": "device", @@ -18288,27 +18419,27 @@ "meta-type": "object" }, { - "name": "432", + "name": "437", "members": [ { "name": "bus", - "type": "483" + "type": "490" }, { "name": "devices", "default": null, - "type": "[330]" + "type": "[332]" } ], "meta-type": "object" }, { - "name": "[433]", - "element-type": "433", + "name": "[438]", + "element-type": "438", "meta-type": "array" }, { - "name": "433", + "name": "438", "members": [ { "name": "bar", @@ -18340,7 +18471,7 @@ "meta-type": "object" }, { - "name": "434", + "name": "439", "meta-type": "enum", "values": [ "string", @@ -18350,7 +18481,7 @@ ] }, { - "name": "435", + "name": "440", "members": [ { "name": "id", @@ -18389,7 +18520,7 @@ "meta-type": "object" }, { - "name": "436", + "name": "441", "meta-type": "enum", "values": [ "unknown", @@ -18400,7 +18531,7 @@ ] }, { - "name": "437", + "name": "442", "meta-type": "enum", "values": [ "qcow2", @@ -18409,37 +18540,37 @@ ] }, { - "name": "438", + "name": "443", "members": [ { "name": "data", - "type": "484" + "type": "491" } ], "meta-type": "object" }, { - "name": "439", + "name": "444", "members": [ { "name": "data", - "type": "485" + "type": "492" } ], "meta-type": "object" }, { - "name": "440", + "name": "445", "members": [ { "name": "data", - "type": "486" + "type": "493" } ], "meta-type": "object" }, { - "name": "441", + "name": "446", "meta-type": "enum", "values": [ "l1_update", @@ -18491,7 +18622,7 @@ ] }, { - "name": "442", + "name": "447", "meta-type": "enum", "values": [ "inet", @@ -18501,7 +18632,7 @@ ] }, { - "name": "443", + "name": "448", "members": [ { "name": "path", @@ -18511,7 +18642,7 @@ "meta-type": "object" }, { - "name": "444", + "name": "449", "members": [ { "name": "cid", @@ -18525,7 +18656,7 @@ "meta-type": "object" }, { - "name": "445", + "name": "450", "members": [ { "name": "str", @@ -18535,19 +18666,19 @@ "meta-type": "object" }, { - "name": "446", + "name": "451", "meta-type": "enum", "values": [ "inet" ] }, { - "name": "447", + "name": "452", "members": [ { "name": "template", "default": null, - "type": "448" + "type": "453" }, { "name": "main-header", @@ -18598,7 +18729,7 @@ "meta-type": "object" }, { - "name": "448", + "name": "453", "meta-type": "enum", "values": [ "none", @@ -18608,7 +18739,7 @@ ] }, { - "name": "449", + "name": "454", "meta-type": "enum", "values": [ "aes", @@ -18616,7 +18747,7 @@ ] }, { - "name": "450", + "name": "455", "members": [ { "name": "key-secret", @@ -18627,7 +18758,7 @@ "meta-type": "object" }, { - "name": "451", + "name": "456", "members": [ { "name": "key-secret", @@ -18638,14 +18769,14 @@ "meta-type": "object" }, { - "name": "452", + "name": "457", "meta-type": "enum", "values": [ "aes" ] }, { - "name": "453", + "name": "458", "meta-type": "enum", "values": [ "none", @@ -18654,11 +18785,11 @@ ] }, { - "name": "454", + "name": "459", "members": [ { "name": "type", - "type": "487" + "type": "494" }, { "name": "hash", @@ -18668,7 +18799,7 @@ "meta-type": "object" }, { - "name": "455", + "name": "460", "meta-type": "enum", "values": [ "off", @@ -18678,7 +18809,7 @@ ] }, { - "name": "456", + "name": "461", "meta-type": "enum", "values": [ "aes-128", @@ -18696,7 +18827,7 @@ ] }, { - "name": "457", + "name": "462", "meta-type": "enum", "values": [ "ecb", @@ -18706,7 +18837,7 @@ ] }, { - "name": "458", + "name": "463", "meta-type": "enum", "values": [ "plain", @@ -18715,7 +18846,7 @@ ] }, { - "name": "459", + "name": "464", "meta-type": "enum", "values": [ "md5", @@ -18728,28 +18859,28 @@ ] }, { - "name": "460", + "name": "465", "tag": "format", "variants": [ { "case": "qcow", - "type": "450" + "type": "455" }, { "case": "luks", - "type": "489" + "type": "496" } ], "members": [ { "name": "format", - "type": "488" + "type": "495" } ], "meta-type": "object" }, { - "name": "461", + "name": "466", "meta-type": "enum", "values": [ "v2", @@ -18757,28 +18888,28 @@ ] }, { - "name": "462", + "name": "467", "tag": "type", "variants": [ { "case": "full", - "type": "491" + "type": "498" }, { "case": "erasure-coded", - "type": "492" + "type": "499" } ], "members": [ { "name": "type", - "type": "490" + "type": "497" } ], "meta-type": "object" }, { - "name": "463", + "name": "468", "meta-type": "enum", "values": [ "dynamic", @@ -18786,7 +18917,28 @@ ] }, { - "name": "464", + "name": "469", + "meta-type": "enum", + "values": [ + "monolithicSparse", + "monolithicFlat", + "twoGbMaxExtentSparse", + "twoGbMaxExtentFlat", + "streamOptimized" + ] + }, + { + "name": "470", + "meta-type": "enum", + "values": [ + "ide", + "buslogic", + "lsilogic", + "legacyESX" + ] + }, + { + "name": "471", "meta-type": "enum", "values": [ "dynamic", @@ -18794,7 +18946,7 @@ ] }, { - "name": "465", + "name": "472", "members": [ { "name": "logfile", @@ -18824,7 +18976,7 @@ "meta-type": "object" }, { - "name": "466", + "name": "473", "members": [ { "name": "logfile", @@ -18844,7 +18996,7 @@ "meta-type": "object" }, { - "name": "467", + "name": "474", "members": [ { "name": "logfile", @@ -18858,7 +19010,7 @@ }, { "name": "addr", - "type": "271" + "type": "273" }, { "name": "tls-creds", @@ -18904,7 +19056,7 @@ "meta-type": "object" }, { - "name": "468", + "name": "475", "members": [ { "name": "logfile", @@ -18918,18 +19070,18 @@ }, { "name": "remote", - "type": "271" + "type": "273" }, { "name": "local", "default": null, - "type": "271" + "type": "273" } ], "meta-type": "object" }, { - "name": "469", + "name": "476", "members": [ { "name": "logfile", @@ -18945,7 +19097,7 @@ "meta-type": "object" }, { - "name": "470", + "name": "477", "members": [ { "name": "logfile", @@ -18965,7 +19117,7 @@ "meta-type": "object" }, { - "name": "471", + "name": "478", "members": [ { "name": "logfile", @@ -18986,7 +19138,7 @@ "meta-type": "object" }, { - "name": "472", + "name": "479", "members": [ { "name": "logfile", @@ -19006,7 +19158,7 @@ "meta-type": "object" }, { - "name": "473", + "name": "480", "members": [ { "name": "logfile", @@ -19026,7 +19178,7 @@ "meta-type": "object" }, { - "name": "474", + "name": "481", "members": [ { "name": "logfile", @@ -19062,7 +19214,7 @@ "meta-type": "object" }, { - "name": "475", + "name": "482", "members": [ { "name": "logfile", @@ -19083,7 +19235,7 @@ "meta-type": "object" }, { - "name": "476", + "name": "483", "members": [ { "name": "path", @@ -19099,7 +19251,7 @@ "meta-type": "object" }, { - "name": "477", + "name": "484", "members": [ { "name": "chardev", @@ -19109,7 +19261,7 @@ "meta-type": "object" }, { - "name": "478", + "name": "485", "meta-type": "enum", "values": [ "unmapped", @@ -19263,11 +19415,11 @@ ] }, { - "name": "479", + "name": "486", "members": [ { "name": "key", - "type": "294" + "type": "296" }, { "name": "down", @@ -19277,11 +19429,11 @@ "meta-type": "object" }, { - "name": "480", + "name": "487", "members": [ { "name": "button", - "type": "493" + "type": "500" }, { "name": "down", @@ -19291,11 +19443,11 @@ "meta-type": "object" }, { - "name": "481", + "name": "488", "members": [ { "name": "axis", - "type": "494" + "type": "501" }, { "name": "value", @@ -19305,13 +19457,13 @@ "meta-type": "object" }, { - "name": "482", + "name": "489", "members": [ ], "meta-type": "object" }, { - "name": "483", + "name": "490", "members": [ { "name": "number", @@ -19327,21 +19479,21 @@ }, { "name": "io_range", - "type": "495" + "type": "502" }, { "name": "memory_range", - "type": "495" + "type": "502" }, { "name": "prefetchable_range", - "type": "495" + "type": "502" } ], "meta-type": "object" }, { - "name": "484", + "name": "491", "members": [ { "name": "compat", @@ -19364,13 +19516,13 @@ { "name": "encrypt", "default": null, - "type": "496" + "type": "503" } ], "meta-type": "object" }, { - "name": "485", + "name": "492", "members": [ { "name": "create-type", @@ -19392,28 +19544,28 @@ "meta-type": "object" }, { - "name": "486", + "name": "493", "members": [ { "name": "cipher-alg", - "type": "456" + "type": "461" }, { "name": "cipher-mode", - "type": "457" + "type": "462" }, { "name": "ivgen-alg", - "type": "458" + "type": "463" }, { "name": "ivgen-hash-alg", "default": null, - "type": "459" + "type": "464" }, { "name": "hash-alg", - "type": "459" + "type": "464" }, { "name": "payload-offset", @@ -19429,13 +19581,13 @@ }, { "name": "slots", - "type": "[497]" + "type": "[504]" } ], "meta-type": "object" }, { - "name": "487", + "name": "494", "meta-type": "enum", "values": [ "md5", @@ -19443,7 +19595,7 @@ ] }, { - "name": "488", + "name": "495", "meta-type": "enum", "values": [ "qcow", @@ -19451,7 +19603,7 @@ ] }, { - "name": "489", + "name": "496", "members": [ { "name": "key-secret", @@ -19461,27 +19613,27 @@ { "name": "cipher-alg", "default": null, - "type": "456" + "type": "461" }, { "name": "cipher-mode", "default": null, - "type": "457" + "type": "462" }, { "name": "ivgen-alg", "default": null, - "type": "458" + "type": "463" }, { "name": "ivgen-hash-alg", "default": null, - "type": "459" + "type": "464" }, { "name": "hash-alg", "default": null, - "type": "459" + "type": "464" }, { "name": "iter-time", @@ -19492,7 +19644,7 @@ "meta-type": "object" }, { - "name": "490", + "name": "497", "meta-type": "enum", "values": [ "full", @@ -19500,7 +19652,7 @@ ] }, { - "name": "491", + "name": "498", "members": [ { "name": "copies", @@ -19510,7 +19662,7 @@ "meta-type": "object" }, { - "name": "492", + "name": "499", "members": [ { "name": "data-strips", @@ -19524,7 +19676,7 @@ "meta-type": "object" }, { - "name": "493", + "name": "500", "meta-type": "enum", "values": [ "left", @@ -19537,7 +19689,7 @@ ] }, { - "name": "494", + "name": "501", "meta-type": "enum", "values": [ "x", @@ -19545,7 +19697,7 @@ ] }, { - "name": "495", + "name": "502", "members": [ { "name": "base", @@ -19559,12 +19711,12 @@ "meta-type": "object" }, { - "name": "496", + "name": "503", "tag": "format", "variants": [ { "case": "luks", - "type": "486" + "type": "493" }, { "case": "aes", @@ -19574,7 +19726,7 @@ "members": [ { "name": "format", - "type": "449" + "type": "454" } ], "meta-type": "object" @@ -19585,12 +19737,12 @@ "meta-type": "array" }, { - "name": "[497]", - "element-type": "497", + "name": "[504]", + "element-type": "504", "meta-type": "array" }, { - "name": "497", + "name": "504", "members": [ { "name": "active", @@ -19731,7 +19883,7 @@ "pge": true, "avx512bitalg": false, "pdcm": false, - "model": 142, + "model": 94, "movbe": true, "nrip-save": false, "ssse3": true, @@ -19744,7 +19896,7 @@ "cx16": true, "de": true, "pconfig": false, - "stepping": 10, + "stepping": 3, "xsave": true, "clflush": true, "skinit": false, @@ -19814,7 +19966,7 @@ "rdseed": true, "avx512-4vnniw": false, "vme": true, - "vmx": true, + "vmx": false, "dtes64": false, "mtrr": true, "rdtscp": true, @@ -19822,7 +19974,7 @@ "kvm-pv-tlb-flush": true, "tbm": false, "wdt": false, - "model-id": "Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz", + "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz", "sha-ni": false, "abm": true, "avx512pf": false, @@ -19938,7 +20090,7 @@ "pge": true, "avx512bitalg": false, "pdcm": false, - "model": 142, + "model": 94, "movbe": true, "nrip-save": false, "ssse3": true, @@ -19951,7 +20103,7 @@ "cx16": true, "de": true, "pconfig": false, - "stepping": 10, + "stepping": 3, "xsave": true, "clflush": true, "skinit": false, @@ -20021,7 +20173,7 @@ "rdseed": true, "avx512-4vnniw": false, "vme": true, - "vmx": true, + "vmx": false, "dtes64": false, "mtrr": true, "rdtscp": true, @@ -20029,7 +20181,7 @@ "kvm-pv-tlb-flush": true, "tbm": false, "wdt": false, - "model-id": "Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz", + "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz", "sha-ni": false, "abm": true, "avx512pf": false, @@ -20077,6 +20229,7 @@ "sse4-1": true, "family": 6, "legacy-cache": true, + "host-phys-bits-limit": 0, "vmware-cpuid-freq": true, "wbnoinvd": false, "avx512f": false, @@ -20187,7 +20340,7 @@ "nodeid_msr": false, "pdcm": false, "movbe": true, - "model": 142, + "model": 94, "nrip_save": false, "nrip-save": false, "kvm_pv_unhalt": true, @@ -20202,7 +20355,7 @@ "de": true, "pconfig": false, "enforce": false, - "stepping": 10, + "stepping": 3, "xsave": true, "clflush": true, "skinit": false, @@ -20297,7 +20450,7 @@ "rdrand": true, "rdseed": true, "avx512-4vnniw": false, - "vmx": true, + "vmx": false, "vme": true, "dtes64": false, "mtrr": true, @@ -20308,7 +20461,7 @@ "wdt": false, "pause_filter": false, "sha-ni": false, - "model-id": "Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz", + "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz", "abm": true, "avx512pf": false, "xstore-en": false @@ -20435,7 +20588,7 @@ "pge": true, "avx512bitalg": false, "pdcm": false, - "model": 142, + "model": 94, "movbe": true, "nrip-save": false, "ssse3": true, @@ -20448,7 +20601,7 @@ "cx16": true, "de": true, "pconfig": false, - "stepping": 10, + "stepping": 3, "xsave": true, "clflush": true, "skinit": false, @@ -20518,7 +20671,7 @@ "rdseed": true, "avx512-4vnniw": false, "vme": true, - "vmx": true, + "vmx": false, "dtes64": false, "mtrr": true, "rdtscp": true, @@ -20526,7 +20679,7 @@ "kvm-pv-tlb-flush": true, "tbm": false, "wdt": false, - "model-id": "Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz", + "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz", "sha-ni": false, "abm": true, "avx512pf": false, @@ -20642,7 +20795,7 @@ "pge": true, "avx512bitalg": false, "pdcm": false, - "model": 142, + "model": 94, "movbe": true, "nrip-save": false, "ssse3": true, @@ -20655,7 +20808,7 @@ "cx16": true, "de": true, "pconfig": false, - "stepping": 10, + "stepping": 3, "xsave": true, "clflush": true, "skinit": false, @@ -20725,7 +20878,7 @@ "rdseed": true, "avx512-4vnniw": false, "vme": true, - "vmx": true, + "vmx": false, "dtes64": false, "mtrr": true, "rdtscp": true, @@ -20733,7 +20886,7 @@ "kvm-pv-tlb-flush": true, "tbm": false, "wdt": false, - "model-id": "Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz", + "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz", "sha-ni": false, "abm": true, "avx512pf": false, @@ -20781,6 +20934,7 @@ "sse4-1": true, "family": 6, "legacy-cache": true, + "host-phys-bits-limit": 0, "vmware-cpuid-freq": true, "wbnoinvd": false, "avx512f": false, @@ -20891,7 +21045,7 @@ "nodeid_msr": false, "pdcm": false, "movbe": true, - "model": 142, + "model": 94, "nrip_save": false, "nrip-save": false, "kvm_pv_unhalt": true, @@ -20906,7 +21060,7 @@ "de": true, "pconfig": false, "enforce": false, - "stepping": 10, + "stepping": 3, "xsave": true, "clflush": true, "skinit": false, @@ -21001,7 +21155,7 @@ "rdrand": true, "rdseed": true, "avx512-4vnniw": false, - "vmx": true, + "vmx": false, "vme": true, "dtes64": false, "mtrr": true, @@ -21012,7 +21166,7 @@ "wdt": false, "pause_filter": false, "sha-ni": false, - "model-id": "Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz", + "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz", "abm": true, "avx512pf": false, "xstore-en": false @@ -21334,7 +21488,8 @@ "3dnowprefetch", "xop", "fma4", - "tbm" + "tbm", + "nrip-save" ], "static": false, "migration-safe": true @@ -21347,7 +21502,8 @@ "misalignsse", "3dnowprefetch", "xop", - "fma4" + "fma4", + "nrip-save" ], "static": false, "migration-safe": true @@ -21614,6 +21770,7 @@ "osvw", "topoext", "ibpb", + "nrip-save", "xsavec" ], "static": false, @@ -21635,6 +21792,7 @@ "3dnowprefetch", "osvw", "topoext", + "nrip-save", "xsavec" ], "static": false, @@ -22234,6 +22392,7 @@ "sse4-1": true, "family": 6, "legacy-cache": true, + "host-phys-bits-limit": 0, "vmware-cpuid-freq": true, "wbnoinvd": false, "avx512f": false, @@ -22938,6 +23097,7 @@ "sse4-1": true, "family": 6, "legacy-cache": true, + "host-phys-bits-limit": 0, "vmware-cpuid-freq": true, "wbnoinvd": false, "avx512f": false, diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index 3d4d53023e..e09d4ca04f 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -89,7 +89,6 @@ <flag name='splash-timeout'/> <flag name='iothread'/> <flag name='migrate-rdma'/> - <flag name='ivshmem'/> <flag name='drive-iotune-max'/> <flag name='VGA.vgamem_mb'/> <flag name='vmware-svga.vgamem_mb'/> @@ -213,7 +212,7 @@ <version>3001050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100758</microcodeVersion> - <package>v3.1.0-759-g15bede5541</package> + <package>v3.1.0-1445-ga61faa3d02</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='phys-bits' type='number' value='0'/> @@ -248,6 +247,7 @@ <property name='sse4-1' type='boolean' value='true' migratable='yes'/> <property name='family' type='number' value='6'/> <property name='legacy-cache' type='boolean' value='true' migratable='yes'/> + <property name='host-phys-bits-limit' type='number' value='0'/> <property name='vmware-cpuid-freq' type='boolean' value='true' migratable='yes'/> <property name='wbnoinvd' type='boolean' value='false'/> <property name='avx512f' type='boolean' value='false'/> @@ -358,7 +358,7 @@ <property name='nodeid_msr' type='boolean' value='false'/> <property name='pdcm' type='boolean' value='false'/> <property name='movbe' type='boolean' value='true' migratable='yes'/> - <property name='model' type='number' value='142'/> + <property name='model' type='number' value='94'/> <property name='nrip_save' type='boolean' value='false'/> <property name='nrip-save' type='boolean' value='false'/> <property name='kvm_pv_unhalt' type='boolean' value='true' migratable='yes'/> @@ -373,7 +373,7 @@ <property name='de' type='boolean' value='true' migratable='yes'/> <property name='pconfig' type='boolean' value='false'/> <property name='enforce' type='boolean' value='false'/> - <property name='stepping' type='number' value='10'/> + <property name='stepping' type='number' value='3'/> <property name='xsave' type='boolean' value='true' migratable='yes'/> <property name='clflush' type='boolean' value='true' migratable='yes'/> <property name='skinit' type='boolean' value='false'/> @@ -468,7 +468,7 @@ <property name='rdrand' type='boolean' value='true' migratable='yes'/> <property name='rdseed' type='boolean' value='true' migratable='yes'/> <property name='avx512-4vnniw' type='boolean' value='false'/> - <property name='vmx' type='boolean' value='true' migratable='yes'/> + <property name='vmx' type='boolean' value='false'/> <property name='vme' type='boolean' value='true' migratable='yes'/> <property name='dtes64' type='boolean' value='false'/> <property name='mtrr' type='boolean' value='true' migratable='yes'/> @@ -479,7 +479,7 @@ <property name='wdt' type='boolean' value='false'/> <property name='pause_filter' type='boolean' value='false'/> <property name='sha-ni' type='boolean' value='false'/> - <property name='model-id' type='string' value='Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz'/> + <property name='model-id' type='string' value='Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz'/> <property name='abm' type='boolean' value='true' migratable='yes'/> <property name='avx512pf' type='boolean' value='false'/> <property name='xstore-en' type='boolean' value='false'/> @@ -517,6 +517,7 @@ <property name='sse4-1' type='boolean' value='true' migratable='yes'/> <property name='family' type='number' value='6'/> <property name='legacy-cache' type='boolean' value='true' migratable='yes'/> + <property name='host-phys-bits-limit' type='number' value='0'/> <property name='vmware-cpuid-freq' type='boolean' value='true' migratable='yes'/> <property name='wbnoinvd' type='boolean' value='false'/> <property name='avx512f' type='boolean' value='false'/> @@ -818,12 +819,16 @@ <blocker name='xop'/> <blocker name='fma4'/> <blocker name='tbm'/> + <blocker name='npt'/> + <blocker name='nrip-save'/> </cpu> <cpu type='kvm' name='Opteron_G4' usable='no'> <blocker name='sse4a'/> <blocker name='misalignsse'/> <blocker name='xop'/> <blocker name='fma4'/> + <blocker name='npt'/> + <blocker name='nrip-save'/> </cpu> <cpu type='kvm' name='Opteron_G3' usable='no'> <blocker name='sse4a'/> @@ -901,6 +906,8 @@ <blocker name='misalignsse'/> <blocker name='osvw'/> <blocker name='ibpb'/> + <blocker name='npt'/> + <blocker name='nrip-save'/> </cpu> <cpu type='kvm' name='EPYC' usable='no'> <blocker name='sha-ni'/> @@ -910,6 +917,8 @@ <blocker name='sse4a'/> <blocker name='misalignsse'/> <blocker name='osvw'/> + <blocker name='npt'/> + <blocker name='nrip-save'/> </cpu> <cpu type='kvm' name='Conroe' usable='yes'/> <cpu type='kvm' name='Cascadelake-Server' usable='no'> @@ -1053,6 +1062,7 @@ <blocker name='xop'/> <blocker name='fma4'/> <blocker name='tbm'/> + <blocker name='nrip-save'/> </cpu> <cpu type='tcg' name='Opteron_G4' usable='no'> <blocker name='avx'/> @@ -1060,6 +1070,7 @@ <blocker name='3dnowprefetch'/> <blocker name='xop'/> <blocker name='fma4'/> + <blocker name='nrip-save'/> </cpu> <cpu type='tcg' name='Opteron_G3' usable='no'> <blocker name='misalignsse'/> @@ -1233,6 +1244,7 @@ <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='ibpb'/> + <blocker name='nrip-save'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='EPYC' usable='no'> @@ -1248,6 +1260,7 @@ <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> + <blocker name='nrip-save'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Conroe' usable='yes'/> @@ -1346,7 +1359,6 @@ <machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine name='xenfv' hotplugCpus='yes' maxCpus='128'/> <machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> @@ -1357,7 +1369,6 @@ <machine name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/> <machine name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/> <machine name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/> - <machine name='xenpv' maxCpus='1'/> <machine name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/> <machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/> @@ -1375,8 +1386,8 @@ <machine name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-q35-4.0' alias='q35' hotplugCpus='yes' maxCpus='288'/> </qemuCaps> -- 2.20.1
On Mon, Feb 04, 2019 at 04:47:02PM +0100, Peter Krempa wrote:
Based on qemu commit 'v3.1.0-1445-ga61faa3d02'. Will allow checking for the scsi 'device_id' property.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../caps_4.0.0.x86_64.replies | 2296 +++++++++-------- .../caps_4.0.0.x86_64.xml | 29 +- 2 files changed, 1248 insertions(+), 1077 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
The property allows to control the guest-visible content of the vendor specific designator of the 'Device Identification' page of a SCSI device's VPD (vital product data). QEMU was leaking the id string of -drive as the value if the 'serial' of the disk was not specified. Switching to -blockdev would impose an ABI change. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 + 3 files changed, 4 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ec258a971e..290c8c2bdb 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -524,6 +524,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, /* 325 */ "memory-backend-file.pmem", "nvdimm.unarmed", + "scsi-disk.device_id", ); @@ -1157,6 +1158,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsSCSIDisk[] = { { "wwn", QEMU_CAPS_SCSI_DISK_WWN }, { "share-rw", QEMU_CAPS_DISK_SHARE_RW }, { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE }, + { "device_id", QEMU_CAPS_SCSI_DISK_DEVICE_ID }, }; static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsIDEDrive[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 18abd555f4..928cf78e3d 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -504,6 +504,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 325 */ QEMU_CAPS_OBJECT_MEMORY_FILE_PMEM, /* -object memory-backend-file,pmem= */ QEMU_CAPS_DEVICE_NVDIMM_UNARMED, /* -device nvdimm,unarmed= */ + QEMU_CAPS_SCSI_DISK_DEVICE_ID, /* 'device_id' property of scsi disk */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index e09d4ca04f..ab7c0dc7f9 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -209,6 +209,7 @@ <flag name='memory-backend-file.align'/> <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> + <flag name='scsi-disk.device_id'/> <version>3001050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100758</microcodeVersion> -- 2.20.1
On Mon, Feb 04, 2019 at 04:47:03PM +0100, Peter Krempa wrote:
The property allows to control the guest-visible content of the vendor specific designator of the 'Device Identification' page of a SCSI device's VPD (vital product data).
QEMU was leaking the id string of -drive as the value if the 'serial' of the disk was not specified. Switching to -blockdev would impose an ABI change.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 + 3 files changed, 4 insertions(+)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
QEMU accidentally exposed the id of -drive (or same value as disk serial, if provided) in one of the identifiers visible from the guest. To avoid regression in case when -blockdev will be used we need to always specify it ourselves. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_command.c | 22 +++++++++++++++++++ .../controller-virtio-scsi.x86_64-latest.args | 20 ++++++++--------- .../disk-cache.x86_64-latest.args | 4 ++-- .../disk-scsi-device-auto.x86_64-latest.args | 3 ++- .../disk-scsi.x86_64-latest.args | 16 ++++++++------ .../disk-shared.x86_64-latest.args | 5 +++-- ...threads-virtio-scsi-pci.x86_64-latest.args | 4 ++-- 7 files changed, 50 insertions(+), 24 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index eaeeb3a05d..e6c1219dac 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1890,6 +1890,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, const char *bus = virDomainDiskQEMUBusTypeToString(disk->bus); const char *contAlias; char *backendAlias = NULL; + char *scsiVPDDeviceId = NULL; int controllerModel; if (qemuCheckDiskConfig(disk, qemuCaps) < 0) @@ -1979,6 +1980,21 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virBufferAddLit(&opt, "scsi-cd"); else virBufferAddLit(&opt, "scsi-hd"); + + /* qemu historically used the name of -drive as one of the device + * ids in the Vital Product Data Device Identification page if + * disk serial was not set and the disk serial otherwise. + * To avoid a guest-visible regression we need to provide it + * ourselves especially for cases when -blockdev will be used */ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_DISK_DEVICE_ID)) { + if (disk->serial) { + if (VIR_STRDUP(scsiVPDDeviceId, disk->serial) < 0) + goto error; + } else { + if (!(scsiVPDDeviceId = qemuAliasDiskDriveFromDisk(disk))) + goto error; + } + } } if (!(contAlias = virDomainControllerAliasFind(def, VIR_DOMAIN_CONTROLLER_TYPE_SCSI, @@ -2021,6 +2037,12 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, disk->info.addr.drive.target, disk->info.addr.drive.unit); } + + if (scsiVPDDeviceId) { + virBufferAddLit(&opt, ",device_id="); + virBufferEscape(&opt, '\\', " ", "%s", scsiVPDDeviceId); + } + break; case VIR_DOMAIN_DISK_BUS_SATA: diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args index cf8a497eb7..095b4724d3 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args @@ -30,20 +30,20 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device virtio-scsi-pci,id=scsi3,max_sectors=512,bus=pci.0,addr=0x5 \ -device virtio-scsi-pci,id=scsi4,ioeventfd=on,bus=pci.0,addr=0x6 \ -drive file=/dev/HostVG/QEMUGuest1,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 \ +-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ +device_id=drive-scsi0-0-0-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-scsi1-0-0-0 \ --device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,\ -id=scsi1-0-0-0 \ +-device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,\ +device_id=drive-scsi1-0-0-0,drive=drive-scsi1-0-0-0,id=scsi1-0-0-0 \ -drive file=/dev/HostVG/QEMUGuest3,format=raw,if=none,id=drive-scsi2-0-0-0 \ --device scsi-hd,bus=scsi2.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi2-0-0-0,\ -id=scsi2-0-0-0 \ +-device scsi-hd,bus=scsi2.0,channel=0,scsi-id=0,lun=0,\ +device_id=drive-scsi2-0-0-0,drive=drive-scsi2-0-0-0,id=scsi2-0-0-0 \ -drive file=/dev/HostVG/QEMUGuest4,format=raw,if=none,id=drive-scsi3-0-0-0 \ --device scsi-hd,bus=scsi3.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi3-0-0-0,\ -id=scsi3-0-0-0 \ +-device scsi-hd,bus=scsi3.0,channel=0,scsi-id=0,lun=0,\ +device_id=drive-scsi3-0-0-0,drive=drive-scsi3-0-0-0,id=scsi3-0-0-0 \ -drive file=/dev/HostVG/QEMUGuest5,format=raw,if=none,id=drive-scsi4-0-0-0 \ --device scsi-hd,bus=scsi4.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi4-0-0-0,\ -id=scsi4-0-0-0 \ +-device scsi-hd,bus=scsi4.0,channel=0,scsi-id=0,lun=0,\ +device_id=drive-scsi4-0-0-0,drive=drive-scsi4-0-0-0,id=scsi4-0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args index 9220e6bee9..7f703d0861 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args @@ -35,8 +35,8 @@ cache=unsafe \ 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 \ +-device scsi-hd,bus=scsi0.0,scsi-id=0,device_id=drive-scsi0-0-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 \ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args index 549a162808..508daa0365 100644 --- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args @@ -28,7 +28,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -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/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-0 \ --device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \ +-device scsi-hd,bus=scsi0.0,scsi-id=0,device_id=drive-scsi0-0-0,\ +drive=drive-scsi0-0-0,id=scsi0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args index 68a8b2921d..e5b930a28a 100644 --- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args @@ -31,16 +31,18 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -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/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-0 \ --device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \ +-device scsi-hd,bus=scsi0.0,scsi-id=0,device_id=drive-scsi0-0-0,\ +drive=drive-scsi0-0-0,id=scsi0-0-0 \ -drive file=/tmp/scsidisk2.img,format=raw,if=none,id=drive-scsi1-0-0-0 \ --device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,\ -id=scsi1-0-0-0,serial=abcdefghijklmn \ +-device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,device_id=abcdefghijklmn,\ +drive=drive-scsi1-0-0-0,id=scsi1-0-0-0,serial=abcdefghijklmn \ -drive file=/tmp/scsidisk3.img,format=raw,if=none,id=drive-scsi2-0-0-0 \ --device scsi-hd,bus=scsi2.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi2-0-0-0,\ -id=scsi2-0-0-0,wwn=0x5000c50015ea71ac \ +-device scsi-hd,bus=scsi2.0,channel=0,scsi-id=0,lun=0,\ +device_id=drive-scsi2-0-0-0,drive=drive-scsi2-0-0-0,id=scsi2-0-0-0,\ +wwn=0x5000c50015ea71ac \ -drive file=/tmp/scsidisk4.img,format=raw,if=none,id=drive-scsi3-0-0-0 \ --device scsi-hd,bus=scsi3.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi3-0-0-0,\ -id=scsi3-0-0-0 \ +-device scsi-hd,bus=scsi3.0,channel=0,scsi-id=0,lun=0,\ +device_id=drive-scsi3-0-0-0,drive=drive-scsi3-0-0-0,id=scsi3-0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args index 4913d1ed20..141cf735a5 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args @@ -33,8 +33,9 @@ bootindex=1,write-cache=on,serial=XYZXYZXYZYXXYZYZYXYZY \ readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -drive file=/dev/scsi,format=raw,if=none,id=drive-scsi0-0-0-0,cache=none \ --device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,share-rw=on,\ -drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,write-cache=on \ +-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ +device_id=drive-scsi0-0-0-0,share-rw=on,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,\ +write-cache=on \ -drive file=/dev/virtio,format=raw,if=none,id=drive-virtio-disk0,cache=none \ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,share-rw=on,\ drive=drive-virtio-disk0,id=virtio-disk0,write-cache=on \ diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args index 4513edcdd0..cde42c7dd1 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args @@ -35,8 +35,8 @@ id=drive-virtio-disk1 \ drive=drive-virtio-disk1,id=virtio-disk1 \ -drive file=/var/lib/libvirt/images/iothrtest2.img,format=raw,if=none,\ id=drive-scsi0-0-0-3 \ --device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=3,drive=drive-scsi0-0-0-3,\ -id=scsi0-0-0-3 \ +-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=3,\ +device_id=drive-scsi0-0-0-3,drive=drive-scsi0-0-0-3,id=scsi0-0-0-3 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ -msg timestamp=on -- 2.20.1
On Mon, Feb 04, 2019 at 04:47:04PM +0100, Peter Krempa wrote:
QEMU accidentally exposed the id of -drive (or same value as disk serial, if provided) in one of the identifiers visible from the guest.
To avoid regression in case when -blockdev will be used we need to always specify it ourselves.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_command.c | 22 +++++++++++++++++++ .../controller-virtio-scsi.x86_64-latest.args | 20 ++++++++--------- .../disk-cache.x86_64-latest.args | 4 ++-- .../disk-scsi-device-auto.x86_64-latest.args | 3 ++- .../disk-scsi.x86_64-latest.args | 16 ++++++++------ .../disk-shared.x86_64-latest.args | 5 +++-- ...threads-virtio-scsi-pci.x86_64-latest.args | 4 ++-- 7 files changed, 50 insertions(+), 24 deletions(-)
@@ -2021,6 +2037,12 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, disk->info.addr.drive.target, disk->info.addr.drive.unit); } + + if (scsiVPDDeviceId) { + virBufferAddLit(&opt, ",device_id="); + virBufferEscape(&opt, '\\', " ", "%s", scsiVPDDeviceId);
commas should be escaped, not spaces
+ } + break;
case VIR_DOMAIN_DISK_BUS_SATA:
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
On Thu, Feb 07, 2019 at 18:15:06 +0100, Ján Tomko wrote:
On Mon, Feb 04, 2019 at 04:47:04PM +0100, Peter Krempa wrote:
QEMU accidentally exposed the id of -drive (or same value as disk serial, if provided) in one of the identifiers visible from the guest.
To avoid regression in case when -blockdev will be used we need to always specify it ourselves.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_command.c | 22 +++++++++++++++++++ .../controller-virtio-scsi.x86_64-latest.args | 20 ++++++++--------- .../disk-cache.x86_64-latest.args | 4 ++-- .../disk-scsi-device-auto.x86_64-latest.args | 3 ++- .../disk-scsi.x86_64-latest.args | 16 ++++++++------ .../disk-shared.x86_64-latest.args | 5 +++-- ...threads-virtio-scsi-pci.x86_64-latest.args | 4 ++-- 7 files changed, 50 insertions(+), 24 deletions(-)
@@ -2021,6 +2037,12 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, disk->info.addr.drive.target, disk->info.addr.drive.unit); } + + if (scsiVPDDeviceId) { + virBufferAddLit(&opt, ",device_id="); + virBufferEscape(&opt, '\\', " ", "%s", scsiVPDDeviceId);
commas should be escaped, not spaces
Hmm, I stole this from disk serial formatting as it's passed here when it's present. I'll need to check first whether serial also does not need a tweak.
On Fri, Feb 08, 2019 at 08:29:07 +0100, Peter Krempa wrote:
On Thu, Feb 07, 2019 at 18:15:06 +0100, Ján Tomko wrote:
On Mon, Feb 04, 2019 at 04:47:04PM +0100, Peter Krempa wrote:
QEMU accidentally exposed the id of -drive (or same value as disk serial, if provided) in one of the identifiers visible from the guest.
To avoid regression in case when -blockdev will be used we need to always specify it ourselves.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_command.c | 22 +++++++++++++++++++ .../controller-virtio-scsi.x86_64-latest.args | 20 ++++++++--------- .../disk-cache.x86_64-latest.args | 4 ++-- .../disk-scsi-device-auto.x86_64-latest.args | 3 ++- .../disk-scsi.x86_64-latest.args | 16 ++++++++------ .../disk-shared.x86_64-latest.args | 5 +++-- ...threads-virtio-scsi-pci.x86_64-latest.args | 4 ++-- 7 files changed, 50 insertions(+), 24 deletions(-)
@@ -2021,6 +2037,12 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, disk->info.addr.drive.target, disk->info.addr.drive.unit); } + + if (scsiVPDDeviceId) { + virBufferAddLit(&opt, ",device_id="); + virBufferEscape(&opt, '\\', " ", "%s", scsiVPDDeviceId);
commas should be escaped, not spaces
Hmm, I stole this from disk serial formatting as it's passed here when it's present. I'll need to check first whether serial also does not need a tweak.
So the disk serial is validated by qemuSafeSerialParamValue in qemuCheckDiskConfig so that it does not contain a comma. Given that we don't need to escape spaces here I'll remove the escaping.
Avoid regressions by disallowing the BLOCKDEV capability. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 290c8c2bdb..42a444a2f5 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4331,6 +4331,11 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, virQEMUCapsClear(qemuCaps, QEMU_CAPS_SEV_GUEST); } + /* To avoid guest ABI regression, blockdev shall be enabled only when + * we are able to pass the custom 'device_id' for SCSI disks and cdroms. */ + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_DISK_DEVICE_ID)) + virQEMUCapsClear(qemuCaps, QEMU_CAPS_BLOCKDEV); + ret = 0; cleanup: return ret; -- 2.20.1
On Mon, Feb 04, 2019 at 04:47:05PM +0100, Peter Krempa wrote:
Avoid regressions by disallowing the BLOCKDEV capability.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 5 +++++ 1 file changed, 5 insertions(+)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
participants (2)
-
Ján Tomko -
Peter Krempa