[libvirt] [PATCH] qemu: fix capability counting

Andrea Bolognani abologna at redhat.com
Thu Aug 4 15:49:23 UTC 2016


On Thu, 2016-08-04 at 17:13 +0200, Boris Fiuczynski wrote:
> Signed-off-by: Boris Fiuczynski <fiuczy at linux.vnet.ibm.com>
> ---
>  src/qemu/qemu_capabilities.c | 4 ++--
>  src/qemu/qemu_capabilities.h | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index 002fbe3..73d8536 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -335,9 +335,9 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
>                "qxl-vga.max_outputs",
>                "spice-unix",
>                "drive-detect-zeroes",
> +              "tls-creds-x509",
>  
> -              "tls-creds-x509", /* 230 */
> -              "display",
> +              "display", /* 230 */
>                "intel-iommu",
>      );
>  
> diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
> index 72e763a..2d0f910 100644
> --- a/src/qemu/qemu_capabilities.h
> +++ b/src/qemu/qemu_capabilities.h
> @@ -367,9 +367,9 @@ typedef enum {
>      QEMU_CAPS_QXL_VGA_MAX_OUTPUTS, /* -device qxl-vga,max-outputs= */
>      QEMU_CAPS_SPICE_UNIX, /* -spice unix */
>      QEMU_CAPS_DRIVE_DETECT_ZEROES, /* -drive detect-zeroes= */
> +    QEMU_CAPS_OBJECT_TLS_CREDS_X509, /* -object tls-creds-x509 */
>  
>      /* 230 */
> -    QEMU_CAPS_OBJECT_TLS_CREDS_X509, /* -object tls-creds-x509 */
>      QEMU_CAPS_DISPLAY, /* -display */
>      QEMU_CAPS_DEVICE_INTEL_IOMMU, /* -device intel-iommu */
>  

Good catch :)

Rebased on top of current master and pushed.

-- 
Andrea Bolognani / Red Hat / Virtualization




More information about the libvir-list mailing list