]> xenbits.xensource.com Git - libvirt.git/commitdiff
libxl: implement virConnectCompareCPU
authorJoao Martins <joao.m.martins@oracle.com>
Wed, 20 Jul 2016 19:08:48 +0000 (20:08 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Mon, 12 Sep 2016 10:49:03 +0000 (12:49 +0200)
Implement support for "virsh cpu-compare" so that we can calculate
common cpu element between a pool of hosts, which had a requirement
of providing host cpu description.

Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
src/libxl/libxl_driver.c

index 480fef92c0e67a30b0b836702dfcafa255cf2fe1..c614e34c8213185184a5b0b08c3c59d86d62593c 100644 (file)
@@ -62,6 +62,7 @@
 #include "network/bridge_driver.h"
 #include "locking/domain_lock.h"
 #include "virstats.h"
+#include "cpu/cpu.h"
 
 #define VIR_FROM_THIS VIR_FROM_LIBXL
 
@@ -6348,6 +6349,43 @@ libxlConnectGetDomainCapabilities(virConnectPtr conn,
 }
 
 
+static int
+libxlConnectCompareCPU(virConnectPtr conn,
+                       const char *xmlDesc,
+                       unsigned int flags)
+{
+    libxlDriverPrivatePtr driver = conn->privateData;
+    libxlDriverConfigPtr cfg;
+    int ret = VIR_CPU_COMPARE_ERROR;
+    bool failIncompatible;
+
+    virCheckFlags(VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE,
+                  VIR_CPU_COMPARE_ERROR);
+
+    if (virConnectCompareCPUEnsureACL(conn) < 0)
+        return ret;
+
+    failIncompatible = !!(flags & VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE);
+
+    cfg = libxlDriverConfigGet(driver);
+
+    if (!cfg->caps->host.cpu ||
+        !cfg->caps->host.cpu->model) {
+        if (failIncompatible) {
+            virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s",
+                           _("cannot get host CPU capabilities"));
+        } else {
+            VIR_WARN("cannot get host CPU capabilities");
+            ret = VIR_CPU_COMPARE_INCOMPATIBLE;
+        }
+    } else {
+        ret = cpuCompareXML(cfg->caps->host.cpu, xmlDesc, failIncompatible);
+    }
+
+    virObjectUnref(cfg);
+    return ret;
+}
+
 static virHypervisorDriver libxlHypervisorDriver = {
     .name = LIBXL_DRIVER_NAME,
     .connectOpen = libxlConnectOpen, /* 0.9.0 */
@@ -6452,6 +6490,7 @@ static virHypervisorDriver libxlHypervisorDriver = {
     .nodeGetSecurityModel = libxlNodeGetSecurityModel, /* 1.2.16 */
     .domainInterfaceAddresses = libxlDomainInterfaceAddresses, /* 1.3.5 */
     .connectGetDomainCapabilities = libxlConnectGetDomainCapabilities, /* 2.0.0 */
+    .connectCompareCPU = libxlConnectCompareCPU, /* 2.3.0 */
 };
 
 static virConnectDriver libxlConnectDriver = {