From patchwork Fri Jun 4 16:09:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 54637 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 93AF6B7D2E for ; Sat, 5 Jun 2010 02:53:54 +1000 (EST) Received: from localhost ([127.0.0.1]:34764 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKa9X-0007jA-JF for incoming@patchwork.ozlabs.org; Fri, 04 Jun 2010 12:53:51 -0400 Received: from [140.186.70.92] (port=46404 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKZTm-0002zS-SS for qemu-devel@nongnu.org; Fri, 04 Jun 2010 12:14:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OKZSd-0006im-Gw for qemu-devel@nongnu.org; Fri, 04 Jun 2010 12:09:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57023) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OKZSd-0006ie-7m for qemu-devel@nongnu.org; Fri, 04 Jun 2010 12:09:31 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o54G9TEE029554 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 4 Jun 2010 12:09:29 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o54G9Hpw024734; Fri, 4 Jun 2010 12:09:28 -0400 From: Jes.Sorensen@redhat.com To: anthony@codemonkey.ws Date: Fri, 4 Jun 2010 18:09:04 +0200 Message-Id: <1275667755-4821-7-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1275667755-4821-1-git-send-email-Jes.Sorensen@redhat.com> References: <1275667755-4821-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Jes Sorensen , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 06/17] Move win32 early signal handling setup to os_setup_signal_handling() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jes Sorensen Move win32 early signal handling setup to os_setup_signal_handling() Signed-off-by: Jes Sorensen --- os-win32.c | 29 +++++++++++++++++++++++++++++ qemu-os-posix.h | 2 -- sysemu.h | 2 ++ vl.c | 30 ------------------------------ 4 files changed, 31 insertions(+), 32 deletions(-) diff --git a/os-win32.c b/os-win32.c index 1f7e28b..dfa90bc 100644 --- a/os-win32.c +++ b/os-win32.c @@ -152,3 +152,32 @@ void os_host_main_loop_wait(int *timeout) *timeout = 0; } + +static BOOL WINAPI qemu_ctrl_handler(DWORD type) +{ + exit(STATUS_CONTROL_C_EXIT); + return TRUE; +} + +void os_setup_signal_handling(void) +{ + /* Note: cpu_interrupt() is currently not SMP safe, so we force + QEMU to run on a single CPU */ + HANDLE h; + DWORD mask, smask; + int i; + + SetConsoleCtrlHandler(qemu_ctrl_handler, TRUE); + + h = GetCurrentProcess(); + if (GetProcessAffinityMask(h, &mask, &smask)) { + for(i = 0; i < 32; i++) { + if (mask & (1 << i)) + break; + } + if (i != 32) { + mask = 1 << i; + SetProcessAffinityMask(h, mask); + } + } +} diff --git a/qemu-os-posix.h b/qemu-os-posix.h index ff5adb1..96d1036 100644 --- a/qemu-os-posix.h +++ b/qemu-os-posix.h @@ -30,6 +30,4 @@ static inline void os_host_main_loop_wait(int *timeout) { } -void os_setup_signal_handling(void); - #endif diff --git a/sysemu.h b/sysemu.h index 5e4feae..e3643ad 100644 --- a/sysemu.h +++ b/sysemu.h @@ -79,6 +79,8 @@ int qemu_loadvm_state(QEMUFile *f); /* SLIRP */ void do_info_slirp(Monitor *mon); +void os_setup_signal_handling(void); + typedef enum DisplayType { DT_DEFAULT, diff --git a/vl.c b/vl.c index 7a46fee..f43456a 100644 --- a/vl.c +++ b/vl.c @@ -1986,14 +1986,6 @@ static int balloon_parse(const char *arg) return -1; } -#ifdef _WIN32 -static BOOL WINAPI qemu_ctrl_handler(DWORD type) -{ - exit(STATUS_CONTROL_C_EXIT); - return TRUE; -} -#endif - #ifndef _WIN32 static void termsig_handler(int signal) @@ -2459,29 +2451,7 @@ int main(int argc, char **argv, char **envp) qemu_cache_utils_init(envp); QLIST_INIT (&vm_change_state_head); -#ifndef _WIN32 os_setup_signal_handling(); -#else - SetConsoleCtrlHandler(qemu_ctrl_handler, TRUE); - /* Note: cpu_interrupt() is currently not SMP safe, so we force - QEMU to run on a single CPU */ - { - HANDLE h; - DWORD mask, smask; - int i; - h = GetCurrentProcess(); - if (GetProcessAffinityMask(h, &mask, &smask)) { - for(i = 0; i < 32; i++) { - if (mask & (1 << i)) - break; - } - if (i != 32) { - mask = 1 << i; - SetProcessAffinityMask(h, mask); - } - } - } -#endif module_call_init(MODULE_INIT_MACHINE); machine = find_default_machine();