[libvirt] [PATCH 3/5] qemu: add QEMU_CAPS_MACHINE_VMPORT_OPT

[Martin Kletzander]

On Thu, Apr 02, 2015 at 07:02:33PM +0200, Marc-André Lureau wrote:
>vmport machine argument is only supported since qemu 2.2.0
>---
> src/qemu/qemu_capabilities.c | 6 ++++++
> src/qemu/qemu_capabilities.h | 1 +
> 2 files changed, 7 insertions(+)
>
>diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
>index ce6767c..8782613 100644
>--- a/src/qemu/qemu_capabilities.c
>+++ b/src/qemu/qemu_capabilities.c
>@@ -279,6 +279,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
>               "qxl.vgamem_mb",
>               "qxl-vga.vgamem_mb",
>               "pc-dimm",
>+
>+              "machine-vmport-opt", /* 185 */
>     );
>
>
>@@ -3239,6 +3241,10 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
>     if (qemuCaps->version >= 1003000)
>         virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT);
>
>+    /* vmport option is supported v2.2.0 onwards */
>+    if (qemuCaps->version >= 2002000)
>+        virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_VMPORT_OPT);
>+

Is this not exposed in any way in QEMU?  Do we really need to use this
(what we're trying to avoid)?

If there is not, please at least sort it based on the version being
tried (after the check for version >= 1006000).

>     /* WebSockets were introduced between 1.3.0 and 1.3.1 */
>     if (qemuCaps->version >= 1003001)
>         virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_WEBSOCKET);
>diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
>index c7b1ac7..48c8f96 100644
>--- a/src/qemu/qemu_capabilities.h
>+++ b/src/qemu/qemu_capabilities.h
>@@ -224,6 +224,7 @@ typedef enum {
>     QEMU_CAPS_QXL_VGAMEM         = 182, /* -device qxl.vgamem_mb */
>     QEMU_CAPS_QXL_VGA_VGAMEM     = 183, /* -device qxl-vga.vgamem_mb */
>     QEMU_CAPS_DEVICE_PC_DIMM     = 184, /* pc-dimm device */
>+    QEMU_CAPS_MACHINE_VMPORT_OPT = 185, /* -machine xxx,vmport=on/off/auto */
>
>     QEMU_CAPS_LAST,                   /* this must always be the last item */
> } virQEMUCapsFlags;
>--
>2.1.0
>
>--
>libvir-list mailing list
>libvir-list at redhat.com
>https://www.redhat.com/mailman/listinfo/libvir-list
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20150414/f4e12d97/attachment-0001.sig>