]> xenbits.xensource.com Git - libvirt.git/commit
Add USB option capability
authorLi Zhang <zhlcindy@linux.vnet.ibm.com>
Sun, 7 Apr 2013 08:31:57 +0000 (16:31 +0800)
committerDaniel P. Berrange <berrange@redhat.com>
Fri, 12 Apr 2013 09:56:03 +0000 (10:56 +0100)
commita6e37aedff54092fea63c429c25e8c3de38a1d2d
tree7ad70ed218395d7153969b251c8ccea9a06733b1
parent6528b7044fb0d921854ea916770b9f20173e1923
Add USB option capability

To avoid the collision for creating USB controllers in machine->init()
and -device xx command line, it needs to set usb=off to avoid one USB
controller created in machine->init(). So that libvirt can use -device
or -usb to create USB controller sucessfully.
So QEMU_CAPS_MACHINE_USB_OPT capability is added, and it is for QEMU
v1.3.0 onwards which supports USB option.

Signed-off-by: Li Zhang <zhlcindy@linux.vnet.ibm.com>
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
src/qemu/qemu_command.c
tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args [new file with mode: 0644]
tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.xml [new file with mode: 0644]
tests/qemuxml2argvtest.c