2 Commits

Author	SHA1	Message	Date
Vladislav Bogdanov	5c881f35c7	qemu: pass -usb and usb hubs earlier, so USB disks with static address are handled properly ... (cherry picked from commit 81af5336ac) Conflicts: src/qemu/qemu_command.c tests/qemuxml2argvdata/qemuxml2argv-bios.args tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args tests/qemuxml2argvdata/qemuxml2argv-cputune.args tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args tests/qemuxml2argvdata/qemuxml2argv-event_idx.args tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args tests/qemuxml2argvdata/qemuxml2argv-hyperv.args tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args tests/qemuxml2argvdata/qemuxml2argv-memtune.args tests/qemuxml2argvdata/qemuxml2argv-metadata.args tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args tests/qemuxml2argvdata/qemuxml2argv-minimal.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-uuid.args tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.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-reboot-timeout-disabled.args tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args tests/qemuxml2argvdata/qemuxml2argv-smbios.args tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args	2012-12-09 17:48:11 -05:00
Eric Blake	5a3ec56ba3	spicevmc: support older -device spicevmc of qemu 0.13.0 ... qemu 0.13.0 (at least as built for Fedora 14, and also backported to RHEL 6.0 qemu) supported an older syntax for a spicevmc channel; it's not as flexible (it has an implicit name and hides the chardev aspect), but now that we support spicevmc, we might as well target both variants. * src/qemu/qemu_capabilities.h (QEMUD_CMD_FLAG_DEVICE_SPICEVMC): New flag. * src/qemu/qemu_capabilities.c (qemuCapsParseDeviceStr): Set it correctly. * src/qemu/qemu_command.h (qemuBuildVirtioSerialPortDevStr): Drop declaration. * src/qemu/qemu_command.c (qemuBuildVirtioSerialPortDevStr): Alter signature, check flag. (qemuBuildCommandLine): Adjust caller and check flag. * tests/qemuhelptest.c (mymain): Update test. * tests/qemuxml2argvtest.c (mymain): New test. * tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.xml: New file. * tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args: Likewise.	2011-02-04 09:17:01 -07:00