From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KqCWI-0001Qm-7l for qemu-devel@nongnu.org; Wed, 15 Oct 2008 15:58:58 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KqCWF-0001Os-Gv for qemu-devel@nongnu.org; Wed, 15 Oct 2008 15:58:56 -0400 Received: from [199.232.76.173] (port=36788 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KqCWD-0001OZ-Jw for qemu-devel@nongnu.org; Wed, 15 Oct 2008 15:58:53 -0400 Received: from mx2.redhat.com ([66.187.237.31]:49456) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KqCWC-0001Jg-8N for qemu-devel@nongnu.org; Wed, 15 Oct 2008 15:58:53 -0400 From: Glauber Costa Date: Wed, 15 Oct 2008 19:55:05 -0200 Message-Id: <1224107718-19128-9-git-send-email-glommer@redhat.com> In-Reply-To: <1224107718-19128-1-git-send-email-glommer@redhat.com> References: <1224107718-19128-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 08/21] move disabling code to kqemu.c instead of vl.c Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, jan.kiszka@siemens.com, jes@sgi.com, avi@qumranet.com, Glauber Costa , dmitry.baryshkov@siemens.com From: Glauber Costa 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 --- 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