From d218a9c263190681aa8ee7f0ec5f3c298339d635 Mon Sep 17 00:00:00 2001 From: Jim Fehlig Date: Mon, 4 May 2020 14:51:32 -0600 Subject: [PATCH] libxl: Use the name 'Xen' in driver tables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The libxl driver declares its name as 'Xen' through the public virConnectGetType() API. In the virHypervisorDriver table the name is set to 'xenlight'. To add more confusion, the name is set to 'LIBXL' in the virStateDriver. For consistency, use the same name in the driver tables as reported in the public virConnectGetType() API. Signed-off-by: Jim Fehlig Reviewed-by: Daniel P. Berrangé --- src/libxl/libxl_conf.h | 1 + src/libxl/libxl_driver.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 07b3373170..11a922b10a 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -38,6 +38,7 @@ #include "libxl_capabilities.h" #include "libxl_logger.h" +#define LIBXL_DRIVER_EXTERNAL_NAME "Xen" #define LIBXL_DRIVER_NAME "xenlight" #define LIBXL_VNC_PORT_MIN 5900 #define LIBXL_VNC_PORT_MAX 65535 diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 980984b199..ebeb91af3c 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -911,7 +911,7 @@ libxlConnectGetType(virConnectPtr conn) if (virConnectGetTypeEnsureACL(conn) < 0) return NULL; - return "Xen"; + return LIBXL_DRIVER_EXTERNAL_NAME; } static int @@ -6608,7 +6608,7 @@ libxlDomainGetMetadata(virDomainPtr dom, } static virHypervisorDriver libxlHypervisorDriver = { - .name = LIBXL_DRIVER_NAME, + .name = LIBXL_DRIVER_EXTERNAL_NAME, .connectURIProbe = libxlConnectURIProbe, .connectOpen = libxlConnectOpen, /* 0.9.0 */ .connectClose = libxlConnectClose, /* 0.9.0 */ @@ -6732,7 +6732,7 @@ static virConnectDriver libxlConnectDriver = { }; static virStateDriver libxlStateDriver = { - .name = "LIBXL", + .name = LIBXL_DRIVER_EXTERNAL_NAME, .stateInitialize = libxlStateInitialize, .stateCleanup = libxlStateCleanup, .stateReload = libxlStateReload,