From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KszDZ-000733-3g for qemu-devel@nongnu.org; Thu, 23 Oct 2008 08:23:09 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KszDV-0006zZ-EQ for qemu-devel@nongnu.org; Thu, 23 Oct 2008 08:23:08 -0400 Received: from [199.232.76.173] (port=51696 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KszDV-0006zN-7M for qemu-devel@nongnu.org; Thu, 23 Oct 2008 08:23:05 -0400 Received: from mx2.redhat.com ([66.187.237.31]:54639) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KszDS-0006Ek-Ox for qemu-devel@nongnu.org; Thu, 23 Oct 2008 08:23:05 -0400 From: Glauber Costa Date: Thu, 23 Oct 2008 12:18:57 -0200 Message-Id: <1224771556-11146-14-git-send-email-glommer@redhat.com> In-Reply-To: <1224771556-11146-1-git-send-email-glommer@redhat.com> References: <1224771556-11146-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 13/32] 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 | 2 +- vl.c | 4 ---- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/kqemu.c b/kqemu.c index 0a1d63b..7f24cfc 100644 --- a/kqemu.c +++ b/kqemu.c @@ -166,7 +166,7 @@ int kqemu_start(void) DWORD temp; #endif - if (!kqemu_allowed) + if (!kqemu_allowed || cpus > 1) return -1; #ifdef _WIN32 diff --git a/vl.c b/vl.c index adf5b25..f7bbfbb 100644 --- a/vl.c +++ b/vl.c @@ -9469,10 +9469,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