Vladislav Bogdanov
5c881f35c7
qemu: pass -usb and usb hubs earlier, so USB disks with static address are handled properly
...
(cherry picked from commit 81af5336acf4c765ef1201e7762d003ae0b0011e)
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
Marc-André Lureau
fdd14a9d05
qemu: Don't append 0 at usb id, so that it is compatible with legacy -usb
...
QEMU uses USB bus name "usb.0" when using the legacy -usb argument.
If we want to allow USB devices to specify their addresses with legacy
-usb, we should either in case of legacy bus name drop the 0 from the
address bus, or just drop the 0 from device id. This patch does the
later.
Another solution would be to permit addressing on non-legacy USB
controllers only.
2011-09-02 23:39:03 +08:00
