On 01/03/2013 12:13 AM, Guannan Ren wrote:
> QEMU_CAPS_DEVICE_USB_NET /* -device usb-net */
> ---
> src/qemu/qemu_capabilities.c | 2 ++
> src/qemu/qemu_capabilities.h | 1 +
> tests/qemuhelptest.c | 21 ++++++++++++++-------
> 3 files changed, 17 insertions(+), 7 deletions(-)
>
> +++ b/src/qemu/qemu_capabilities.h
> @@ -162,6 +162,7 @@ enum qemuCapsFlags {
> QEMU_CAPS_DEVICE_VMWARE_SVGA = 122, /* -device vmware-svga */
> QEMU_CAPS_DEVICE_VIDEO_PRIMARY = 123, /* safe to use -device XXX
> for primary video device */
> + QEMU_CAPS_DEVICE_USB_NET = 124, /* -device usb-net */
Looks like you may be proposing conflicting caps here (you had another
series that put QEMU_CAPS_DEVICE_USB_SERIAL for -device usb-serial at
124); the conflict resolution is pretty straightforward, though.
ACK.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list