Skip to contentSkip to conversation

linux-user: Add missing /proc/cpuinfo fields for sparc

PATCH Applied Helge Deller 2 participants 3 messages Jan 9, 2025 – Jan 16, 2025

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 linux-user: Add missing /proc/cpuinfo fields for sparc

Add some missing fields which may be parsed by userspace applications.

v2:
- fixed cpu name and type depending on currently active CPU

linux-user/sparc/target_proc.h +19 -1
index 3bb3134a47..744fa10730 100644
@@ -8,7 +8,25 @@
 
 static int open_cpuinfo(CPUArchState *cpu_env, int fd)
 {
-    dprintf(fd, "type\t\t: sun4u\n");
+    int i, num_cpus;
+    const char *cpu_type;
+
+    num_cpus = sysconf(_SC_NPROCESSORS_ONLN);
+    if (cpu_env->def.features & CPU_FEATURE_HYPV) {
+        cpu_type = "sun4v";
+    } else {
+        cpu_type = "sun4u";
+    }
+
+    dprintf(fd, "cpu\t\t: %s (QEMU)\n", cpu_env->def.name);
+    dprintf(fd, "type\t\t: %s\n", cpu_type);
+    dprintf(fd, "ncpus probed\t: %d\n", num_cpus);
+    dprintf(fd, "ncpus active\t: %d\n", num_cpus);
+    dprintf(fd, "State:\n");
+    for (i = 0; i < num_cpus; i++) {
+        dprintf(fd, "CPU%d:\t\t: online\n", i);
+    }
+
     return 0;
 }
 #define HAVE_ARCH_PROC_CPUINFO
Reviewed-by on v2 1/1
#1 lore raw
Quoted 16 lines · Helge Deller

Add some missing fields which may be parsed by userspace applications.

v2:
- fixed cpu name and type depending on currently active CPU

linux-user/sparc/target_proc.h +0 -0
index 3bb3134a47..744fa10730 100644
@@ -8,7 +8,25 @@
 
  static int open_cpuinfo(CPUArchState *cpu_env, int fd)
  {

linux-user/sparc/target_proc.h line 19

Quoted 10 lines
linux-user/sparc/target_proc.h +9 -1
-    dprintf(fd, "type\t\t: sun4u\n");
+    int i, num_cpus;
+    const char *cpu_type;
+
+    num_cpus = sysconf(_SC_NPROCESSORS_ONLN);
+    if (cpu_env->def.features & CPU_FEATURE_HYPV) {
+        cpu_type = "sun4v";
+    } else {
+        cpu_type = "sun4u";
+    }

Maybe

#ifdef CONFIG_SPARC64
    ...
#else
    cpu_type = "sun4m";

#endif

?

Anyway, considering we always printed v4 before,

r~

Quoted 13 lines
linux-user/sparc/target_proc.h +10 -0
+
+    dprintf(fd, "cpu\t\t: %s (QEMU)\n", cpu_env->def.name);
+    dprintf(fd, "type\t\t: %s\n", cpu_type);
+    dprintf(fd, "ncpus probed\t: %d\n", num_cpus);
+    dprintf(fd, "ncpus active\t: %d\n", num_cpus);
+    dprintf(fd, "State:\n");
+    for (i = 0; i < num_cpus; i++) {
+        dprintf(fd, "CPU%d:\t\t: online\n", i);
+    }
+
      return 0;
  }
  #define HAVE_ARCH_PROC_CPUINFO