Skip to contentSkip to conversation

pc: push setting default cpu_model down a level

PATCH Applied Alex Williamson 2 participants 2 messages Jun 1, 2010 – Jun 2, 2010 KVM

lore
Share & tools
lore

Alex Williamson

author
#0 lore raw

PATCH 1/1 pc: push setting default cpu_model down a level

Not that CPU hotplug currently works, but if you make the mistake of trying it on a VM started without specifying a -cpu value, you hit a segfault from trying to strdup(NULL) in cpu_x86_find_by_name().

Signed-off-by Alex Williamson <[email protected]>

---

 hw/pc.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
hw/pc.c +8 -8
index 9b85c42..a79586c 100644
@@ -771,6 +771,14 @@ static CPUState *pc_new_cpu(const char *cpu_model)
 {
     CPUState *env;
 
+    if (cpu_model == NULL) {
+#ifdef TARGET_X86_64
+        cpu_model = "qemu64";
+#else
+        cpu_model = "qemu32";
+#endif
+    }
+
     env = cpu_init(cpu_model);
     if (!env) {
         fprintf(stderr, "Unable to find x86 CPU definition\n");

@@ -791,14 +799,6 @@ void pc_cpus_init(const char *cpu_model)
     int i;
 
     /* init CPUs */
-    if (cpu_model == NULL) {
-#ifdef TARGET_X86_64
-        cpu_model = "qemu64";
-#else
-        cpu_model = "qemu32";
-#endif
-    }
-
     for(i = 0; i < smp_cpus; i++) {
         pc_new_cpu(cpu_model);
     }
Applied
#1 lore raw
Quoted 5 lines · Alex Williamson

Not that CPU hotplug currently works, but if you make the mistake of trying it on a VM started without specifying a -cpu value, you hit a segfault from trying to strdup(NULL) in cpu_x86_find_by_name().

Signed-off-by Alex Williamson <[email protected]>

Applied, thanks.