File 2a68ceaa-virHostCPUGetSignature-ppc64.patch of Package libvirt.14632

Overview Repositories Revisions Requests Users Attributes Meta

File 2a68ceaa-virHostCPUGetSignature-ppc64.patch of Package libvirt.14632

commit 2a68ceaa6e2e45bbb05ffa15b4cdf45cba38958f
Author: Jiri Denemark <jdenemar@redhat.com>
Date:   Thu Apr 2 22:35:30 2020 +0200

hostcpu: Implement virHostCPUGetSignature for ppc64
    
    Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
    Reviewed-by: Ján Tomko <jtomko@redhat.com>

Index: libvirt-6.0.0/src/util/virhostcpu.c
===================================================================
--- libvirt-6.0.0.orig/src/util/virhostcpu.c
+++ libvirt-6.0.0/src/util/virhostcpu.c
@@ -1411,8 +1411,9 @@ virHostCPUReadSignature(virArch arch,
     g_autofree char *family = NULL;
     g_autofree char *model = NULL;
     g_autofree char *stepping = NULL;
+    g_autofree char *revision = NULL;
 
-    if (!ARCH_IS_X86(arch))
+    if (!ARCH_IS_X86(arch) && !ARCH_IS_PPC64(arch))
         return 0;
 
     while (fgets(line, lineLen, cpuinfo)) {
@@ -1424,27 +1425,42 @@ virHostCPUReadSignature(virArch arch,
         g_strstrip(parts[0]);
         g_strstrip(parts[1]);
 
-        if (STREQ(parts[0], "vendor_id")) {
-            if (!vendor)
-                vendor = g_steal_pointer(&parts[1]);
-        } else if (STREQ(parts[0], "model name")) {
-            if (!name)
-                name = g_steal_pointer(&parts[1]);
-        } else if (STREQ(parts[0], "cpu family")) {
-            if (!family)
-                family = g_steal_pointer(&parts[1]);
-        } else if (STREQ(parts[0], "model")) {
-            if (!model)
-                model = g_steal_pointer(&parts[1]);
-        } else if (STREQ(parts[0], "stepping")) {
-            if (!stepping)
-                stepping = g_steal_pointer(&parts[1]);
-        }
-
-        if (vendor && name && family && model && stepping) {
-            *signature = g_strdup_printf("%s, %s, family: %s, model: %s, stepping: %s",
-                                         vendor, name, family, model, stepping);
-            return 0;
+        if (ARCH_IS_X86(arch)) {
+            if (STREQ(parts[0], "vendor_id")) {
+                if (!vendor)
+                    vendor = g_steal_pointer(&parts[1]);
+            } else if (STREQ(parts[0], "model name")) {
+                if (!name)
+                    name = g_steal_pointer(&parts[1]);
+            } else if (STREQ(parts[0], "cpu family")) {
+                if (!family)
+                    family = g_steal_pointer(&parts[1]);
+            } else if (STREQ(parts[0], "model")) {
+                if (!model)
+                    model = g_steal_pointer(&parts[1]);
+            } else if (STREQ(parts[0], "stepping")) {
+                if (!stepping)
+                    stepping = g_steal_pointer(&parts[1]);
+            }
+
+            if (vendor && name && family && model && stepping) {
+                *signature = g_strdup_printf("%s, %s, family: %s, model: %s, stepping: %s",
+                                             vendor, name, family, model, stepping);
+                return 0;
+            }
+        } else if (ARCH_IS_PPC64(arch)) {
+            if (STREQ(parts[0], "cpu")) {
+                if (!name)
+                    name = g_steal_pointer(&parts[1]);
+            } else if (STREQ(parts[0], "revision")) {
+                if (!revision)
+                    revision = g_steal_pointer(&parts[1]);
+            }
+
+            if (name && revision) {
+                *signature = g_strdup_printf("%s, rev %s", name, revision);
+                return 0;
+            }
         }
     }
 
Index: libvirt-6.0.0/tests/virhostcpudata/linux-ppc64-deconf-cpus.signature
===================================================================
--- /dev/null
+++ libvirt-6.0.0/tests/virhostcpudata/linux-ppc64-deconf-cpus.signature
@@ -0,0 +1 @@
+POWER8E (raw), altivec supported, rev 2.1 (pvr 004b 0201)
\ No newline at end of file
Index: libvirt-6.0.0/tests/virhostcpudata/linux-ppc64-subcores1.signature
===================================================================
--- /dev/null
+++ libvirt-6.0.0/tests/virhostcpudata/linux-ppc64-subcores1.signature
@@ -0,0 +1 @@
+POWER8E (raw), altivec supported, rev 2.1 (pvr 004b 0201)
\ No newline at end of file
Index: libvirt-6.0.0/tests/virhostcpudata/linux-ppc64-subcores2.signature
===================================================================
--- /dev/null
+++ libvirt-6.0.0/tests/virhostcpudata/linux-ppc64-subcores2.signature
@@ -0,0 +1 @@
+POWER8E (raw), altivec supported, rev 2.1 (pvr 004b 0201)
\ No newline at end of file
Index: libvirt-6.0.0/tests/virhostcpudata/linux-ppc64-subcores3.signature
===================================================================
--- /dev/null
+++ libvirt-6.0.0/tests/virhostcpudata/linux-ppc64-subcores3.signature
@@ -0,0 +1 @@
+POWER8E (raw), altivec supported, rev 2.1 (pvr 004b 0201)
\ No newline at end of file

Places

File 2a68ceaa-virHostCPUGetSignature-ppc64.patch of Package libvirt.14632

Places