capabilities: Report number of host CPU physical address bits

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 4bb2ea4baeaf83fc5be09110fb27073f6257d700..9fcd6b8add4c1ef21455a9b74b35e3a413a48ee3 100644 (file)
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -2738,6 +2738,7 @@ virCPUx86GetHost(virCPUDef *cpu,
                  virDomainCapsCPUModels *models)
 {
     g_autoptr(virCPUData) cpuData = NULL;
+    unsigned int addrsz;
     int ret;
 
     if (virCPUx86DriverInitialize() < 0)
@@ -2784,6 +2785,13 @@ virCPUx86GetHost(virCPUDef *cpu,
         VIR_DEBUG("Host CPU does not support invariant TSC");
     }
 
+    if (virHostCPUGetPhysAddrSize(&addrsz) == 0) {
+        virCPUMaxPhysAddrDef *addr = g_new0(virCPUMaxPhysAddrDef, 1);
+
+        addr->bits = addrsz;
+        cpu->addr = addr;
+    }
+
     return ret;
 }
 #endif

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 5918dc0eb2171f7d5f66aa75ed7246dfee5ff5aa..08dbe730da4467d6647bd5d0565bea0f80dc4c6a 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2437,6 +2437,7 @@ virHostCPUGetMicrocodeVersion;
 virHostCPUGetMSR;
 virHostCPUGetOnline;
 virHostCPUGetOnlineBitmap;
+virHostCPUGetPhysAddrSize;
 virHostCPUGetPresentBitmap;
 virHostCPUGetSignature;
 virHostCPUGetStats;

diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
index 639dd9b51e93e7031eebb11f02d6e5c6ae7298bc..3a02e224e83af50e9e2f9ab0a21a9e091a677542 100644 (file)
--- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c
@@ -570,6 +570,38 @@ virHostCPUParseFrequency(FILE *cpuinfo,
 }
 
 
+static int
+virHostCPUParsePhysAddrSize(FILE *cpuinfo, unsigned int *addrsz)
+{
+    char line[1024];
+
+    while (fgets(line, sizeof(line), cpuinfo) != NULL) {
+        char *str;
+        char *endptr;
+
+        if (!(str = STRSKIP(line, "address sizes")))
+            continue;
+
+        /* Skip the colon. */
+        if ((str = strstr(str, ":")) == NULL)
+            goto error;
+        str++;
+
+        /* Parse the number of physical address bits */
+        if (virStrToLong_ui(str, &endptr, 10, addrsz) < 0)
+            goto error;
+
+        return 0;
+    }
+
+ error:
+    virReportError(VIR_ERR_INTERNAL_ERROR,
+                   _("Missing or invalid CPU address size in %s"),
+                   CPUINFO_PATH);
+    return -1;
+}
+
+
 int
 virHostCPUGetInfoPopulateLinux(FILE *cpuinfo,
                                virArch arch,
@@ -1616,6 +1648,20 @@ virHostCPUGetSignature(char **signature)
     return virHostCPUReadSignature(virArchFromHost(), cpuinfo, signature);
 }
 
+int
+virHostCPUGetPhysAddrSize(unsigned int *size)
+{
+    g_autoptr(FILE) cpuinfo = NULL;
+
+    if (!(cpuinfo = fopen(CPUINFO_PATH, "r"))) {
+        virReportSystemError(errno, _("Failed to open cpuinfo file '%s'"),
+                             CPUINFO_PATH);
+        return -1;
+    }
+
+    return virHostCPUParsePhysAddrSize(cpuinfo, size);
+}
+
 #else
 
 int
@@ -1625,6 +1671,12 @@ virHostCPUGetSignature(char **signature)
     return 0;
 }
 
+int
+virHostCPUGetPhysAddrSize(unsigned int *size)
+{
+    return 0;
+}
+
 #endif /* __linux__ */
 
 int

diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h
index b8ea7aafad6e7887cf38df3a7a44b879d9075f4d..5232fee36db4a122b004bef8b142c44aa4b59c81 100644 (file)
--- a/src/util/virhostcpu.h
+++ b/src/util/virhostcpu.h
@@ -58,6 +58,7 @@ int virHostCPUGetInfo(virArch hostarch,
                       unsigned int *cores,
                       unsigned int *threads);
 
+
 int virHostCPUGetKVMMaxVCPUs(void) G_NO_INLINE;
 
 int virHostCPUStatsAssign(virNodeCPUStatsPtr param,
@@ -86,6 +87,8 @@ virHostCPUTscInfo *virHostCPUGetTscInfo(void);
 
 int virHostCPUGetSignature(char **signature);
 
+int virHostCPUGetPhysAddrSize(unsigned int *size);
+
 int virHostCPUGetHaltPollTime(pid_t pid,
                               unsigned long long *haltPollSuccess,
                               unsigned long long *haltPollFail);