From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KCKji-0002xc-H3 for qemu-devel@nongnu.org; Fri, 27 Jun 2008 16:40:02 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KCKjg-0002w7-Rz for qemu-devel@nongnu.org; Fri, 27 Jun 2008 16:40:00 -0400 Received: from [199.232.76.173] (port=51153 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KCKjg-0002vw-DR for qemu-devel@nongnu.org; Fri, 27 Jun 2008 16:40:00 -0400 Received: from mx1.redhat.com ([66.187.233.31]:55944) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KCKjg-000801-OY for qemu-devel@nongnu.org; Fri, 27 Jun 2008 16:40:00 -0400 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id m5RKdxdA014264 for ; Fri, 27 Jun 2008 16:39:59 -0400 Received: from pobox-2.corp.redhat.com (pobox-2.corp.redhat.com [10.11.255.15]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m5RKdwKT005693 for ; Fri, 27 Jun 2008 16:39:58 -0400 Received: from localhost.localdomain (vpn-4-80.str.redhat.com [10.32.4.80]) by pobox-2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m5RKdadg004563 for ; Fri, 27 Jun 2008 16:39:57 -0400 From: Glauber Costa Date: Fri, 27 Jun 2008 17:38:11 -0300 Message-Id: <1214599103-13846-9-git-send-email-gcosta@redhat.com> In-Reply-To: <1214599103-13846-8-git-send-email-gcosta@redhat.com> References: <1214599103-13846-1-git-send-email-gcosta@redhat.com> <1214599103-13846-2-git-send-email-gcosta@redhat.com> <1214599103-13846-3-git-send-email-gcosta@redhat.com> <1214599103-13846-4-git-send-email-gcosta@redhat.com> <1214599103-13846-5-git-send-email-gcosta@redhat.com> <1214599103-13846-6-git-send-email-gcosta@redhat.com> <1214599103-13846-7-git-send-email-gcosta@redhat.com> <1214599103-13846-8-git-send-email-gcosta@redhat.com> Subject: [Qemu-devel] [PATCH 08/20] 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 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 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 4fb88fc..b402197 100644 --- a/vl.c +++ b/vl.c @@ -8372,10 +8372,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