Init host cache info in drivers

Added only in drivers that were already calling
virCapabilitiesInitNUMA().  Instead of refactoring all the callers to
behave the same way in case of error, just follow what the callers are
doing for all the functions.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index e47b667f582a30c591bf08dda0aadb7510a7690a..508b98ba21b3c9549e932b3b601f9358aa0af4cd 100644 (file)
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -81,6 +81,9 @@ virCapsPtr virLXCDriverCapsInit(virLXCDriverPtr driver)
         VIR_WARN("Failed to query host NUMA topology, disabling NUMA capabilities");
     }
 
+    if (virCapabilitiesInitCaches(caps) < 0)
+        VIR_WARN("Failed to get host CPU cache info");
+
     /* Only probe for power management capabilities in the driver,
      * not in the emulator */
     if (driver && virNodeSuspendGetTargetMask(&caps->host.powerMgmt) < 0)

diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 196fefb8de19d1280c74de12373cc3d87cf3492a..23a02d749e8bd5a7719bec4a8e291fbd0304615f 100644 (file)
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -168,6 +168,9 @@ virCapsPtr openvzCapsInit(void)
     if (virCapabilitiesInitNUMA(caps) < 0)
         goto no_memory;
 
+    if (virCapabilitiesInitCaches(caps) < 0)
+        goto no_memory;
+
     if ((guest = virCapabilitiesAddGuest(caps,
                                          VIR_DOMAIN_OSTYPE_EXE,
                                          caps->host.arch,

diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index 2123784f70dacbb84d35569b277ca98667436e6d..0cc288f36d8e992c42d7183733718e790cf7f8d3 100644 (file)
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -340,6 +340,9 @@ phypCapsInit(void)
             ("Failed to query host NUMA topology, disabling NUMA capabilities");
     }
 
+    if (virCapabilitiesInitCaches(caps) < 0)
+        VIR_WARN("Failed to get host CPU cache info");
+
     if ((guest = virCapabilitiesAddGuest(caps,
                                          VIR_DOMAIN_OSTYPE_LINUX,
                                          caps->host.arch,

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 8bc3ea026078e2994de17a719d1182f160eb7b99..71951e6c82aeb84ec9d424cd5b21fa27cd6a83f9 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1123,6 +1123,9 @@ virCapsPtr virQEMUCapsInit(virQEMUCapsCachePtr cache)
         VIR_WARN("Failed to query host NUMA topology, disabling NUMA capabilities");
     }
 
+    if (virCapabilitiesInitCaches(caps) < 0)
+        VIR_WARN("Failed to get host CPU cache info");
+
     if (!(caps->host.cpu = virCPUProbeHost(caps->host.arch)))
         VIR_WARN("Failed to get host CPU");
 

diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index 97fe42a9d49dc60f2614e856bedd5caeacf4f4d8..49589b33c9f241f0d10f88aeae40458c679eb58b 100644 (file)
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -69,6 +69,9 @@ virCapsPtr umlCapsInit(void)
         VIR_WARN("Failed to query host NUMA topology, disabling NUMA capabilities");
     }
 
+    if (virCapabilitiesInitCaches(caps) < 0)
+        VIR_WARN("Failed to get host CPU cache info");
+
     if (virNodeSuspendGetTargetMask(&caps->host.powerMgmt) < 0)
         VIR_WARN("Failed to get host power management capabilities");
 

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index d2b36ac0dfed2767e757f2cbb0113f5f53f17576..d6d363e456a73c91005698dd719cd73098d21a7e 100644 (file)
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -79,6 +79,9 @@ vboxCapsInit(void)
     if (virCapabilitiesInitNUMA(caps) < 0)
         goto no_memory;
 
+    if (virCapabilitiesInitCaches(caps) < 0)
+        goto no_memory;
+
     if ((guest = virCapabilitiesAddGuest(caps,
                                          VIR_DOMAIN_OSTYPE_HVM,
                                          caps->host.arch,

diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index bf4597c4748a7050a5b4c4e8d7ea9618eca245ef..891d9a47f0b46f9b117b41f86efe69a237f14b8f 100644 (file)
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -68,6 +68,9 @@ vmwareCapsInit(void)
     if (virCapabilitiesInitNUMA(caps) < 0)
         goto error;
 
+    if (virCapabilitiesInitCaches(caps) < 0)
+        goto error;
+
     /* i686 guests are always supported */
     if ((guest = virCapabilitiesAddGuest(caps,
                                          VIR_DOMAIN_OSTYPE_HVM,

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 059e7c9f4d4e6eeb9334d694474d051aaa03bd24..9a429f495ed84b598c7148e2125acdb14e2ee4d5 100644 (file)
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -118,6 +118,8 @@ vzBuildCapabilities(void)
     if (virCapabilitiesInitNUMA(caps) < 0)
         goto error;
 
+    if (virCapabilitiesInitCaches(caps) < 0)
+        goto error;
 
     verify(ARRAY_CARDINALITY(archs) == ARRAY_CARDINALITY(emulators));