[Qemu-devel] [PATCH 08/21] move disabling code to kqemu.c instead of vl.c

[Glauber Costa]

From: Glauber Costa <address@hidden>

kqemu is not smp. So instead of testing in vl.c, do the test in kqemu.c,
and just refuse to start if smp_cpus > 1.

Signed-off-by: Glauber Costa <address@hidden>
---
 kqemu.c |    3 ++-
 vl.c    |    4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/kqemu.c b/kqemu.c
index bcbe3cc..bfb7339 100644
--- a/kqemu.c
+++ b/kqemu.c
@@ -156,6 +156,7 @@ static void kqemu_update_cpuid(CPUState *env)
 }
 
 QEMUAccel kqemu_accel;
+extern int smp_cpus;
 
 int kqemu_start(void)
 {
@@ -165,7 +166,7 @@ int kqemu_start(void)
     DWORD temp;
 #endif
 
-    if (!kqemu_allowed)
+    if (!kqemu_allowed || smp_cpus > 1)
         return -1;
 
 #ifdef _WIN32
diff --git a/vl.c b/vl.c
index f72172f..55a0c08 100644
--- a/vl.c
+++ b/vl.c
@@ -9463,10 +9463,6 @@ int main(int argc, char **argv)
         exit(1);
     }
 
-#ifdef USE_KQEMU
-    if (smp_cpus > 1)
-        kqemu_allowed = 0;
-#endif
     linux_boot = (kernel_filename != NULL);
     net_boot = (boot_devices_bitmap >> ('n' - 'a')) & 0xF;
 
-- 
1.5.5.1