]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
qemu: assume -drive argument is always available
authorDaniel P. Berrange <berrange@redhat.com>
Fri, 6 Nov 2015 14:28:57 +0000 (14:28 +0000)
committerDaniel P. Berrange <berrange@redhat.com>
Tue, 10 Nov 2015 10:38:01 +0000 (10:38 +0000)
As of QEMU 0.9.1 the -drive argument can be used to configure
all disks, so the QEMU driver can assume it is always available
and drop support for -hda/-cdrom/etc.

Many of the tests need updating because a great many were
running without CAPS_DRIVE set, so using the -hda legacy
syntax.

Fixing the tests uncovered a bug in the argv -> xml
convertor which failed to handle disk with if=floppy.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
220 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
src/qemu/qemu_command.c
src/qemu/qemu_hotplug.c
tests/qemucapabilitiesdata/caps_1.2.2-1.caps
tests/qemucapabilitiesdata/caps_1.3.1-1.caps
tests/qemucapabilitiesdata/caps_1.4.2-1.caps
tests/qemucapabilitiesdata/caps_1.5.3-1.caps
tests/qemucapabilitiesdata/caps_1.6.0-1.caps
tests/qemucapabilitiesdata/caps_1.6.50-1.caps
tests/qemucapabilitiesdata/caps_2.1.1-1.caps
tests/qemucaps2xmldata/all_1.6.0-1.caps
tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps
tests/qemuhelptest.c
tests/qemuhotplugtest.c
tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args
tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args
tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args
tests/qemuxml2argvdata/qemuxml2argv-bios.args
tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args
tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args
tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args
tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args
tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args
tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args
tests/qemuxml2argvdata/qemuxml2argv-boot-network.args
tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args
tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args
tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args
tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args
tests/qemuxml2argvdata/qemuxml2argv-clock-france.args
tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args
tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args
tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args
tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args
tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml
tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args
tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args
tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args
tests/qemuxml2argvdata/qemuxml2argv-console-compat.args
tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args
tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args
tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args
tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args
tests/qemuxml2argvdata/qemuxml2argv-cputune.args
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args
tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args
tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args
tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args
tests/qemuxml2argvdata/qemuxml2argv-disk-many.args
tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args
tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args
tests/qemuxml2argvdata/qemuxml2argv-fs9p.args
tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args
tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args
tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args
tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args
tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args
tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args
tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args
tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args
tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args
tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args
tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args
tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args
tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args
tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args
tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args
tests/qemuxml2argvdata/qemuxml2argv-hugepages.args
tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args
tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args
tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args
tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args
tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args
tests/qemuxml2argvdata/qemuxml2argv-iothreads.args
tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args
tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args
tests/qemuxml2argvdata/qemuxml2argv-lease.args
tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args
tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args
tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args
tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args
tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args
tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args
tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args
tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args
tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args
tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args
tests/qemuxml2argvdata/qemuxml2argv-memtune.args
tests/qemuxml2argvdata/qemuxml2argv-metadata.args
tests/qemuxml2argvdata/qemuxml2argv-migrate.args
tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args
tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args
tests/qemuxml2argvdata/qemuxml2argv-minimal.args
tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args
tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args
tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args
tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args
tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args
tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args
tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args
tests/qemuxml2argvdata/qemuxml2argv-net-client.args
tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args
tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args
tests/qemuxml2argvdata/qemuxml2argv-net-eth.args
tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args
tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args
tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args
tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args
tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args
tests/qemuxml2argvdata/qemuxml2argv-net-server.args
tests/qemuxml2argvdata/qemuxml2argv-net-udp.args
tests/qemuxml2argvdata/qemuxml2argv-net-user.args
tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args
tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args
tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args
tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args
tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args
tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args
tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args
tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args
tests/qemuxml2argvdata/qemuxml2argv-nographics.args
tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args
tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args
tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args
tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args
tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args
tests/qemuxml2argvdata/qemuxml2argv-numad.args
tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args
tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args
tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args
tests/qemuxml2argvdata/qemuxml2argv-panic.args
tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args
tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args
tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args
tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args
tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args
tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args
tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args
tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args
tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args
tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args
tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args
tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args
tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args
tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args
tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args
tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args
tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args
tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args
tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args
tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args
tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args
tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args
tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args
tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args
tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args
tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args
tests/qemuxml2argvdata/qemuxml2argv-serial-file.args
tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args
tests/qemuxml2argvdata/qemuxml2argv-serial-many.args
tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args
tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args
tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args
tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args
tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args
tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args
tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args
tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args
tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args
tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args
tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args
tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args
tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args
tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args
tests/qemuxml2argvdata/qemuxml2argv-smbios.args
tests/qemuxml2argvdata/qemuxml2argv-smp.args
tests/qemuxml2argvdata/qemuxml2argv-sound-device.args
tests/qemuxml2argvdata/qemuxml2argv-sound.args
tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args
tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args
tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args
tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args
tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args
tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args
tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args
tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args
tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args
tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args
tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args
tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args
tests/qemuxml2argvdata/qemuxml2argv-watchdog.args
tests/qemuxml2argvtest.c
tests/qemuxml2xmltest.c
tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args
tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args
tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args
tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args
tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args
tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args
tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args

index a67d8c5b003d4a4ccb02b3b445d4fb911d5efa45..bb7420898362429f2920ddc223c4bd7aa73966ab 100644 (file)
@@ -1088,6 +1088,7 @@ virQEMUCapsComputeCmdFlags(const char *help,
 {
     const char *p;
     const char *fsdev, *netdev;
+    const char *cache;
 
     if (strstr(help, "-no-kvm"))
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_KVM);
@@ -1104,29 +1105,27 @@ virQEMUCapsComputeCmdFlags(const char *help,
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_XEN_DOMID);
     else if (strstr(help, "-domid"))
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_DOMID);
-    if (strstr(help, "-drive")) {
-        const char *cache = strstr(help, "cache=");
-
-        virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE);
-        if (cache && (p = strchr(cache, ']'))) {
-            if (memmem(cache, p - cache, "on|off", sizeof("on|off") - 1) == NULL)
-                virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_V2);
-            if (memmem(cache, p - cache, "directsync", sizeof("directsync") - 1))
-                virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC);
-            if (memmem(cache, p - cache, "unsafe", sizeof("unsafe") - 1))
-                virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_UNSAFE);
-        }
-        if (strstr(help, "format="))
-            virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT);
-        if (strstr(help, "readonly="))
-            virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_READONLY);
-        if (strstr(help, "aio=threads|native"))
-            virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_AIO);
-        if (strstr(help, "copy-on-read=on|off"))
-            virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_COPY_ON_READ);
-        if (strstr(help, "bps="))
-            virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE);
-    }
+
+    cache = strstr(help, "cache=");
+    if (cache && (p = strchr(cache, ']'))) {
+        if (memmem(cache, p - cache, "on|off", sizeof("on|off") - 1) == NULL)
+            virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_V2);
+        if (memmem(cache, p - cache, "directsync", sizeof("directsync") - 1))
+            virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC);
+        if (memmem(cache, p - cache, "unsafe", sizeof("unsafe") - 1))
+            virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_UNSAFE);
+    }
+    if (strstr(help, "format="))
+        virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT);
+    if (strstr(help, "readonly="))
+        virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_READONLY);
+    if (strstr(help, "aio=threads|native"))
+        virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_AIO);
+    if (strstr(help, "copy-on-read=on|off"))
+        virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_COPY_ON_READ);
+    if (strstr(help, "bps="))
+        virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE);
+
     if ((p = strstr(help, "-vga")) && !strstr(help, "-std-vga")) {
         const char *nl = strstr(p, "\n");
 
@@ -3214,7 +3213,6 @@ static qemuMonitorCallbacks callbacks = {
 static void
 virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 {
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_UUID);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNET_HDR);
@@ -3933,8 +3931,7 @@ virQEMUCapsFillDomainLoaderCaps(virQEMUCapsPtr qemuCaps,
     VIR_DOMAIN_CAPS_ENUM_SET(capsLoader->type,
                              VIR_DOMAIN_LOADER_TYPE_ROM);
 
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE) &&
-        virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT))
+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT))
         VIR_DOMAIN_CAPS_ENUM_SET(capsLoader->type,
                                  VIR_DOMAIN_LOADER_TYPE_PFLASH);
 
@@ -4018,8 +4015,7 @@ virQEMUCapsFillDomainDeviceHostdevCaps(virQEMUCapsPtr qemuCaps,
     VIR_DOMAIN_CAPS_ENUM_SET(hostdev->subsysType,
                              VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB,
                              VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI);
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE) &&
-        virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE) &&
+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE) &&
         virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SCSI_GENERIC))
         VIR_DOMAIN_CAPS_ENUM_SET(hostdev->subsysType,
                                  VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI);
index f02e218884a3f3a697ebe1e9de2f026e3ab7687c..a6dcceb44254553adc11a265f5d46173f9bd8a75 100644 (file)
@@ -49,7 +49,7 @@ typedef enum {
     X_QEMU_CAPS_KQEMU, /* Whether KQEMU is compiled in */
     X_QEMU_CAPS_VNC_COLON, /* VNC takes or address + display */
     X_QEMU_CAPS_NO_REBOOT, /* Is the -no-reboot flag available */
-    QEMU_CAPS_DRIVE, /* Is the new -drive arg available */
+    X_QEMU_CAPS_DRIVE, /* Is the new -drive arg available */
     QEMU_CAPS_DRIVE_BOOT, /* Does -drive support boot=on */
 
     /* 5 */
index c159f31ae7cf800017efc3df3b8b140badd1ecb2..dcde31fc398d708a3a9693cf526b2694389e0ea9 100644 (file)
@@ -777,20 +777,6 @@ int qemuDomainNetVLAN(virDomainNetDefPtr def)
 }
 
 
-/* Names used before -drive existed */
-static int qemuAssignDeviceDiskAliasLegacy(virDomainDiskDefPtr disk)
-{
-    char *dev_name;
-
-    if (VIR_STRDUP(dev_name,
-                   disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM &&
-                   STREQ(disk->dst, "hdc") ? "cdrom" : disk->dst) < 0)
-        return -1;
-    disk->info.alias = dev_name;
-    return 0;
-}
-
-
 char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk,
                                virQEMUCapsPtr qemuCaps)
 {
@@ -970,14 +956,10 @@ qemuAssignDeviceDiskAlias(virDomainDefPtr vmdef,
                           virDomainDiskDefPtr def,
                           virQEMUCapsPtr qemuCaps)
 {
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE)) {
-        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))
-            return qemuAssignDeviceDiskAliasCustom(vmdef, def, qemuCaps);
-        else
-            return qemuAssignDeviceDiskAliasFixed(def);
-    } else {
-        return qemuAssignDeviceDiskAliasLegacy(def);
-    }
+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))
+        return qemuAssignDeviceDiskAliasCustom(vmdef, def, qemuCaps);
+    else
+        return qemuAssignDeviceDiskAliasFixed(def);
 }
 
 
@@ -9087,11 +9069,6 @@ qemuBuildDomainLoaderCommandLine(virCommandPtr cmd,
         break;
 
     case VIR_DOMAIN_LOADER_TYPE_PFLASH:
-        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE)) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("this QEMU binary doesn't support -drive"));
-            goto cleanup;
-        }
         if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT)) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                            _("this QEMU binary doesn't support passing "
@@ -9270,6 +9247,7 @@ qemuBuildCommandLine(virConnectPtr conn,
     char *boot_order_str = NULL, *boot_opts_str = NULL;
     virBuffer fdc_opts = VIR_BUFFER_INITIALIZER;
     char *fdc_opts_str = NULL;
+    int bootCD = 0, bootFloppy = 0, bootDisk = 0;
 
     VIR_DEBUG("conn=%p driver=%p def=%p mon=%p json=%d "
               "qemuCaps=%p migrateFrom=%s migrateFD=%d "
@@ -10084,111 +10062,122 @@ qemuBuildCommandLine(virConnectPtr conn,
         VIR_FREE(optstr);
     }
 
-    /* If QEMU supports -drive param instead of old -hda, -hdb, -cdrom .. */
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE)) {
-        int bootCD = 0, bootFloppy = 0, bootDisk = 0;
-
-        if ((virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_BOOT) || emitBootindex)) {
-            /* bootDevs will get translated into either bootindex=N or boot=on
-             * depending on what qemu supports */
-            for (i = 0; i < def->os.nBootDevs; i++) {
-                switch (def->os.bootDevs[i]) {
-                case VIR_DOMAIN_BOOT_CDROM:
-                    bootCD = i + 1;
-                    break;
-                case VIR_DOMAIN_BOOT_FLOPPY:
-                    bootFloppy = i + 1;
-                    break;
-                case VIR_DOMAIN_BOOT_DISK:
-                    bootDisk = i + 1;
-                    break;
-                }
+    if ((virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_BOOT) || emitBootindex)) {
+        /* bootDevs will get translated into either bootindex=N or boot=on
+         * depending on what qemu supports */
+        for (i = 0; i < def->os.nBootDevs; i++) {
+            switch (def->os.bootDevs[i]) {
+            case VIR_DOMAIN_BOOT_CDROM:
+                bootCD = i + 1;
+                break;
+            case VIR_DOMAIN_BOOT_FLOPPY:
+                bootFloppy = i + 1;
+                break;
+            case VIR_DOMAIN_BOOT_DISK:
+                bootDisk = i + 1;
+                break;
             }
         }
+    }
 
-        for (i = 0; i < def->ndisks; i++) {
-            char *optstr;
-            int bootindex = 0;
-            virDomainDiskDefPtr disk = def->disks[i];
-            bool withDeviceArg = false;
-            bool deviceFlagMasked = false;
-
-            /* Unless we have -device, then USB disks need special
-               handling */
-            if ((disk->bus == VIR_DOMAIN_DISK_BUS_USB) &&
-                !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
-                if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK) {
-                    virCommandAddArg(cmd, "-usbdevice");
-                    virCommandAddArgFormat(cmd, "disk:%s", disk->src->path);
-                } else {
-                    virReportError(VIR_ERR_INTERNAL_ERROR,
-                                   _("unsupported usb disk type for '%s'"),
-                                   disk->src->path);
-                    goto error;
-                }
-                continue;
-            }
-
-            /* PowerPC pseries based VMs do not support floppy device */
-            if ((disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) &&
-                ARCH_IS_PPC64(def->os.arch) && STRPREFIX(def->os.machine, "pseries")) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                               _("PowerPC pseries machines do not support floppy device"));
+    for (i = 0; i < def->ndisks; i++) {
+        char *optstr;
+        int bootindex = 0;
+        virDomainDiskDefPtr disk = def->disks[i];
+        bool withDeviceArg = false;
+        bool deviceFlagMasked = false;
+
+        /* Unless we have -device, then USB disks need special
+           handling */
+        if ((disk->bus == VIR_DOMAIN_DISK_BUS_USB) &&
+            !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
+            if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK) {
+                virCommandAddArg(cmd, "-usbdevice");
+                virCommandAddArgFormat(cmd, "disk:%s", disk->src->path);
+            } else {
+                virReportError(VIR_ERR_INTERNAL_ERROR,
+                               _("unsupported usb disk type for '%s'"),
+                               disk->src->path);
                 goto error;
             }
+            continue;
+        }
 
-            switch (disk->device) {
-            case VIR_DOMAIN_DISK_DEVICE_CDROM:
-                bootindex = bootCD;
-                bootCD = 0;
-                break;
-            case VIR_DOMAIN_DISK_DEVICE_FLOPPY:
-                bootindex = bootFloppy;
-                bootFloppy = 0;
-                break;
-            case VIR_DOMAIN_DISK_DEVICE_DISK:
-            case VIR_DOMAIN_DISK_DEVICE_LUN:
-                bootindex = bootDisk;
-                bootDisk = 0;
-                break;
+        /* PowerPC pseries based VMs do not support floppy device */
+        if ((disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) &&
+            ARCH_IS_PPC64(def->os.arch) && STRPREFIX(def->os.machine, "pseries")) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("PowerPC pseries machines do not support floppy device"));
+            goto error;
+        }
+
+        switch (disk->device) {
+        case VIR_DOMAIN_DISK_DEVICE_CDROM:
+            bootindex = bootCD;
+            bootCD = 0;
+            break;
+        case VIR_DOMAIN_DISK_DEVICE_FLOPPY:
+            bootindex = bootFloppy;
+            bootFloppy = 0;
+            break;
+        case VIR_DOMAIN_DISK_DEVICE_DISK:
+        case VIR_DOMAIN_DISK_DEVICE_LUN:
+            bootindex = bootDisk;
+            bootDisk = 0;
+            break;
+        }
+
+        virCommandAddArg(cmd, "-drive");
+
+        /* Unfortunately it is not possible to use
+           -device for floppies, xen PV, or SD
+           devices. Fortunately, those don't need
+           static PCI addresses, so we don't really
+           care that we can't use -device */
+        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
+            if (disk->bus != VIR_DOMAIN_DISK_BUS_XEN &&
+                disk->bus != VIR_DOMAIN_DISK_BUS_SD) {
+                withDeviceArg = true;
+            } else {
+                virQEMUCapsClear(qemuCaps, QEMU_CAPS_DEVICE);
+                deviceFlagMasked = true;
             }
+        }
+        optstr = qemuBuildDriveStr(conn, disk,
+                                   emitBootindex ? false : !!bootindex,
+                                   qemuCaps);
+        if (deviceFlagMasked)
+            virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE);
+        if (!optstr)
+            goto error;
+        virCommandAddArg(cmd, optstr);
+        VIR_FREE(optstr);
 
-            virCommandAddArg(cmd, "-drive");
+        if (!emitBootindex)
+            bootindex = 0;
+        else if (disk->info.bootIndex)
+            bootindex = disk->info.bootIndex;
 
-            /* Unfortunately it is not possible to use
-               -device for floppies, xen PV, or SD
-               devices. Fortunately, those don't need
-               static PCI addresses, so we don't really
-               care that we can't use -device */
-            if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
-                if (disk->bus != VIR_DOMAIN_DISK_BUS_XEN &&
-                    disk->bus != VIR_DOMAIN_DISK_BUS_SD) {
-                    withDeviceArg = true;
+        if (withDeviceArg) {
+            if (disk->bus == VIR_DOMAIN_DISK_BUS_FDC) {
+                if (virAsprintf(&optstr, "drive%c=drive-%s",
+                                disk->info.addr.drive.unit ? 'B' : 'A',
+                                disk->info.alias) < 0)
+                    goto error;
+
+                if (!qemuDomainMachineNeedsFDC(def)) {
+                    virCommandAddArg(cmd, "-global");
+                    virCommandAddArgFormat(cmd, "isa-fdc.%s", optstr);
                 } else {
-                    virQEMUCapsClear(qemuCaps, QEMU_CAPS_DEVICE);
-                    deviceFlagMasked = true;
+                    virBufferAsprintf(&fdc_opts, "%s,", optstr);
                 }
-            }
-            optstr = qemuBuildDriveStr(conn, disk,
-                                       emitBootindex ? false : !!bootindex,
-                                       qemuCaps);
-            if (deviceFlagMasked)
-                virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE);
-            if (!optstr)
-                goto error;
-            virCommandAddArg(cmd, optstr);
-            VIR_FREE(optstr);
-
-            if (!emitBootindex)
-                bootindex = 0;
-            else if (disk->info.bootIndex)
-                bootindex = disk->info.bootIndex;
+                VIR_FREE(optstr);
 
-            if (withDeviceArg) {
-                if (disk->bus == VIR_DOMAIN_DISK_BUS_FDC) {
-                    if (virAsprintf(&optstr, "drive%c=drive-%s",
-                                    disk->info.addr.drive.unit ? 'B' : 'A',
-                                    disk->info.alias) < 0)
+                if (bootindex) {
+                    if (virAsprintf(&optstr, "bootindex%c=%d",
+                                    disk->info.addr.drive.unit
+                                    ? 'B' : 'A',
+                                    bootindex) < 0)
                         goto error;
 
                     if (!qemuDomainMachineNeedsFDC(def)) {
@@ -10198,126 +10187,25 @@ qemuBuildCommandLine(virConnectPtr conn,
                         virBufferAsprintf(&fdc_opts, "%s,", optstr);
                     }
                     VIR_FREE(optstr);
-
-                    if (bootindex) {
-                        if (virAsprintf(&optstr, "bootindex%c=%d",
-                                        disk->info.addr.drive.unit
-                                        ? 'B' : 'A',
-                                        bootindex) < 0)
-                            goto error;
-
-                        if (!qemuDomainMachineNeedsFDC(def)) {
-                            virCommandAddArg(cmd, "-global");
-                            virCommandAddArgFormat(cmd, "isa-fdc.%s", optstr);
-                        } else {
-                            virBufferAsprintf(&fdc_opts, "%s,", optstr);
-                        }
-                        VIR_FREE(optstr);
-                    }
-                } else {
-                    virCommandAddArg(cmd, "-device");
-
-                    if (!(optstr = qemuBuildDriveDevStr(def, disk, bootindex,
-                                                        qemuCaps)))
-                        goto error;
-                    virCommandAddArg(cmd, optstr);
-                    VIR_FREE(optstr);
-                }
-            }
-        }
-        /* Newer Q35 machine types require an explicit FDC controller */
-        virBufferTrim(&fdc_opts, ",", -1);
-        if ((fdc_opts_str = virBufferContentAndReset(&fdc_opts))) {
-            virCommandAddArg(cmd, "-device");
-            virCommandAddArgFormat(cmd, "isa-fdc,%s", fdc_opts_str);
-            VIR_FREE(fdc_opts_str);
-        }
-    } else {
-        for (i = 0; i < def->ndisks; i++) {
-            char dev[NAME_MAX];
-            char *file;
-            const char *fmt;
-            virDomainDiskDefPtr disk = def->disks[i];
-
-            if ((disk->src->type == VIR_STORAGE_TYPE_BLOCK) &&
-                (disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN)) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                               _("tray status 'open' is invalid for "
-                                 "block type disk"));
-                goto error;
-            }
-
-            if (disk->bus == VIR_DOMAIN_DISK_BUS_USB) {
-                if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK) {
-                    virCommandAddArg(cmd, "-usbdevice");
-                    virCommandAddArgFormat(cmd, "disk:%s", disk->src->path);
-                } else {
-                    virReportError(VIR_ERR_INTERNAL_ERROR,
-                                   _("unsupported usb disk type for '%s'"),
-                                   disk->src->path);
-                    goto error;
-                }
-                continue;
-            }
-
-            if (STREQ(disk->dst, "hdc") &&
-                disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) {
-                if (disk->src->path) {
-                    snprintf(dev, NAME_MAX, "-%s", "cdrom");
-                } else {
-                    continue;
                 }
             } else {
-                if (STRPREFIX(disk->dst, "hd") ||
-                    STRPREFIX(disk->dst, "fd")) {
-                    snprintf(dev, NAME_MAX, "-%s", disk->dst);
-                } else {
-                    virReportError(VIR_ERR_INTERNAL_ERROR,
-                                   _("unsupported disk type '%s'"), disk->dst);
-                    goto error;
-                }
-            }
-
-            if (disk->src->type == VIR_STORAGE_TYPE_DIR) {
-                /* QEMU only supports magic FAT format for now */
-                if (disk->src->format > 0 &&
-                    disk->src->format != VIR_STORAGE_FILE_FAT) {
-                    virReportError(VIR_ERR_INTERNAL_ERROR,
-                                   _("unsupported disk driver type for '%s'"),
-                                   virStorageFileFormatTypeToString(disk->src->format));
-                    goto error;
-                }
-                if (!disk->src->readonly) {
-                    virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                                   _("cannot create virtual FAT disks in read-write mode"));
-                    goto error;
-                }
-                if (disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY)
-                    fmt = "fat:floppy:%s";
-                else
-                    fmt = "fat:%s";
+                virCommandAddArg(cmd, "-device");
 
-                if (virAsprintf(&file, fmt, disk->src) < 0)
-                    goto error;
-            } else if (disk->src->type == VIR_STORAGE_TYPE_NETWORK) {
-                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                               _("network disks are only supported with -drive"));
-                goto error;
-            } else {
-                if (VIR_STRDUP(file, disk->src->path) < 0)
+                if (!(optstr = qemuBuildDriveDevStr(def, disk, bootindex,
+                                                    qemuCaps)))
                     goto error;
+                virCommandAddArg(cmd, optstr);
+                VIR_FREE(optstr);
             }
-
-            /* Don't start with source if the tray is open for
-             * CDROM and Floppy device.
-             */
-            if (!((disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY ||
-                   disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) &&
-                  disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN))
-                virCommandAddArgList(cmd, dev, file, NULL);
-            VIR_FREE(file);
         }
     }
+    /* Newer Q35 machine types require an explicit FDC controller */
+    virBufferTrim(&fdc_opts, ",", -1);
+    if ((fdc_opts_str = virBufferContentAndReset(&fdc_opts))) {
+        virCommandAddArg(cmd, "-device");
+        virCommandAddArgFormat(cmd, "isa-fdc,%s", fdc_opts_str);
+        VIR_FREE(fdc_opts_str);
+    }
 
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_FSDEV)) {
         for (i = 0; i < def->nfss; i++) {
@@ -11170,8 +11058,7 @@ qemuBuildCommandLine(virConnectPtr conn,
         /* SCSI */
         if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
             hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) {
-            if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE) &&
-                virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE) &&
+            if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE) &&
                 virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SCSI_GENERIC)) {
                 char *drvstr;
 
index 13a4b300fdf9bd83b126c387f98d3f6c2b4432f8..5030dd16b1bf0134548b3d9436c35097cd72d2c0 100644 (file)
@@ -1967,8 +1967,7 @@ qemuDomainAttachHostSCSIDevice(virConnectPtr conn,
     bool teardowncgroup = false;
     bool teardownlabel = false;
 
-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE) ||
-        !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE) ||
+    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE) ||
         !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_SCSI_GENERIC)) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("SCSI passthrough is not supported by this version of qemu"));
index 24a03e2448e9d1e55c291bb7549e6ee32d2e3515..d639c2b192abf3a5d1ce26a3083d878b4dd58424 100644 (file)
@@ -1,5 +1,4 @@
   <qemuCaps>
-    <flag name='drive'/>
     <flag name='name'/>
     <flag name='uuid'/>
     <flag name='vnet-hdr'/>
index 88b8dbc69f72bd6fd528cc5b27a326290c0d1e2d..60e3bea2fb2291d5e4ef53c86868671008b26af0 100644 (file)
@@ -1,5 +1,4 @@
   <qemuCaps>
-    <flag name='drive'/>
     <flag name='name'/>
     <flag name='uuid'/>
     <flag name='vnet-hdr'/>
index 635f2c6c6103b0eed407cae08d2a1faa28afd733..98fe6f75ebb781f824ba9b6c7c7484a493e7c223 100644 (file)
@@ -1,5 +1,4 @@
   <qemuCaps>
-    <flag name='drive'/>
     <flag name='name'/>
     <flag name='uuid'/>
     <flag name='vnet-hdr'/>
index 5eb73c8bef62c2b5bf1a6d7b9c858d4c15e0fbeb..7df2f54ef956b217813008864874a0d901ee3792 100644 (file)
@@ -1,5 +1,4 @@
   <qemuCaps>
-    <flag name='drive'/>
     <flag name='name'/>
     <flag name='uuid'/>
     <flag name='vnet-hdr'/>
index 6f84a40470f2d309a5f3cff2ff48ff96e678b80b..bdb6affdd845857e5a893c6c2a1a49a3379ca812 100644 (file)
@@ -1,5 +1,4 @@
   <qemuCaps>
-    <flag name='drive'/>
     <flag name='name'/>
     <flag name='uuid'/>
     <flag name='vnet-hdr'/>
index 55ae85f82c3b0ad832fc8e85fd855f5d184ce879..14ea911d110e7eccf540c109b6e8b01623c62416 100644 (file)
@@ -1,5 +1,4 @@
   <qemuCaps>
-    <flag name='drive'/>
     <flag name='name'/>
     <flag name='uuid'/>
     <flag name='vnet-hdr'/>
index 1fa1d204ff980401993bf916b7699f615b95cf35..6283efdda9b1273f123c2d53ac5655051cd7ed81 100644 (file)
@@ -1,5 +1,4 @@
   <qemuCaps>
-    <flag name='drive'/>
     <flag name='name'/>
     <flag name='uuid'/>
     <flag name='vnet-hdr'/>
index 8d55141943f0778f1cc2c53f0ff64bf74a790e38..95d173ab28460da92dc1094fa43988b7c1c3f6a7 100644 (file)
@@ -1,5 +1,4 @@
   <qemuCaps>
-    <flag name='drive'/>
     <flag name='name'/>
     <flag name='uuid'/>
     <flag name='vnet-hdr'/>
index d09177646bf7e8f8c277275e4b5302e139f9f71b..18f08975dc3d891c9d49a46de9212abc616ab242 100644 (file)
@@ -1,5 +1,4 @@
   <qemuCaps>
-    <flag name='drive'/>
     <flag name='name'/>
     <flag name='uuid'/>
     <flag name='vnet-hdr'/>
index 4edf6ec3f2177b12b3210f042419c8ca620fa488..9c329c84289b022cc5e4e94932f255335c83ef53 100644 (file)
@@ -152,7 +152,6 @@ mymain(void)
     DO_TEST_FULL(name, version, is_kvm, kvm_version, VIR_ERR_OK, __VA_ARGS__)
 
     DO_TEST("qemu-0.12.1", 12001, 0, 0,
-            QEMU_CAPS_DRIVE,
             QEMU_CAPS_NAME,
             QEMU_CAPS_UUID,
             QEMU_CAPS_MIGRATE_QEMU_TCP,
@@ -186,7 +185,6 @@ mymain(void)
             QEMU_CAPS_CPU_HOST,
             QEMU_CAPS_VNC);
     DO_TEST("qemu-kvm-0.12.1.2-rhel60", 12001, 1, 0,
-            QEMU_CAPS_DRIVE,
             QEMU_CAPS_DRIVE_BOOT,
             QEMU_CAPS_NAME,
             QEMU_CAPS_UUID,
@@ -247,7 +245,6 @@ mymain(void)
             QEMU_CAPS_DEVICE_E1000,
             QEMU_CAPS_DEVICE_VIRTIO_NET);
     DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0,
-            QEMU_CAPS_DRIVE,
             QEMU_CAPS_DRIVE_BOOT,
             QEMU_CAPS_NAME,
             QEMU_CAPS_UUID,
@@ -288,7 +285,6 @@ mymain(void)
             QEMU_CAPS_CPU_HOST,
             QEMU_CAPS_VNC);
     DO_TEST("qemu-kvm-0.13.0", 13000, 1, 0,
-            QEMU_CAPS_DRIVE,
             QEMU_CAPS_DRIVE_BOOT,
             QEMU_CAPS_NAME,
             QEMU_CAPS_UUID,
@@ -361,7 +357,6 @@ mymain(void)
             QEMU_CAPS_DEVICE_E1000,
             QEMU_CAPS_DEVICE_VIRTIO_NET);
     DO_TEST("qemu-kvm-0.12.1.2-rhel61", 12001, 1, 0,
-            QEMU_CAPS_DRIVE,
             QEMU_CAPS_NAME,
             QEMU_CAPS_UUID,
             QEMU_CAPS_VNET_HDR,
@@ -429,7 +424,6 @@ mymain(void)
             QEMU_CAPS_DEVICE_E1000,
             QEMU_CAPS_DEVICE_VIRTIO_NET);
     DO_TEST("qemu-kvm-0.12.1.2-rhel62-beta", 12001, 1, 0,
-            QEMU_CAPS_DRIVE,
             QEMU_CAPS_NAME,
             QEMU_CAPS_UUID,
             QEMU_CAPS_VNET_HDR,
@@ -505,7 +499,6 @@ mymain(void)
             QEMU_CAPS_DEVICE_E1000,
             QEMU_CAPS_DEVICE_VIRTIO_NET);
     DO_TEST("qemu-1.0", 1000000, 0, 0,
-            QEMU_CAPS_DRIVE,
             QEMU_CAPS_NAME,
             QEMU_CAPS_UUID,
             QEMU_CAPS_MIGRATE_QEMU_TCP,
@@ -596,7 +589,6 @@ mymain(void)
             QEMU_CAPS_DEVICE_E1000,
             QEMU_CAPS_DEVICE_VIRTIO_NET);
     DO_TEST("qemu-1.1.0", 1001000, 0, 0,
-            QEMU_CAPS_DRIVE,
             QEMU_CAPS_NAME,
             QEMU_CAPS_UUID,
             QEMU_CAPS_MIGRATE_QEMU_TCP,
index 2c5c48f571f4a9373d8485e568fbbcc4fe190a67..af64067dbb2b8558dc0fc117d604357e0d2dd750 100644 (file)
@@ -71,7 +71,6 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt,
         goto cleanup;
 
     /* for attach & detach qemu must support -device */
-    virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DRIVE);
     virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE);
     virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_NET_NAME);
     virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VIRTIO_SCSI);
index cfb358cf561de7063ea7c0120c73374cc05f8c2b..6a7daedb12bbfd98e07090770562091436238031 100644 (file)
@@ -16,5 +16,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,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 virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
index 5f825397a52e6e585eaaa6c4127be853aac73755..43c1d966690f194bf803bf3024bb05ad088ddf16 100644 (file)
@@ -16,5 +16,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,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 virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12
index 5f825397a52e6e585eaaa6c4127be853aac73755..43c1d966690f194bf803bf3024bb05ad088ddf16 100644 (file)
@@ -16,5 +16,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,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 virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12
index 06cee20321b52ff4603d69a0aefd7640c87fc722..de893650c28a7a584152ddd9cc1133332223bb0f 100644 (file)
@@ -17,7 +17,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -serial pty \
 -device usb-tablet,id=input0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
index ffb6c3ace45a0896c4e8583f1883e3be74ad2c35..903d23e2d42e0c36a6d9fef924a92bcb8e4c079d 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index ffb6c3ace45a0896c4e8583f1883e3be74ad2c35..903d23e2d42e0c36a6d9fef924a92bcb8e4c079d 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 5fbc617aef2e581ef05dd69d504cd149484233e6..16686c6273d970ec6238c75d623fb0c03fda4f63 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot d \
 -usb \
--cdrom /dev/cdrom \
+-drive file=/dev/cdrom,if=ide,media=cdrom,bus=1,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 5f6ed7f899fb5f263a1d184679d73bfd32162674..58613aa187ecc9765986d71b27b98eefccd269e1 100644 (file)
@@ -14,8 +14,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot a \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
--fda /tmp/firmware.img \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/tmp/firmware.img,if=floppy,unit=0 \
 -net none \
 -serial none \
 -parallel none
index f0849924ac5b2400ef659fa7dcdabae2e7a02611..8ed00c2dd3e5e4a1ea982ba3b85a8c5d5a53fe5d 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot order=d,menu=off \
 -usb \
--cdrom /dev/cdrom \
+-drive file=/dev/cdrom,if=ide,media=cdrom,bus=1,unit=0 \
 -net none \
 -serial none \
 -parallel none
index ff9aa339c296383d32e1e53a2062516a42cae425..6fc1a2389240221b2b1d5f626576872fdccfc55a 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot order=dcna,menu=on \
 -usb \
--cdrom /dev/cdrom \
+-drive file=/dev/cdrom,if=ide,media=cdrom,bus=1,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 74f198bd5d44d857615c4780dcb246073a965b38..8f11056e266a9847809b9b556e51ef59d2a335f0 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot n \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index b9ef21825d1274f9006762949171280a6ad36a70..3f5c289a7420f7b534aa57a74eae20fe3877a5fd 100644 (file)
@@ -17,7 +17,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -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
index 8ccadbd36ccd4a7283f43138b926ec8f6210fb90..c61f6d1490169a00636ebb542dc43bee7fcdb5d7 100644 (file)
@@ -16,7 +16,8 @@ QEMU_AUDIO_DRV=spice \
 -boot c \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,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 spicevmc,bus=virtio-serial1.0,nr=3,id=channel0 \
 -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\
 tls-channel=main \
index 6be65d5a162f1eb0912fac0337e08f0c67bbb14d..89a113353912fcceeb8beab6d095a7cf92718d1b 100644 (file)
@@ -16,7 +16,8 @@ QEMU_AUDIO_DRV=spice \
 -boot c \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev spicevmc,id=charchannel0,name=vdagent \
 -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\
 id=channel0,name=com.redhat.spice.0 \
index c59c9aeee4d4a0874dd82e4a6d671b9fa2352827..b1c22c5678ee5a624757061da424ba2743b12b0f 100644 (file)
@@ -21,7 +21,8 @@ addr=0x3 \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -device virtio-serial-pci,id=virtio-serial2,bus=pci.0,addr=0x4 \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charchannel0 \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.linux-kvm.port.0 \
index c94ea99dd0d4c0d2a426626d4a07f03978274fe0..7f48cbf55197f905888c211eb854f82da66ef97a 100644 (file)
@@ -20,7 +20,8 @@ QEMU_AUDIO_DRV=none \
 addr=0x3 \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0x4 \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charchannel0 \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.linux-kvm.port.0 \
index 410929e40876cb79c14ea241f54d18591f8f21c8..0fca7350ab30c2a850c10aa923b26a3af4f88378 100644 (file)
@@ -20,7 +20,8 @@ QEMU_AUDIO_DRV=none \
 addr=0x3 \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charchannel0 \
 -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel0,\
 id=channel0,name=org.linux-kvm.port.0 \
index 0e2e69d28f5b06fbf7c2a6d67428a7596c23f419..6eefe4d020e1a70ac977649f780c9044f982d0cd 100644 (file)
@@ -19,7 +19,8 @@ QEMU_AUDIO_DRV=none \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charchannel0 \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0 \
index 674a846a4a56584cfb5d23398737a4b1c77d490f..7c3a423625d02067f33392dea7ca2a75ee34dab6 100644 (file)
@@ -18,7 +18,8 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charchannel0 \
 -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\
 id=channel0,name=org.linux-kvm.port.foo \
index 95b02ee3b2b9d868d7b7286928ebc9f7261552c1..533a2bd77698e4516d8dffd490634a787b7f9c18 100644 (file)
@@ -19,7 +19,8 @@ QEMU_AUDIO_DRV=none \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev socket,id=charchannel0,\
 path=/tmp/domain-QEMUGuest1/org.qemu.guest_agent.0,server,nowait \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
index 2ff7df0ad7ac9eb80deb9caebeeda5f2d07ca813..fdd7279050fd2a1cf9b38233b8a42e776210d0ec 100644 (file)
@@ -18,7 +18,8 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charchannel0 \
 -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\
 id=channel0,name=org.linux-kvm.port.foo \
index 4f5c1e2478dcc0558c59d33b09e73fc94de150bb..59c30cb2d557af9c2d39ce42449fff030e8579df 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index a2bfc3ddc58cce0d4610bbf114dc9a94b043034b..f4503e337388bd2cd1a3ebab498cc8c54778f67e 100644 (file)
@@ -16,7 +16,7 @@ TZ=Europe/Paris \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 283bc013187f897c6cdc121cf3732aadd0886489..8b57b95de4e8e606fdc9ad5cd063f244276e8725 100644 (file)
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 5632c204950c3dfe565c26ec6975fb802224a738..370c9f1183fe7ed3eb19c6b2249d88607f524a7c 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 32296d1540dc872d7771219a44aa9c3d000cd2e4..c59dedfd7d85f36955c0f558db9209de84087857 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index cfb358cf561de7063ea7c0120c73374cc05f8c2b..96829ad752dd10cf19280a414b0a9fd77f8adf7d 100644 (file)
@@ -10,11 +10,11 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1 \
 -nographic \
--nodefconfig \
--nodefaults \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-net none \
+-serial none \
+-parallel none
index 138a83ad486fa1457e99867f55968c62d3b3246f..b40ca80b84a859e76fbfd857e354d015348173df 100644 (file)
@@ -23,6 +23,6 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
-    <memballoon model='virtio'/>
+    <memballoon model='none'/>
   </devices>
 </domain>
index 06c3263cf0d5fb35d923d9319aca6579244b7356..15a9fd56c07d68ee28e974c16347c7cf8a0bc74e 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 9fa4cb834dff4242494cf6e01f367c4170882547..6aec302e508b56831c027b6a75992e3b5f76ee26 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial pty \
 -parallel none
index a849c3f6e025e9cbc481785f79185eba811545bc..931959709d2d4dacf861a6634f4fa0e90e464890 100644 (file)
@@ -17,7 +17,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
index 9fa4cb834dff4242494cf6e01f367c4170882547..6aec302e508b56831c027b6a75992e3b5f76ee26 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial pty \
 -parallel none
index 95363b94280a831fd9d753577497e58eaf8ac774..51b2d5f0587e664bb6170b4970e47126c5e0ba90 100644 (file)
@@ -18,7 +18,8 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0 \
 -chardev pty,id=charconsole1 \
index 66305307e50e585ab634b5d3bf151dcab5ad72ed..10856dd56669dda4041fe321f28bd7c0147b7b36 100644 (file)
@@ -18,7 +18,8 @@ QEMU_AUDIO_DRV=none \
 -boot c \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charconsole0 \
 -device virtconsole,chardev=charconsole0,id=console0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
index 2dc9a9629d9604cac262ab35cf9ed8dbbabb2472..44c27d901552ab9824f4101de9eeeae30502124c 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index d14c6ceed593f0dbc6416ed94a9649cd98b20749..f9028bb73bd371b717b20402e7b3a7e0bb450db5 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index d14c6ceed593f0dbc6416ed94a9649cd98b20749..f9028bb73bd371b717b20402e7b3a7e0bb450db5 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index a1242085c69c27b9ac9685cdcd4b07147abd6c9d..829252b564c2943ce2996267e00c3df4d6aa1d9f 100644 (file)
@@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive if=ide,media=cdrom,bus=1,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 9f55c2ae6322eaa44455e4b3976e9d544c4dd465..2d273dd9536ee79fe5477a04e7e838494c186b43 100644 (file)
@@ -14,8 +14,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
--cdrom /root/boot.iso \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/root/boot.iso,if=ide,media=cdrom,bus=1,unit=0 \
 -net none \
 -serial none \
 -parallel none
index b83a9fbb3c33097ec5b8a5351f5448f0ff09c99a..97bab323580b81b96e53643a49b160e821ce12ee 100644 (file)
@@ -14,8 +14,9 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
--fda /dev/fd0 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/fd0,if=floppy,unit=0 \
+-drive if=floppy,unit=1 \
 -net none \
 -serial none \
 -parallel none
index c95f467d2e0fc30f1fec974f41b0c253ce956303..6cf7e2b9e6262366f4480d036045a7007cc533d2 100644 (file)
@@ -14,9 +14,9 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
--fda /dev/fd0 \
--fdb /tmp/firmware.img \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/fd0,if=floppy,unit=0 \
+-drive file=/tmp/firmware.img,if=floppy,unit=1 \
 -net none \
 -serial none \
 -parallel none
index 8f23385e2427ce88426742390c83b57ba3f00599..6f09c83ae2a335603e75a484a0a0fef728269364 100644 (file)
@@ -14,8 +14,9 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan.hdserver:\
-hydrar-desktop.win7vm-lun-0 \
+-drive file=/dev/disk/by-path/ip-192.168.44.1:\
+3260-iscsi-iqn.2011-02.lan.hdserver:hydrar-desktop.win7vm-lun-0,if=ide,bus=0,\
+unit=0 \
 -net none \
 -serial none \
 -parallel none
index 2eb5c44e51d12a91182fdbc7db3947f33bcb0df8..e17013594ec4e5a129546f2a2ca4616cfe4c9f9c 100644 (file)
@@ -14,10 +14,10 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
--hdb /dev/HostVG/QEMUGuest2 \
--hdc /tmp/data.img \
--hdd /tmp/logs.img \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=ide,bus=0,unit=1 \
+-drive file=/tmp/data.img,if=ide,bus=1,unit=0 \
+-drive file=/tmp/logs.img,if=ide,bus=1,unit=1 \
 -net none \
 -serial none \
 -parallel none
index ebdba3e92afb48c8363ad20b4d3d63f62bc1e0ca..9bbb3b79b296bc4e9b53c8c08f20d69856d719ec 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -usbdevice disk:/tmp/usbdisk.img \
 -net none \
 -serial none \
index 347e3db929b3925fa65c33ab4d7eb8b31f4bc777..1e7758bae621404814a975c517b2c65494ca93e1 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 43f7b5f67dea500eab0a15b3227da160f57e7ad1..ebce05a85ba9fa0e0f595edc960a0e8f52ae1e18 100644 (file)
@@ -16,7 +16,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -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 \
index 9821aa825dd9dc86d632f61ded296de8d2868752..36b272e4199473cb69836faa786196c474a91d15 100644 (file)
@@ -14,7 +14,7 @@ DISPLAY=:0.1 \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index 280832f3bc2be33f5ad9838a4349333f2d276db1..01ac3f1392a84adba45a31060b262db1bae94fa9 100644 (file)
@@ -14,7 +14,7 @@ DISPLAY=:0.1 \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index 698fc40b4cea2fd6726d3155ed7fef94959e2037..21dd062eaf9138d0f2dc5d4851febaba3da47897 100644 (file)
@@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=spice \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -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 \
index 55e5d5456269d4f1b887acdd0199ed00fa8d048a..ba215a1fd4f140bdf49053e465d0256795f74cf3 100644 (file)
@@ -16,7 +16,8 @@ QEMU_AUDIO_DRV=spice \
 -boot c \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev spicevmc,id=charchannel0,name=vdagent \
 -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\
 id=channel0,name=com.redhat.spice.0 \
index 627df6428d57bc3efc623a698360f85af3bcae01..c463ad77a3d558aec7e65124e6db3947c9aa1e93 100644 (file)
@@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=spice \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -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 \
index 59b671bf93ba484d006b949900b4a2d0cdde9c4a..7b319dfb494f4e09f241c0e7556c53c287cdd291 100644 (file)
@@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=spice \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -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 \
index 326256f48881023a45e73aa830f323bef2763c0f..a5349aac918a19ca5df6934607bdc258f6a8b1c3 100644 (file)
@@ -15,7 +15,8 @@ QEMU_AUDIO_DRV=spice \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -spice port=5903,tls-port=5904,sasl,addr=127.0.0.1,\
 x509-dir=/etc/pki/libvirt-spice,tls-channel=default \
 -vga qxl \
index 5d8f5ad8c8c5c9d4a2013d40a96bad28ac5d3ff6..955bfc313e7d05e424a3991ca145f6d1c24093fa 100644 (file)
@@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=spice \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -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,\
index c253575ac1e2fe9d0a7ef4715832b6ecd6b20e8c..7831e0dbe4f540a2a8a98436330a08111082ced5 100644 (file)
@@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index fa97ce5c59e00d773c0de561b7af40066f2c95de..a9f2c36783306bdc53796bfb0e9d9b1e6ec72e85 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index dce34b82adf1d315cf39eb1eacc40ba06f33f3d2..bd9deec3cb1bd2b946434a0d25f6714aa7310c70 100644 (file)
@@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index 9067ec05868bfc12995adf35096746bc0d75990b..1ed8ca1c9d4d7afaaec96a628f58fddf81b5794a 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index c5341ccc7e8c93cc56d47d0c8dd0d6f134ee03e4..30cdc5ac59073cb83f027fe415554f27fe3e6efb 100644 (file)
@@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index 116eeeb7d0e1a7de5ea7ce7a1d6d377935a112c5..e4b5f10342d371e30025ec4f154fa0542497bdfb 100644 (file)
@@ -16,6 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest2 \
+-drive file=/dev/HostVG/QEMUGuest2,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 pci-assign,host=06:12.5,id=hostdev0,bus=pci.0,addr=0x3 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
index 7a172d3be87f1f3aa17a3141533ebc151cbb2a37..ff46d613f886cc9dbf8af26194502e627334bf57 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest2 \
+-drive file=/dev/HostVG/QEMUGuest2,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index a01ce79c3288b2c38ff56b63702674eec8cb644d..79afe03519318edbae5b3f52713d475df9cefe95 100644 (file)
@@ -15,6 +15,7 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,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 usb-host,hostbus=14,hostaddr=6,id=hostdev0,bootindex=1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
index 2dea04668dc3d7429ca4d0470f8500879a5d77ce..8cc33107d73a00717732f8448b98d70430c8b9d0 100644 (file)
@@ -16,6 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,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 usb-host,hostbus=14,hostaddr=6,id=hostdev0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
index 6bc727477a6f983e533e243d76c3a31c5a21d219..b3591da782a7464e7651bffac7cf68563ec51833 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index a6df1d8da572db74ac4659fcd67cc69fbab1391f..605cbeec5ea94c52046fca27cf5b234d1c04662e 100644 (file)
@@ -16,6 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest2 \
+-drive file=/dev/HostVG/QEMUGuest2,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 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
index 044f8eb3d347dcff0ea6adc8b93be702cb2965be..8e04e0cf25232b00b148f270cfcf6799cfd17933 100644 (file)
@@ -16,6 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest2 \
+-drive file=/dev/HostVG/QEMUGuest2,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 vfio-pci,host=06:12.5,id=hostdev0,bus=pci.0,addr=0x3 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
index 03f607ecb17372fbce0c229a07c7d68c88321916..d05fa97b1034fc9a4c96c2a12fda4ed1b2a280d7 100644 (file)
@@ -29,7 +29,7 @@ mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=3,policy=bind
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 77ff6d34603db24b53afa9734c4f3debda001fce..db058a62956467137ace16ac86bcb7ef51deca84 100644 (file)
@@ -20,7 +20,7 @@ mem-path=/dev/hugepages2M/libvirt/qemu,size=805306368 \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index a6a5aa51af53ad3fe3c627a16db5f37f2fb6df13..76afe8d1bc70f09117a83b7782518075fe4bdfbd 100644 (file)
@@ -19,7 +19,7 @@ mem-path=/dev/hugepages1G/libvirt/qemu,size=805306368 \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 49956a9731aa4f18093fdfd9bbd3e87326b39c87..2368950de83f90869a7c987304df24a74f0de40e 100644 (file)
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 3ec7d3be4ad4848f93bcfb1a21c8470545ebfb4a..e55bfeaa7a83c18638d27b37939244c5c6e637ab 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index b20156c41015ee89b7473ca54e31e07297311fe5..a93d20ffa7b6af3cadda20f87f85ee18dc44698b 100644 (file)
@@ -29,7 +29,7 @@ mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=3,policy=bind
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index a3e38bbda7d63f318b8425358d28adddb679dbdd..aad459df7755b5e2ffdc33da0c344f62fe37832b 100644 (file)
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 52e3e7a738187252d2f6e9cf36453fd6dca472a3..5d8fd0668929e21729e799df1dbc36f8f009db24 100644 (file)
@@ -16,6 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,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 usb-mouse,id=input0,bus=usb.0,port=4 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
index cc462da23751c622189e89c90094ccb916c48b36..c138ce26d24c4f268c09a6eef3bd4ed3809e382b 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index 0482380c4f90024fac334aba0d24ea6baef9e19e..145883d5e98b1512f9259aec4135ee1c9f4069f4 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index 884a24ae8dd7ca4649490b8bdf54c2c97e83f6a9..95ae95b40cfa7be9e704fe19c69ab6c1a4bd272f 100644 (file)
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index b041f519b04c5f42bf031e58de964149748d1bcf..07a5c5d42a932e612d4e8d8adffa6fd5e13e979c 100644 (file)
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 0a2161dd7b2200dc49c8aed7ebff6a86839dfa33..88689be8e5e76aefed3dd9b19bc10511c8ac0213 100644 (file)
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index bf1f2960c7bf52e85eee082a1f2d8070221d49ff..3f43ea738f459cd8784b128e4ec8b2e1e029a787 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 7f9d60a032fa6b0a7aa3702dcc186fdf5c86cde8..880883bb79fdb86f544036e6f99747b9b99abfcf 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 9f55c2ae6322eaa44455e4b3976e9d544c4dd465..21d605c37f823578264332aa79c8e8b80bff9d86 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -cdrom /root/boot.iso \
 -net none \
 -serial none \
index f13edadcd3dde116a9b05e6d2514ca4734ef93ce..c08226cba0e472a62314b4f2dcc09a88cbb56c03 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 2d25d5a2cee06a9472c4790a071688b90fca5989..5ae184445e4e2f6e7f8323bae270875bc195f4f2 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index a94639d68e7c0fbd3ccaff49a5b5a96dd48dd37e..78f552fd1d5b68a135f107a6e3a6e351aae93c39 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 30c4e890836590599648f65ab22d98bf2e0f8b8e..8be11730cc2404dc7e9caacadc04bc872001ec52 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 6ffbf0e8d1abdc4640ceedd03518220000d81f73..61b310d44b37be2fd7670a82ce4d421f10e5ae71 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index db28520c2ac4a19446a6228fe39bb173737eadec..c431f167ea961fdf35537b19b6b5cb1c41aefd83 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 5c7ec7dd08e639c1f7cca14319fd8cf31d356797..f233c98e0846f27236de6b371739f6aa504096d2 100644 (file)
@@ -19,5 +19,6 @@ mem-path=/dev/hugepages2M/libvirt/qemu,size=536870912,host-nodes=1-3,policy=bind
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,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 virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
index e3cd6dc0f2e5489ca9c6371fcdff6ad2d82cbae9..4fa9f3fe9623bfbe49718d04f7fdf69fa9241269 100644 (file)
@@ -21,5 +21,6 @@ mem-path=/dev/hugepages2M/libvirt/qemu,size=536870912,host-nodes=1-3,policy=bind
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,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 virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
index 2a7bc006e84c3e2ce16c172a3de3f9b3916185bb..a422ca2cb01855644ac32d56f4cb72a9cf152b66 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index ffb6c3ace45a0896c4e8583f1883e3be74ad2c35..903d23e2d42e0c36a6d9fef924a92bcb8e4c079d 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index ffb6c3ace45a0896c4e8583f1883e3be74ad2c35..903d23e2d42e0c36a6d9fef924a92bcb8e4c079d 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index ffb6c3ace45a0896c4e8583f1883e3be74ad2c35..903d23e2d42e0c36a6d9fef924a92bcb8e4c079d 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 116a1eec75fcc3ef521d0ffb3d5ceca635923451..69d2e44a79f37176d3f1147af6866d4feae5be15 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index f4928f7449d11ee749649d80f645dd0f7de0920a..de292a870df218f7125d4b085ddbcb5dc63d3343 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index 068c4a8e3395b0a9fbc506b2665073c4a750ae96..0951c04d8357e1ea1d2042b2cae470737c3856f3 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
 -boot c \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=virtio \
 -net none \
 -serial none \
 -parallel none
index ffb6c3ace45a0896c4e8583f1883e3be74ad2c35..903d23e2d42e0c36a6d9fef924a92bcb8e4c079d 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 10ea8b3d55d90ab0d07f296633193aedccbe3720..7371f8d171235352baef452e51dc26586c5f40c9 100644 (file)
@@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 835c24346af80f9bc2d7cd7d6013bf6d8dce0001..0da13aad404b8d64133676752e747237b3c40ec2 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -global PIIX4_PM.disable_s3=1 \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 1a2bc619c0fbd5fff042742cac60565de836e0a7..0503eae6ebff01303d9113eec32a8c6311a7cdcf 100644 (file)
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
 -global PIIX4_PM.disable_s4=1 \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 58cfef705aefe55d2fd4e7120b869d600a05e2f3..703f8e732edf5e709931265eef2cf4f3fabc4286 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -global PIIX4_PM.disable_s4=0 \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 3ef9f5e9348fcae20cb2e7b273b3e1562449a3b8..b8e56004f3076ccc1d1394e0071fed94c8aef45e 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index f04944a5780930a0777e41a9c28ea5a10c0b8d58..079923a50db9222284f53defe472b56732492a43 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index aa799c75cb159e3707ae8a42f6e7882ab62e09c2..c7096970904374f2ee3f6d936a2cf3dc80d6ab0d 100644 (file)
@@ -17,5 +17,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/hda1 \
+-drive file=/dev/hda1,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 virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
index 8e641fc4c8674dc18557ab3522b44ab1cb64c1e6..40a714bb64a3943ca2599051c5a10ce0ac70e037 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 \
 -net socket,connect=192.168.0.1:5558,vlan=0 \
 -serial none \
index 946bd7ae786395b730dc233258eb67f636391f3d..8397241802f728e0ca977f8722d730e3db70928a 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 \
 -net tap,ifname=nic02,script=/etc/qemu-ifup,vlan=0 \
 -serial none \
index d8e014ae2d495b4d97188e98618e7b4ab3c31412..f1c828e5c63f78a62e3427828ddded7e263b2161 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139,name=net0 \
 -net tap,script=/etc/qemu-ifup,vlan=0,name=hostnet0 \
 -net nic,macaddr=00:11:22:33:44:56,vlan=1,model=e1000,name=net1 \
index 3adcd6bdb11ba203ed146834d22c1819692d5b63..b4f18fd9559c3bb76e559b309cd4edd75aa902ca 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 \
 -net tap,script=/etc/qemu-ifup,vlan=0 \
 -serial none \
index 198bec5fbdba40a42bd2321cd253d63b87981f1a..923349f93ed7e610452cb5b1a46036b0e72e732d 100644 (file)
@@ -16,6 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,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 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
index 5e32f4e4fd66fd6a103922049353b838916edb2d..481748ea02a1c405a6e02cdf475a2d345590724d 100644 (file)
@@ -16,6 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,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 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
index 172f7bfd4f73f22d0274715d5bda8c8279812e99..8b396a289072d406ac6548b5fb575d89f71f953c 100644 (file)
@@ -16,6 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,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 vfio-pci,host=03:07.1,id=hostdev0,bus=pci.0,addr=0x3 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
index f36fe39bbf8e35edf94bdc2579d8412445c8f8a0..fe898fa9a4f6f78c202ca7874048a548e2b0dd82 100644 (file)
@@ -16,6 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,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 pci-assign,host=03:07.1,id=hostdev0,bus=pci.0,addr=0x3 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
index 3708d2db0a0e73f404278da46a3d445345595e56..a22767273757567f3fc5aa68c3d9143147208e53 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 \
 -net socket,mcast=192.0.0.1:5558,vlan=0 \
 -serial none \
index f2b184029acaa07845682a562374908b08c344a1..b2833c0fed8bb6b669fbe798700ac4f10d77ed1b 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 \
 -net socket,listen=192.168.0.1:5558,vlan=0 \
 -serial none \
index 835658605daa22757dd3ec5ccbe03b41fe6a21da..4e67f38f26e6a77f76ac1d2c84dc466b0795d872 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 \
 -net socket,udp=192.168.10.1:5555,localaddr=192.168.10.1:5556,vlan=0 \
 -serial none \
index 27670c0cb02c93330672486fae88263baf5b2da6..a92d81892a99c9c83a60e8ad79dc82a69c338252 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 \
 -net user,vlan=0 \
 -serial none \
index 5b5002eec5bfc17adbe65c646ce3d86dfb3b66ff..d5abfc60091926d1032f220cf3e8173429566401 100644 (file)
@@ -15,7 +15,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev socket,id=charnet0,path=/tmp/vhost0.sock,server \
 -netdev type=vhost-user,id=hostnet0,chardev=charnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,\
index 0239c697ae8db18b85e6f5ee290b9210bf37429d..eaadea6eac05ac0dc4f7907c0a48310596048bcf 100644 (file)
@@ -15,7 +15,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev socket,id=charnet0,path=/tmp/vhost0.sock,server \
 -netdev type=vhost-user,id=hostnet0,chardev=charnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,\
index dd381c49fa9ae97eb9435a5e50e20c66eff0d9f7..19d8d73eb96154de633d68289436a30259b41c72 100644 (file)
@@ -16,7 +16,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,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 virtio-net-pci,tx=bh,vlan=0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,\
 addr=0x3 \
 -net user,vlan=0,name=hostnet0 \
index b746a1ccf0d7486ab77ee1b1274e17959d6a8eab..1b7b1f51d2abf5cb37b1024bf342f0d30ac8061b 100644 (file)
@@ -16,7 +16,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest7 \
+-drive file=/dev/HostVG/QEMUGuest7,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 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,guest_tso6=off,\
 guest_ecn=off,guest_ufo=off,vlan=0,id=net0,mac=00:22:44:66:88:aa,bus=pci.0,\
index cf41a54ffa998979fe761efcca7944245c40378b..6ba80c2d428cbb8f5efe03e4b9917e53fc220a56 100644 (file)
@@ -16,7 +16,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,\
 addr=0x3 \
index 4227b3b7d2a346b3b709339cb3f8eb0cb3f556aa..53afdfcf3a4664927bec2ab2bea36a2e1def8c32 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net nic,macaddr=00:11:22:33:44:55,vlan=0,model=virtio \
 -net user,vlan=0 \
 -serial none \
index da6ad0e4f1fedf1b72ffe0b8970b132d27492a04..dd0c2f6c11d8cab6be70bb062a2c2bf045b65e2e 100644 (file)
@@ -18,5 +18,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/hda1 \
+-drive file=/dev/hda1,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 virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
index 07eeee0c189014503264e80e3f955789e81306fb..b9963bcaa6748b4ed3061d755593219e5ee71d51 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index a1242085c69c27b9ac9685cdcd4b07147abd6c9d..96829ad752dd10cf19280a414b0a9fd77f8adf7d 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index c672c4c6949c21777bdecb084cded7f792571bb5..4bb1fd49f44953084d68dfa6def25bd12f2adf32 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index c92fb84bf6de8ea899c694c75ae21cdbf7c6d3a4..18cd862648a71696b4839e599bb0809eb59cf0f8 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index c92fb84bf6de8ea899c694c75ae21cdbf7c6d3a4..18cd862648a71696b4839e599bb0809eb59cf0f8 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index c92fb84bf6de8ea899c694c75ae21cdbf7c6d3a4..18cd862648a71696b4839e599bb0809eb59cf0f8 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index c92fb84bf6de8ea899c694c75ae21cdbf7c6d3a4..18cd862648a71696b4839e599bb0809eb59cf0f8 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index c92fb84bf6de8ea899c694c75ae21cdbf7c6d3a4..18cd862648a71696b4839e599bb0809eb59cf0f8 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index c92fb84bf6de8ea899c694c75ae21cdbf7c6d3a4..18cd862648a71696b4839e599bb0809eb59cf0f8 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index c92fb84bf6de8ea899c694c75ae21cdbf7c6d3a4..18cd862648a71696b4839e599bb0809eb59cf0f8 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index ba381e8add7c2ac1191e24d083a640f5183b2982..eb4af113ba732be650836a31d8709f73cf3648af 100644 (file)
@@ -16,6 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,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 virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -device pvpanic
index 44c5b7024d8a1b2d4c579a60c1e29f63ec99e393..b3ea3dfc85205e61a4c8e634a47a3d22f43906d1 100644 (file)
@@ -16,6 +16,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,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 virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -device pvpanic,ioport=1285
index fb9aa159dc5bf8e8c23ca09c9e3e6e8ad237d710..acaf86a14197361821799f362fc751baf1679a18 100644 (file)
@@ -17,7 +17,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -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
index 6910d0670411a21084db3acc57a6092075cc4f3e..806bfbf52f374832143bdb8e5a4640bc10487392 100644 (file)
@@ -17,7 +17,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -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
index 1aed6fc1b5faea49b7fae88b605e4185fd3bd164..0546feddc9c75ea93f5fbab9ce5f1c2222c58508 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel tcp:127.0.0.1:9999,server,nowait
index 4db7c7adb40722a09b2b2413b70f5aacccbb8c58..3cf45464b9baa19b4ff8e08aa9d09ab4b9ff37d8 100644 (file)
@@ -21,5 +21,6 @@ QEMU_AUDIO_DRV=none \
 -device pci-bridge,chassis_nr=6,id=pci.6,bus=pci.0,addr=0x8 \
 -device pci-bridge,chassis_nr=7,id=pci.7,bus=pci.0,addr=0x9 \
 -usb \
--cdrom /var/iso/f18kde.iso \
+-drive file=/var/iso/f18kde.iso,if=none,media=cdrom,id=drive-ide0-1-0 \
+-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.7,addr=0x6
index 8f24221bda031a44af400ec595efb4142c1447e8..7b23f0a7f9cf4e00226688a6d7c51b5f56eaeac0 100644 (file)
@@ -22,5 +22,6 @@ QEMU_AUDIO_DRV=none \
 -device pci-bridge,chassis_nr=6,id=pci.6,bus=pci.0,addr=0x9 \
 -device pci-bridge,chassis_nr=7,id=pci.7,bus=pci.0,addr=0xa \
 -usb \
--cdrom /var/iso/f18kde.iso \
+-drive file=/var/iso/f18kde.iso,if=none,media=cdrom,id=drive-ide0-1-0 \
+-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.4,addr=0x6
index 732403d2caa7cc2bbf08ef555afaa03b073b921c..c5d67d2b7a582710c7ef1ab55fb81ddd30d0c77b 100644 (file)
@@ -16,7 +16,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest2 \
+-drive file=/dev/HostVG/QEMUGuest2,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 virtio-net-pci,vlan=0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x3,\
 rombar=1 \
 -net user,vlan=0,name=hostnet0 \
index 273f72c9bb814f4cbdb433e34a9e83fb6479fc8e..8b112b77dc042a7b2abc3dbaf755b4db95c311de 100644 (file)
@@ -17,7 +17,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -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
index 2fa8e3839b66f31c51e5747978236f2226554418..ee62fcf73c8eaa026d8c37fde3bcd1b6e0a366fb 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index a208c80d953ac44d544645b9ac17c3ce4cce6e59..64b13e017812eea565d1cb5ea7786300c611257c 100644 (file)
@@ -16,7 +16,7 @@ BAR='' \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index 7cd88641a15fa9deb7270e9f2fb60944abbb420a..a667f0f1c6c66ab62b8087d76c2985a7088c9752 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index 8778d5c56a7bfe2e1e78db84bf0631324e48a0e5..2c53a4b5111869a453508ef2bb2b081f9d75125d 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index 1d5de0035783eab81bc14b694e6f968c9c6ef124..17205922d66eda9fc7cd6684d11bc82a0aa18f02 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index ffb6c3ace45a0896c4e8583f1883e3be74ad2c35..903d23e2d42e0c36a6d9fef924a92bcb8e4c079d 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index ffb6c3ace45a0896c4e8583f1883e3be74ad2c35..903d23e2d42e0c36a6d9fef924a92bcb8e4c079d 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index ffb6c3ace45a0896c4e8583f1883e3be74ad2c35..903d23e2d42e0c36a6d9fef924a92bcb8e4c079d 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index df3e9e09e34872e1252739183b6c2e2fc9106c05..7c8123a8f8a8a555dc0041375cda08c41335a13e 100644 (file)
@@ -15,8 +15,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
--hdb /dev/HostVG/QEMUGuest2 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index ffb6c3ace45a0896c4e8583f1883e3be74ad2c35..903d23e2d42e0c36a6d9fef924a92bcb8e4c079d 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index ffb6c3ace45a0896c4e8583f1883e3be74ad2c35..903d23e2d42e0c36a6d9fef924a92bcb8e4c079d 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index ffb6c3ace45a0896c4e8583f1883e3be74ad2c35..903d23e2d42e0c36a6d9fef924a92bcb8e4c079d 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index ffb6c3ace45a0896c4e8583f1883e3be74ad2c35..903d23e2d42e0c36a6d9fef924a92bcb8e4c079d 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index ffb6c3ace45a0896c4e8583f1883e3be74ad2c35..903d23e2d42e0c36a6d9fef924a92bcb8e4c079d 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index ffb6c3ace45a0896c4e8583f1883e3be74ad2c35..903d23e2d42e0c36a6d9fef924a92bcb8e4c079d 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index a7ebe3fca48b293362498bd682954c25618bbfb7..6c6e21e9c7e39d953165421d502302649e836e28 100644 (file)
@@ -17,7 +17,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -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
index 8383c6e0f189b3774acc38184f4f6733e3394fb3..43aae530f86aa0365facb008a6724bdde8e08e51 100644 (file)
@@ -17,7 +17,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -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
index f34e75a06dbc4a0cc3a010d9a7326d56fccbd073..26d6361d02df73c82f8554776760712a0bd6aace 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial /dev/ttyS2 \
 -parallel none
index 33830a9c1d3d022b87801119cd523d7aeae71170..e6efc3b9abd55d0dcc322197f253ec18c16ba4fd 100644 (file)
@@ -17,7 +17,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev file,id=charserial0,path=/tmp/serial.log \
 -device isa-serial,chardev=charserial0,id=serial0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
index bc1b2f6344faf3e0c8af574c6cca6fd6bc4dc8c1..bce0d1467b30901e27c11b2ea81f84b074b84e79 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial file:/tmp/serial.log \
 -parallel none
index 99e1eceeba9de323104fabfc6af9255368a9363b..2c8d6456984b18a6968a8b706be98e2b0d1743fd 100644 (file)
@@ -17,7 +17,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0 \
 -chardev file,id=charserial1,path=/tmp/serial.log \
index ef29c3b3a52975f6b8e05e10425d5b2b4d3a006e..555c01de7e7512194e506ed890d8c77f453686a7 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial pty \
 -serial file:/tmp/serial.log \
index a849c3f6e025e9cbc481785f79185eba811545bc..931959709d2d4dacf861a6634f4fa0e90e464890 100644 (file)
@@ -17,7 +17,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
index 9fa4cb834dff4242494cf6e01f367c4170882547..6aec302e508b56831c027b6a75992e3b5f76ee26 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial pty \
 -parallel none
index ffb6c3ace45a0896c4e8583f1883e3be74ad2c35..903d23e2d42e0c36a6d9fef924a92bcb8e4c079d 100644 (file)
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index b65acf687bffba7bcde02b98bce8e8fcbf1ca54b..230aec1d534d0fb340559c2c628ad21051f40ae7 100644 (file)
@@ -16,7 +16,8 @@ QEMU_AUDIO_DRV=spice \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev spiceport,id=charserial0,name=org.qemu.console.serial.0 \
 -device isa-serial,chardev=charserial0,id=serial0 \
 -device usb-tablet,id=input0 \
index dcb04b23a32a7ef65870b783591389b5695cb2a0..b0e487a674b0d67f2679ae90089613e7a196e2d4 100644 (file)
@@ -17,7 +17,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -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
index ab1a87b1a22053c38a1a27b4f912fdbf72ec207a..e3e29eb26a93beb7a27c71991a8688b47478da7c 100644 (file)
@@ -17,7 +17,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -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
index 3c751d7e799832d8d3794df1965347a1ae96c18b..a2bd2cd97e11db8676f1588a7ed4fa9b68816dc8 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial telnet:127.0.0.1:9999,server,nowait \
 -parallel none
index 75ed31d254a71d78e84c3b487694ba622728c044..061579cff23a56bc6d3cc9607e51e9ef6882b953 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial tcp:127.0.0.1:9999 \
 -parallel none
index 75ce9122a28774960b6d28a45b1ecb018f8cb226..6633e455f40450fcd6776c5ff6dea21f625d165f 100644 (file)
@@ -17,7 +17,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -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 \
index df355c7ea6a2dfabe70cf46d94017700bc2414de..382d878dcf743ef45461c97621777ed2b340c7f4 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial udp:127.0.0.1:9998@127.0.0.1:9999 \
 -serial udp::9999@:0 \
index d1cb5433b26e0adc69a69a2d25b256249cfb0fbf..cacf588fc1e115bb10e5e9bc9c9211c77a51cf1c 100644 (file)
@@ -17,7 +17,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev socket,id=charserial0,path=/tmp/serial.sock \
 -device isa-serial,chardev=charserial0,id=serial0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
index 7ea3e6a2ae25ac2f8d24a4327da3f8fea1dffbe6..f4be86b9cc287bf4e6aff9082e8c04be912c2e7b 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial unix:/tmp/serial.sock \
 -parallel none
index 6dbca3ee277a8875dc4bb8ac68e588886fa42405..067117367ddc1e547918213cc942d0e03a060b17 100644 (file)
@@ -17,7 +17,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -chardev vc,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
index 324df17756bbc41611b45ff8e897ca1a98b73c4f..5ec3a0550d00a00a27ac3fb7d191a660678f65af 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial vc \
 -parallel none
index 5c5d9c101149f2b4098d08cd6732edf66739b32c..82d8b9453daf188c44f5c6d47d10d4a73b9565f7 100644 (file)
@@ -20,7 +20,7 @@ serial=CZC1065993,asset=CZC1065993,location=Upside down' \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 2c849c002f3827eb42afbcec1d337bb7291e0aa4..b185b3106377276e0a03b5bb0e5c11ac3d57ab0c 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none
index 0bf0fd4e7bd90cec4ad95b3c7786dab12e7ecf40..eac69541e5cfdcb57e766155e407bbcb9e06a250 100644 (file)
@@ -16,7 +16,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -soundhw pcspk \
 -device ES1370,id=sound1,bus=pci.0,addr=0x3 \
 -device sb16,id=sound2 \
index b5ce69c427f8e5c1c9f93ca9f7313afa60e27072..f9ffd6eef179ce2f83a3083ca1767e487fd2f65a 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index d62ef95d4716d7154e8f07c4e2a8a443ea96593b..8d7289d354db6640f602e04c00645c88c4bee215 100644 (file)
@@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /var/lib/libvirt/images/QEMUGuest1 \
+-drive file=/var/lib/libvirt/images/QEMUGuest1,if=none,id=drive-ide0-0-0,\
+cache=off \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -vnc 127.0.0.1:-5900 \
 -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,\
 addr=0x3 \
index e0642e6a864a33a5112a67f2d52ecc73ae903907..c32f732ae0957c4ab733bfc4b3c71569d574c01a 100644 (file)
@@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /var/lib/libvirt/images/QEMUGuest1 \
+-drive file=/var/lib/libvirt/images/QEMUGuest1,if=none,id=drive-ide0-0-0,\
+cache=off \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -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
index 6250cb5a417171d745e05e1396334acd3f1179fd..6ea5b2b058b954edfecb73ac40ef2e03fba26408 100644 (file)
@@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /var/lib/libvirt/images/QEMUGuest1 \
+-drive file=/var/lib/libvirt/images/QEMUGuest1,if=none,id=drive-ide0-0-0,\
+cache=off \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -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
index 14df37ae9d30c9583d73ca0ec084f13592c50ace..1becac93b16262347b415df42e2a31bdd79c0cf1 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /var/lib/libvirt/images/QEMUGuest1 \
+-drive file=/var/lib/libvirt/images/QEMUGuest1,if=ide,bus=0,unit=0,cache=off \
 -net none \
 -serial none \
 -parallel none \
index 3dd55bce896c8b2910893b308e6bdb36f0382581..90bf011e921f3a6270b7c8cd07eef5d486e9e10f 100644 (file)
@@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /var/lib/libvirt/images/QEMUGuest1 \
+-drive file=/var/lib/libvirt/images/QEMUGuest1,if=none,id=drive-ide0-0-0,\
+cache=off \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -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,\
index 388c346560a29a4247e2da76bb53220b3f3c78a0..22de9decbf46573385408e72c4bed2a37f50cf95 100644 (file)
@@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /var/lib/libvirt/images/QEMUGuest1 \
+-drive file=/var/lib/libvirt/images/QEMUGuest1,if=none,id=drive-ide0-0-0,\
+cache=off \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -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 \
index 0c343939b4895ffa218348070f4712007a04c43e..280d84dc61b8335fa71dd3815f5aaacfbd40d1e8 100644 (file)
@@ -15,6 +15,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /var/lib/libvirt/images/QEMUGuest1 \
+-drive file=/var/lib/libvirt/images/QEMUGuest1,if=none,id=drive-ide0-0-0,\
+cache=off \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device VGA,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
index 58a2107d45ef968ce9f2eac8c11035ceab57143a..2daa0020260862a7922652999da886f68e08978e 100644 (file)
@@ -15,6 +15,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /var/lib/libvirt/images/QEMUGuest1 \
+-drive file=/var/lib/libvirt/images/QEMUGuest1,if=none,id=drive-ide0-0-0,\
+cache=off \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device VGA,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
index c0f92740c25c1769a1e7930fd0b2be9addb2161e..95324beaca75bf85c6d724e9e97b0a4c0964bba3 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /var/lib/libvirt/images/QEMUGuest1 \
+-drive file=/var/lib/libvirt/images/QEMUGuest1,if=ide,bus=0,unit=0,cache=off \
 -net none \
 -serial none \
 -parallel none \
index 6c74805b738d7f4cbffdafd9882137ba5cb430ac..c55c7bbcc11f757553626159644a709ff65c474f 100644 (file)
@@ -16,7 +16,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,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 ib700,id=watchdog0 \
 -watchdog-action poweroff \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
index 740fc58d5efcea6d77ad5816710107153436e4de..85f6ea54ed2217d038a7f6ae0db0bb4f6da79376 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index 8184206aefe1c35cab40e5cdabc5995c5deab13f..44bdab2ec4c757fd61f5119bc048d084d58f81a1 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index 277195d3d8e8438aeba85f9aae7a9182648ecfe0..5edbee28338bc7ba9c23b1e6289211f93c5eed48 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none \
index 3842bc68b69bf659e4dbce1292eed3ebf7243039..8f2a749404d3a187391fe8ebd365dfad3b11d591 100644 (file)
@@ -611,44 +611,44 @@ mymain(void)
     DO_TEST("boot-floppy-q35",
             QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_ICH9_AHCI);
+            QEMU_CAPS_ICH9_AHCI);
     DO_TEST("bootindex-floppy-q35",
             QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_BOOT_MENU,
+            QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_BOOT_MENU,
             QEMU_CAPS_BOOTINDEX);
     DO_TEST("boot-multi", QEMU_CAPS_BOOT_MENU);
     DO_TEST("boot-menu-enable",
-            QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE);
+            QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE);
     DO_TEST("boot-menu-enable",
-            QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
+            QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE,
             QEMU_CAPS_BOOTINDEX);
     DO_TEST("boot-menu-enable-with-timeout",
             QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_SPLASH_TIMEOUT);
+            QEMU_CAPS_SPLASH_TIMEOUT);
     DO_TEST_FAILURE("boot-menu-enable-with-timeout", QEMU_CAPS_BOOT_MENU);
     DO_TEST_PARSE_ERROR("boot-menu-enable-with-timeout-invalid", NONE);
     DO_TEST("boot-menu-disable", QEMU_CAPS_BOOT_MENU);
     DO_TEST("boot-menu-disable-drive",
-            QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE);
+            QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE);
     DO_TEST("boot-menu-disable-drive-bootindex",
-            QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
+            QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE,
             QEMU_CAPS_BOOTINDEX);
     DO_TEST_PARSE_ERROR("boot-dev+order",
-            QEMU_CAPS_BOOTINDEX, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE,
+            QEMU_CAPS_BOOTINDEX, QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
     DO_TEST("boot-order",
-            QEMU_CAPS_BOOTINDEX, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE,
+            QEMU_CAPS_BOOTINDEX, QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
     DO_TEST("boot-complex",
-            QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE_BOOT,
             QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
     DO_TEST("boot-complex-bootindex",
-            QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE_BOOT,
             QEMU_CAPS_BOOTINDEX,
             QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
     DO_TEST("boot-strict",
-            QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE_BOOT,
             QEMU_CAPS_BOOTINDEX, QEMU_CAPS_BOOT_STRICT,
             QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
 
@@ -657,9 +657,9 @@ mymain(void)
     DO_TEST_FAILURE("reboot-timeout-enabled", NONE);
 
     DO_TEST("bios", QEMU_CAPS_DEVICE, QEMU_CAPS_SGA);
-    DO_TEST("bios-nvram", QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
+    DO_TEST("bios-nvram", QEMU_CAPS_DEVICE,
             QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_READONLY);
-    DO_TEST("clock-utc", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE);
+    DO_TEST("clock-utc", QEMU_CAPS_NODEFCONFIG);
     DO_TEST("clock-localtime", NONE);
     DO_TEST("clock-localtime-basis-localtime", QEMU_CAPS_RTC);
     DO_TEST("clock-variable", QEMU_CAPS_RTC);
@@ -674,7 +674,7 @@ mymain(void)
 
     DO_TEST("cpu-eoi-disabled", QEMU_CAPS_ENABLE_KVM);
     DO_TEST("cpu-eoi-enabled", QEMU_CAPS_ENABLE_KVM);
-    DO_TEST("controller-order", QEMU_CAPS_DRIVE, QEMU_CAPS_PCIDEVICE,
+    DO_TEST("controller-order", QEMU_CAPS_PCIDEVICE,
             QEMU_CAPS_KVM, QEMU_CAPS_DEVICE, QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_BOOT_MENU, QEMU_CAPS_PIIX3_USB_UHCI,
             QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DRIVE_AIO,
@@ -698,7 +698,7 @@ mymain(void)
     DO_TEST("hugepages", QEMU_CAPS_MEM_PATH);
     DO_TEST("hugepages-numa", QEMU_CAPS_RTC, QEMU_CAPS_NO_KVM_PIT,
             QEMU_CAPS_DISABLE_S3, QEMU_CAPS_DISABLE_S4,
-            QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DRIVE,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_PCI_MULTIFUNCTION,
             QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC,
             QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
@@ -723,213 +723,204 @@ mymain(void)
     DO_TEST("nosharepages", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MEM_MERGE);
     DO_TEST("disk-cdrom", NONE);
     DO_TEST("disk-iscsi", NONE);
-    DO_TEST("disk-cdrom-network-http", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE,
-            QEMU_CAPS_DRIVE);
-    DO_TEST("disk-cdrom-network-https", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE,
-            QEMU_CAPS_DRIVE);
-    DO_TEST("disk-cdrom-network-ftp", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE,
-            QEMU_CAPS_DRIVE);
-    DO_TEST("disk-cdrom-network-ftps", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE,
-            QEMU_CAPS_DRIVE);
-    DO_TEST("disk-cdrom-network-tftp", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE,
-            QEMU_CAPS_DRIVE);
-    DO_TEST("disk-cdrom-empty", QEMU_CAPS_DRIVE);
+    DO_TEST("disk-cdrom-network-http", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE);
+    DO_TEST("disk-cdrom-network-https", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE);
+    DO_TEST("disk-cdrom-network-ftp", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE);
+    DO_TEST("disk-cdrom-network-ftps", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE);
+    DO_TEST("disk-cdrom-network-tftp", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE);
+    DO_TEST("disk-cdrom-empty", NONE);
     DO_TEST("disk-cdrom-tray",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_TX_ALG);
+            QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_TX_ALG);
     DO_TEST("disk-cdrom-tray-no-device-cap", NONE);
     DO_TEST("disk-floppy", NONE);
-    DO_TEST_FAILURE("disk-floppy-pseries", QEMU_CAPS_DRIVE);
+    DO_TEST_FAILURE("disk-floppy-pseries", NONE);
     DO_TEST("disk-floppy-tray-no-device-cap", NONE);
     DO_TEST("disk-floppy-tray",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE);
-    DO_TEST("disk-virtio-s390", QEMU_CAPS_DRIVE,
+            QEMU_CAPS_DEVICE);
+    DO_TEST("disk-virtio-s390",
             QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_S390);
     DO_TEST("disk-many", NONE);
-    DO_TEST("disk-virtio", QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT);
-    DO_TEST("disk-virtio-ccw", QEMU_CAPS_DRIVE,
+    DO_TEST("disk-virtio", QEMU_CAPS_DRIVE_BOOT);
+    DO_TEST("disk-virtio-ccw",
             QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
-    DO_TEST("disk-virtio-ccw-many", QEMU_CAPS_DRIVE,
+    DO_TEST("disk-virtio-ccw-many",
             QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
-    DO_TEST("disk-virtio-scsi-ccw", QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_SCSI,
+    DO_TEST("disk-virtio-scsi-ccw", QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
     DO_TEST("disk-order",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE_BOOT,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE_BOOT,
             QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
-    DO_TEST("disk-xenvbd", QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT);
+    DO_TEST("disk-xenvbd", QEMU_CAPS_DRIVE_BOOT);
     DO_TEST("disk-drive-boot-disk",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT);
+            QEMU_CAPS_DRIVE_BOOT);
     DO_TEST("disk-drive-boot-cdrom",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT);
+            QEMU_CAPS_DRIVE_BOOT);
     DO_TEST("floppy-drive-fat",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-fat",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-readonly-disk",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_READONLY,
+            QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
     DO_TEST("disk-drive-readonly-no-device",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_NODEFCONFIG);
     DO_TEST("disk-drive-fmt-qcow",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-shared",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL);
+            QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL);
     DO_TEST("disk-drive-cache-v1-wt",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-cache-v1-wb",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-cache-v1-none",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-error-policy-stop",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-error-policy-enospace",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-error-policy-wreport-rignore",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-cache-v2-wt",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-cache-v2-wb",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-cache-v2-none",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-cache-directsync",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2,
+            QEMU_CAPS_DRIVE_CACHE_V2,
             QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC, QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-cache-unsafe",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2,
+            QEMU_CAPS_DRIVE_CACHE_V2,
             QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-copy-on-read",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2,
+            QEMU_CAPS_DRIVE_CACHE_V2,
             QEMU_CAPS_DRIVE_COPY_ON_READ, QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-network-nbd",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-network-nbd-export",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-network-nbd-ipv6",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-network-nbd-ipv6-export",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-network-nbd-unix",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-network-iscsi",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-network-iscsi-auth",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-network-iscsi-lun",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE_FORMAT,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE_FORMAT,
             QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_VIRTIO_BLK_SG_IO, QEMU_CAPS_SCSI_BLOCK);
     DO_TEST("disk-drive-network-gluster",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-network-rbd",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-network-sheepdog",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-network-rbd-auth",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-network-rbd-ipv6",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST_FAILURE("disk-drive-network-rbd-no-colon",
-                    QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
+                    QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-no-boot",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_BOOTINDEX);
+            QEMU_CAPS_DEVICE, QEMU_CAPS_BOOTINDEX);
     DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid",
-                    QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_SCSI);
+                    QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-usb",  NONE);
     DO_TEST("disk-usb-device",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_USB_STORAGE,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_USB_STORAGE,
             QEMU_CAPS_NODEFCONFIG);
     DO_TEST("disk-usb-device-removable",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_USB_STORAGE,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_USB_STORAGE,
             QEMU_CAPS_USB_STORAGE_REMOVABLE, QEMU_CAPS_NODEFCONFIG);
     DO_TEST_FAILURE("disk-usb-pci",
-                    QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE,
+                    QEMU_CAPS_DEVICE,
                     QEMU_CAPS_DEVICE_USB_STORAGE, QEMU_CAPS_NODEFCONFIG);
     DO_TEST("disk-scsi-device",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_SCSI_LSI);
     DO_TEST("disk-scsi-device-auto",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_SCSI_LSI);
     DO_TEST("disk-scsi-disk-split",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-scsi-disk-wwn",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_SCSI_DISK_WWN);
     DO_TEST("disk-scsi-disk-vpd",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_SCSI_DISK_WWN);
     DO_TEST_FAILURE("disk-scsi-disk-vpd-build-error",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_SCSI_DISK_WWN);
     DO_TEST("disk-scsi-vscsi",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
     DO_TEST("disk-scsi-virtio-scsi",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-virtio-scsi-num_queues",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-virtio-scsi-cmd_per_lun",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-virtio-scsi-max_sectors",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-virtio-scsi-ioeventfd",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_VIRTIO_IOEVENTFD, QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-scsi-megasas",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_SCSI_MEGASAS);
     DO_TEST("disk-sata-device",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE,
+            QEMU_CAPS_DEVICE,
             QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_ICH9_AHCI);
     DO_TEST("disk-aio",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_AIO,
+            QEMU_CAPS_DRIVE_AIO,
             QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-source-pool",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
     DO_TEST("disk-source-pool-mode",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
     DO_TEST("disk-ioeventfd",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_IOEVENTFD,
+            QEMU_CAPS_VIRTIO_IOEVENTFD,
             QEMU_CAPS_VIRTIO_TX_ALG, QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
     DO_TEST("disk-copy_on_read",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_COPY_ON_READ,
+            QEMU_CAPS_DRIVE_COPY_ON_READ,
             QEMU_CAPS_VIRTIO_TX_ALG, QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
     DO_TEST("disk-drive-discard",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_DISCARD,
+            QEMU_CAPS_DRIVE_DISCARD,
             QEMU_CAPS_DEVICE);
     DO_TEST("disk-snapshot",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT);
+            QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST_FAILURE("disk-same-targets",
-                    QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_SCSI_LSI,
+                    QEMU_CAPS_DEVICE, QEMU_CAPS_SCSI_LSI,
                     QEMU_CAPS_DEVICE_USB_STORAGE, QEMU_CAPS_NODEFCONFIG);
     DO_TEST("event_idx",
-            QEMU_CAPS_DRIVE,
             QEMU_CAPS_VIRTIO_BLK_EVENT_IDX,
             QEMU_CAPS_VIRTIO_NET_EVENT_IDX,
             QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
     DO_TEST("virtio-lun",
-            QEMU_CAPS_DRIVE,
             QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
     DO_TEST("disk-scsi-lun-passthrough",
-            QEMU_CAPS_DRIVE,
             QEMU_CAPS_DEVICE,
             QEMU_CAPS_SCSI_BLOCK, QEMU_CAPS_VIRTIO_BLK_SG_IO,
             QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-serial",
             QEMU_CAPS_KVM,
             QEMU_CAPS_DEVICE,
-            QEMU_CAPS_DRIVE,
             QEMU_CAPS_DRIVE_SERIAL);
 
     DO_TEST("graphics-vnc", QEMU_CAPS_VNC);
@@ -976,7 +967,7 @@ mymain(void)
             QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE,
             QEMU_CAPS_DEVICE_QXL);
     DO_TEST("graphics-spice-timeout",
-            QEMU_CAPS_KVM, QEMU_CAPS_DRIVE,
+            QEMU_CAPS_KVM,
             QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
             QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE,
             QEMU_CAPS_DEVICE_QXL_VGA);
@@ -1117,14 +1108,14 @@ mymain(void)
             QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
     DO_TEST("console-virtio-s390",
             QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390);
+            QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390);
     DO_TEST("console-virtio-ccw",
             QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_CCW,
+            QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_CCW,
             QEMU_CAPS_VIRTIO_S390);
     DO_TEST("console-sclp",
             QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_SCLP_S390);
+            QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_SCLP_S390);
     DO_TEST("channel-spicevmc",
             QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC);
@@ -1223,7 +1214,7 @@ mymain(void)
     DO_TEST("watchdog-injectnmi", NONE);
     DO_TEST("watchdog-diag288",
             QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390);
+            QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390);
     DO_TEST("balloon-device", QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
     DO_TEST("balloon-device-auto",
             QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
@@ -1239,7 +1230,7 @@ mymain(void)
             QEMU_CAPS_FSDEV_WRITEOUT);
     DO_TEST("fs9p-ccw",
             QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_FSDEV,
-            QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_DRIVE,
+            QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
 
     DO_TEST("hostdev-usb-address", NONE);
@@ -1284,10 +1275,9 @@ mymain(void)
     DO_TEST("iothreads-ids", QEMU_CAPS_OBJECT_IOTHREAD);
     DO_TEST("iothreads-ids-partial", QEMU_CAPS_OBJECT_IOTHREAD);
     DO_TEST_FAILURE("iothreads-nocap", NONE);
-    DO_TEST("iothreads-disk", QEMU_CAPS_OBJECT_IOTHREAD, QEMU_CAPS_DEVICE,
-            QEMU_CAPS_DRIVE);
+    DO_TEST("iothreads-disk", QEMU_CAPS_OBJECT_IOTHREAD, QEMU_CAPS_DEVICE);
     DO_TEST("iothreads-disk-virtio-ccw", QEMU_CAPS_OBJECT_IOTHREAD, QEMU_CAPS_DEVICE,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+            QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
 
     DO_TEST("cpu-topology1", QEMU_CAPS_SMP_TOPOLOGY);
     DO_TEST("cpu-topology2", QEMU_CAPS_SMP_TOPOLOGY);
@@ -1365,13 +1355,13 @@ mymain(void)
     DO_TEST("numad-auto-memory-vcpu-no-cpuset-and-placement", NONE);
     DO_TEST("numad-static-memory-auto-vcpu", NONE);
     DO_TEST("blkdeviotune", QEMU_CAPS_NAME, QEMU_CAPS_DEVICE,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_IOTUNE);
+            QEMU_CAPS_DRIVE_IOTUNE);
     DO_TEST("blkdeviotune-max", QEMU_CAPS_NAME, QEMU_CAPS_DEVICE,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_IOTUNE,
+            QEMU_CAPS_DRIVE_IOTUNE,
             QEMU_CAPS_DRIVE_IOTUNE_MAX);
 
     DO_TEST("multifunction-pci-device",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_SCSI_LSI);
 
     DO_TEST("monitor-json", QEMU_CAPS_DEVICE,
@@ -1395,19 +1385,19 @@ mymain(void)
 
     DO_TEST("pseries-basic",
             QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
-    DO_TEST("pseries-vio", QEMU_CAPS_DRIVE,
+    DO_TEST("pseries-vio",
             QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
-    DO_TEST("pseries-usb-default", QEMU_CAPS_DRIVE,
+    DO_TEST("pseries-usb-default",
             QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
             QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI,
             QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PCI_MULTIFUNCTION);
-    DO_TEST("pseries-usb-multi", QEMU_CAPS_DRIVE,
+    DO_TEST("pseries-usb-multi",
             QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
             QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI,
             QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PCI_MULTIFUNCTION);
-    DO_TEST("pseries-vio-user-assigned", QEMU_CAPS_DRIVE,
+    DO_TEST("pseries-vio-user-assigned",
             QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
-    DO_TEST_ERROR("pseries-vio-address-clash", QEMU_CAPS_DRIVE,
+    DO_TEST_ERROR("pseries-vio-address-clash",
             QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
     DO_TEST("pseries-nvram", QEMU_CAPS_DEVICE_NVRAM);
     DO_TEST("pseries-usb-kbd", QEMU_CAPS_PCI_OHCI,
@@ -1426,15 +1416,15 @@ mymain(void)
     DO_TEST_FAILURE("pseries-panic-address",
                     QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
     DO_TEST("disk-ide-drive-split",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_IDE_CD);
     DO_TEST("disk-ide-wwn",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_IDE_CD,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_IDE_CD,
             QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_IDE_DRIVE_WWN);
 
-    DO_TEST("disk-geometry", QEMU_CAPS_DRIVE);
+    DO_TEST("disk-geometry", NONE);
     DO_TEST("disk-blockio",
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_IDE_CD, QEMU_CAPS_BLOCKIO);
 
     DO_TEST("video-device-pciaddr-default",
@@ -1474,18 +1464,18 @@ mymain(void)
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_EGD);
     DO_TEST("virtio-rng-ccw",
             QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_CCW,
+            QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_CCW,
             QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_VIRTIO_RNG,
             QEMU_CAPS_OBJECT_RNG_RANDOM);
 
     DO_TEST("s390-allow-bogus-usb-none",
             QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390,
+            QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
 
     DO_TEST("s390-allow-bogus-usb-controller",
             QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390,
+            QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
 
     DO_TEST("ppc-dtb", QEMU_CAPS_KVM, QEMU_CAPS_DTB);
@@ -1505,9 +1495,9 @@ mymain(void)
     DO_TEST("pci-autoadd-addr", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE);
     DO_TEST("pci-autoadd-idx", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE);
     DO_TEST("pci-many",
-            QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_PCI_BRIDGE);
+            QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE);
     DO_TEST("pci-bridge-many-disks",
-            QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_PCI_BRIDGE);
+            QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE);
     DO_TEST("pcie-root",
             QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
@@ -1515,14 +1505,14 @@ mymain(void)
     DO_TEST("q35",
             QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_ICH9_AHCI,
+            QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL);
     DO_TEST("pcie-root-port",
             QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_IOH3420,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_ICH9_AHCI,
+            QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL);
 
@@ -1530,7 +1520,7 @@ mymain(void)
             QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_IOH3420,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_ICH9_AHCI,
+            QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL);
 
@@ -1539,7 +1529,7 @@ mymain(void)
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_IOH3420,
             QEMU_CAPS_DEVICE_X3130_UPSTREAM,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_ICH9_AHCI,
+            QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL);
     DO_TEST("pcie-switch-downstream-port",
@@ -1548,41 +1538,33 @@ mymain(void)
             QEMU_CAPS_DEVICE_IOH3420,
             QEMU_CAPS_DEVICE_X3130_UPSTREAM,
             QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_ICH9_AHCI,
+            QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL);
 
-    DO_TEST("hostdev-scsi-lsi", QEMU_CAPS_DRIVE,
-            QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
+    DO_TEST("hostdev-scsi-lsi", QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
             QEMU_CAPS_DEVICE_SCSI_GENERIC);
-    DO_TEST("hostdev-scsi-virtio-scsi", QEMU_CAPS_DRIVE,
-            QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
+    DO_TEST("hostdev-scsi-virtio-scsi", QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_DEVICE_SCSI_GENERIC);
-    DO_TEST("hostdev-scsi-readonly", QEMU_CAPS_DRIVE,
-            QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
+    DO_TEST("hostdev-scsi-readonly", QEMU_CAPS_DEVICE,
             QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_SCSI_GENERIC);
-    DO_TEST("hostdev-scsi-virtio-scsi", QEMU_CAPS_DRIVE,
-            QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
+    DO_TEST("hostdev-scsi-virtio-scsi", QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_DEVICE_SCSI_GENERIC,
             QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX);
-    DO_TEST("hostdev-scsi-lsi-iscsi", QEMU_CAPS_DRIVE,
-            QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
+    DO_TEST("hostdev-scsi-lsi-iscsi", QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
             QEMU_CAPS_DEVICE_SCSI_GENERIC);
-    DO_TEST("hostdev-scsi-lsi-iscsi-auth", QEMU_CAPS_DRIVE,
-            QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
+    DO_TEST("hostdev-scsi-lsi-iscsi-auth", QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
             QEMU_CAPS_DEVICE_SCSI_GENERIC);
-    DO_TEST("hostdev-scsi-virtio-iscsi", QEMU_CAPS_DRIVE,
-            QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
+    DO_TEST("hostdev-scsi-virtio-iscsi", QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_DEVICE_SCSI_GENERIC);
-    DO_TEST("hostdev-scsi-virtio-iscsi-auth", QEMU_CAPS_DRIVE,
-            QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
+    DO_TEST("hostdev-scsi-virtio-iscsi-auth", QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_DEVICE_SCSI_GENERIC);
 
@@ -1601,15 +1583,14 @@ mymain(void)
                         QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE);
 
     DO_TEST("hotplug-base",
-            QEMU_CAPS_KVM, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
-            QEMU_CAPS_VIRTIO_SCSI);
+            QEMU_CAPS_KVM, QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_SCSI);
 
     DO_TEST("pcihole64", QEMU_CAPS_DEVICE, QEMU_CAPS_I440FX_PCI_HOLE64_SIZE);
     DO_TEST_FAILURE("pcihole64-none", QEMU_CAPS_DEVICE);
     DO_TEST("pcihole64-q35",
             QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_ICH9_AHCI,
+            QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL,
             QEMU_CAPS_Q35_PCI_HOLE64_SIZE);
@@ -1617,56 +1598,55 @@ mymain(void)
     DO_TEST("arm-vexpressa9-nodevs",
             QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB);
     DO_TEST("arm-vexpressa9-basic",
-            QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
-            QEMU_CAPS_DRIVE);
+            QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB);
     DO_TEST("arm-vexpressa9-virtio",
             QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
+            QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
     DO_TEST("arm-virt-virtio",
             QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
+            QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
 
     DO_TEST("aarch64-virt-virtio",
             QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
+            QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
     DO_TEST("aarch64-mmio-default-pci",
             QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
+            QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
             QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE);
     DO_TEST("aarch64-virtio-pci",
             QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
+            QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
             QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("aarch64-aavmf-virtio-mmio",
             QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
+            QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
     DO_TEST("aarch64-virt-default-nic",
             QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_VIRTIO_MMIO);
-    DO_TEST("aarch64-cpu-passthrough", QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
+    DO_TEST("aarch64-cpu-passthrough", QEMU_CAPS_DEVICE,
             QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_CPU_HOST, QEMU_CAPS_KVM);
-    DO_TEST("aarch64-gic", QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
+    DO_TEST("aarch64-gic", QEMU_CAPS_DEVICE,
             QEMU_CAPS_KVM);
-    DO_TEST("aarch64-gicv3", QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
+    DO_TEST("aarch64-gicv3", QEMU_CAPS_DEVICE,
             QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT,
             QEMU_CAPS_MACH_VIRT_GIC_VERSION);
-    DO_TEST_FAILURE("aarch64-gicv3", QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
+    DO_TEST_FAILURE("aarch64-gicv3", QEMU_CAPS_DEVICE,
             QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT);
 
     driver.caps->host.cpu->arch = VIR_ARCH_AARCH64;
-    DO_TEST("aarch64-kvm-32-on-64", QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
+    DO_TEST("aarch64-kvm-32-on-64", QEMU_CAPS_DEVICE,
             QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST, QEMU_CAPS_CPU_AARCH64_OFF);
-    DO_TEST_FAILURE("aarch64-kvm-32-on-64", QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
+    DO_TEST_FAILURE("aarch64-kvm-32-on-64", QEMU_CAPS_DEVICE,
             QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST);
     driver.caps->host.cpu->arch = cpuDefault->arch;
@@ -1706,83 +1686,83 @@ mymain(void)
 
     DO_TEST("machine-aeskeywrap-on-caps",
             QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_AES_KEY_WRAP,
-            QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_DRIVE,
+            QEMU_CAPS_DEA_KEY_WRAP,
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
     DO_TEST_FAILURE("machine-aeskeywrap-on-caps", QEMU_CAPS_MACHINE_OPT,
-                    QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
+                    QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
                     QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
     DO_TEST_FAILURE("machine-aeskeywrap-on-caps", NONE);
 
     DO_TEST("machine-aeskeywrap-on-cap",
             QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_AES_KEY_WRAP,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
+            QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
     DO_TEST_FAILURE("machine-aeskeywrap-on-cap", QEMU_CAPS_MACHINE_OPT,
-                    QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
+                    QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
                     QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
     DO_TEST_FAILURE("machine-aeskeywrap-on-cap", NONE);
 
     DO_TEST("machine-aeskeywrap-off-caps",
             QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
+            QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
     DO_TEST_FAILURE("machine-aeskeywrap-off-caps", QEMU_CAPS_MACHINE_OPT,
-                    QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
+                    QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
                     QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
     DO_TEST_FAILURE("machine-aeskeywrap-off-caps", NONE);
 
     DO_TEST("machine-aeskeywrap-off-cap",
-            QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DRIVE,
+            QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_AES_KEY_WRAP,
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
     DO_TEST_FAILURE("machine-aeskeywrap-off-cap", QEMU_CAPS_MACHINE_OPT,
-                    QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
+                    QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
                     QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
     DO_TEST_FAILURE("machine-aeskeywrap-off-cap", NONE);
 
     DO_TEST("machine-deakeywrap-on-caps",
             QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
+            QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
-    DO_TEST_FAILURE("machine-deakeywrap-on-caps", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_DRIVE,
+    DO_TEST_FAILURE("machine-deakeywrap-on-caps", QEMU_CAPS_MACHINE_OPT,
                     QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
                     QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
     DO_TEST_FAILURE("machine-deakeywrap-on-caps", NONE);
 
     DO_TEST("machine-deakeywrap-on-cap",
-            QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_DRIVE,
+            QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_DEA_KEY_WRAP,
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
     DO_TEST_FAILURE("machine-deakeywrap-on-cap", QEMU_CAPS_MACHINE_OPT,
-                    QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
+                    QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
                     QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
     DO_TEST_FAILURE("machine-deakeywrap-on-cap", NONE);
 
     DO_TEST("machine-deakeywrap-off-caps",
             QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
+            QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
     DO_TEST_FAILURE("machine-deakeywrap-off-caps", QEMU_CAPS_MACHINE_OPT,
-                    QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
+                    QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
                     QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
     DO_TEST_FAILURE("machine-deakeywrap-off-caps", NONE);
 
     DO_TEST("machine-deakeywrap-off-cap",
-            QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_DRIVE,
+            QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_DEA_KEY_WRAP,
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
     DO_TEST_FAILURE("machine-deakeywrap-off-cap", QEMU_CAPS_MACHINE_OPT,
-                    QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
+                    QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
                     QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
     DO_TEST_FAILURE("machine-deakeywrap-off-cap", NONE);
 
     DO_TEST("machine-keywrap-none-caps",
             QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP,
-            QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
+            QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
             QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
     DO_TEST("machine-keywrap-none",
-            QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_SCSI,
+            QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
 
     qemuTestDriverFree(&driver);
index ab72e7d0fb5452d4637cf59a35d8102524840204..d77ecbb518cddae56e3dcfc1c5530b8aff1eac0f 100644 (file)
@@ -114,7 +114,6 @@ static const char testStatusXMLPrefix[] =
 "    <vcpu pid='3803519'/>\n"
 "  </vcpus>\n"
 "  <qemuCaps>\n"
-"    <flag name='drive'/>\n"
 "    <flag name='name'/>\n"
 "    <flag name='uuid'/>\n"
 "    <flag name='vnet-hdr'/>\n"
index 5284d379ef7a85c9a85120a0db63531d96e8ffc7..1f5f7d68ff39a66e823441d56351074dded5481a 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none ARGUMENT
index 5284d379ef7a85c9a85120a0db63531d96e8ffc7..1f5f7d68ff39a66e823441d56351074dded5481a 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none ARGUMENT
index 5284d379ef7a85c9a85120a0db63531d96e8ffc7..1f5f7d68ff39a66e823441d56351074dded5481a 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none ARGUMENT
index 5284d379ef7a85c9a85120a0db63531d96e8ffc7..1f5f7d68ff39a66e823441d56351074dded5481a 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none ARGUMENT
index 5284d379ef7a85c9a85120a0db63531d96e8ffc7..1f5f7d68ff39a66e823441d56351074dded5481a 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none ARGUMENT
index 5284d379ef7a85c9a85120a0db63531d96e8ffc7..1f5f7d68ff39a66e823441d56351074dded5481a 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none ARGUMENT
index ca1bd041d21a88e25759cdcf9686ef508bd59b44..2acb236eb434c473ba4d82b7ea207390e55b1a56 100644 (file)
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot c \
 -usb \
--hda /dev/HostVG/QEMUGuest1 \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
 -net none \
 -serial none \
 -parallel none