On Fri, Apr 12, 2013 at 01:56:31PM +0800, Li Zhang wrote: > On 2013年04月11日 17:30, Daniel P. Berrange wrote: > >On Sun, Apr 07, 2013 at 04:31:57PM +0800, Li Zhang wrote: > >>From: Li Zhang <zhlcindy@xxxxxxxxxxxxxxxxxx> > >> > >>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@xxxxxxxxxxxxxxxxxx> > >>--- > >> v4 -> v3: > >> * Add one new test case for USB option > >> * Rebase it with latest version > >> > >> v3 -> v2: > >> * Set QEMU_CAPS_MACHINE_USB_OPT with help string > >> > >> v2 -> v1: > >> * Rename QEMU_CAPS_USB_OPT to QEMU_CAPS_MACHINE_USB_OPT suggested by Daniel > >> * Corret QEMU version with v1.3.0 suggested by Daniel > >> > >> src/qemu/qemu_capabilities.c | 9 +++++++++ > >> src/qemu/qemu_capabilities.h | 1 + > >> src/qemu/qemu_command.c | 6 ++++++ > >> 3 files changed, 16 insertions(+) > >ACK > > Can anyone help push this patch by merging with > [PATCH v4 2/2] testcase: Add a new USB option test case > into one patch? I have done this now. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list