[PATCH 09/13] [PATCH] move disabling code to kqemu.c instead of vl.c

Glauber Costa
2008-05-15T14:09:29Z

this is for the case in which we run more than one cpu
---
kqemu.c | 3 ++-
vl.c | 4 ----
2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/kqemu.c b/kqemu.c
index 6d46dfb..94366ec 100644
--- a/kqemu.c
+++ b/kqemu.c
@@ -164,6 +164,7 @@ static void kqemu_update_cpuid(CPUState *env)
}

QEMUAccel kqemu_accel;
+extern int smp_cpus;

int kqemu_start(void)
{
@@ -173,7 +174,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 26c1677..8104e33 100644
--- a/vl.c
+++ b/vl.c
@@ -8357,10 +8357,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;