Re: [libvirt] [PATCH v6 4/6] qemu_cap: Add USB keyboard capability
On 2014年02月13日 20:37, Ján Tomko wrote:
On 02/13/2014 09:48 AM, Li Zhang wrote:
> From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com>
>
> QEMU can support USB keyboard but libvirt haven't supportted it yet.
> This patch is to add USB keyboard capabilities and test cases.
>
> Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com>
> ---
> src/qemu/qemu_capabilities.c | 3 +++
> src/qemu/qemu_capabilities.h | 1 +
> tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 +
> tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 +
> tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 +
> tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 +
> tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 +
> tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 +
> tests/qemuhelptest.c | 8 ++++++++
> 9 files changed, 18 insertions(+)
>
ACK
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index e7d953a..0433607 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -249,6 +249,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
> "enable-fips",
> "spice-file-xfer-disable",
> "spiceport",
> +
> + "usb-kbd", /*165*/
There should be spaces around the comment: /* 165 */
got it.
> );
>
> struct _virQEMUCaps {
> @@ -1403,6 +1405,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
> { "virtio-mmio", QEMU_CAPS_DEVICE_VIRTIO_MMIO },
> { "ich9-intel-hda", QEMU_CAPS_DEVICE_ICH9_INTEL_HDA },
> { "pvpanic", QEMU_CAPS_DEVICE_PANIC },
> + { "usb-kbd", QEMU_CAPS_DEVICE_USB_KBD },
> };
>
> static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBlk[] = {
> diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
> index a4eecb6..dbc4c9a 100644
> --- a/src/qemu/qemu_capabilities.h
> +++ b/src/qemu/qemu_capabilities.h
> @@ -203,6 +203,7 @@ enum virQEMUCapsFlags {
> QEMU_CAPS_ENABLE_FIPS = 162, /* -enable-fips */
> QEMU_CAPS_SPICE_FILE_XFER_DISABLE = 163, /* -spice disable-agent-file-xfer */
> QEMU_CAPS_CHARDEV_SPICEPORT = 164, /* -chardev spiceport */
> + QEMU_CAPS_DEVICE_USB_KBD = 165, /*-device usb-kbd*/
Same here.
>
> QEMU_CAPS_LAST, /* this must always be the last item */
> };
Jan