From patchwork Sun Mar 6 18:59:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 85588 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 D95E1B70BA for ; Mon, 7 Mar 2011 06:00:04 +1100 (EST) Received: from localhost ([127.0.0.1]:50650 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PwJBQ-0006Fg-Sq for incoming@patchwork.ozlabs.org; Sun, 06 Mar 2011 14:00:00 -0500 Received: from [140.186.70.92] (port=34581 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PwJAq-0006FW-ER for qemu-devel@nongnu.org; Sun, 06 Mar 2011 13:59:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PwJAn-0002qk-BM for qemu-devel@nongnu.org; Sun, 06 Mar 2011 13:59:24 -0500 Received: from fmmailgate02.web.de ([217.72.192.227]:36435) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PwJAm-0002qF-Tm for qemu-devel@nongnu.org; Sun, 06 Mar 2011 13:59:21 -0500 Received: from smtp01.web.de ( [172.20.0.243]) by fmmailgate02.web.de (Postfix) with ESMTP id 5DBBA19A1F7EE; Sun, 6 Mar 2011 19:59:18 +0100 (CET) Received: from [92.74.54.57] (helo=mchn199C.mchp.siemens.de) by smtp01.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1PwJAk-0004sU-00; Sun, 06 Mar 2011 19:59:18 +0100 Message-ID: <4D73D985.5020206@web.de> Date: Sun, 06 Mar 2011 19:59:17 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: =?windows-1252?Q?Andreas_F=E4rber?= References: In-Reply-To: X-Enigmail-Version: 1.1.2 X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX18WezHSyQRA9k1rEycin3usBVNf0VeBnVJI0Jn9 I23U79F+N0LCM5uiwHtpe2PGuiGdYwYfXIf5wfW/8zVnEmAmJs 7tLrc1sJQ= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.227 Cc: Anthony Liguori , Marcelo Tosatti , "qemu-devel@nongnu.org Developers" , kvm@vger.kernel.org, Avi Kivity Subject: [Qemu-devel] [PATCH] Implement qemu_kvm_eat_signals only for CONFIG_LINUX 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 On 2011-03-06 18:46, Andreas Färber wrote: > Hello, > > Am 22.02.2010 um 22:26 schrieb Marcelo Tosatti: > >> Change the way the internal qemu signal, used for communication between >> iothread and vcpus, is handled. >> >> Block and consume it with sigtimedwait on the outer vcpu loop, which >> allows more precise timing control. > > Mac OS X v10.5 does not seem to support sigtimedwait(): > > CC arm-softmmu/cpus.o > /Users/andreas/QEMU/qemu/cpus.c: In function ‘qemu_kvm_eat_signals’: > /Users/andreas/QEMU/qemu/cpus.c:379: warning: implicit declaration of > function ‘sigtimedwait’ > /Users/andreas/QEMU/qemu/cpus.c:379: warning: nested extern declaration > of ‘sigtimedwait’ > /Users/andreas/QEMU/qemu/cpus.c:388: warning: implicit declaration of > function ‘sigbus_reraise’ > /Users/andreas/QEMU/qemu/cpus.c:388: warning: nested extern declaration > of ‘sigbus_reraise’ > > Could you please add some #ifdef? It used to be an optional POSIX > extension. This should fix it. Jan ------8<------- From: Jan Kiszka qemu_kvm_eat_signals requires POSIX support with realtime extensions for sigtimedwait. Not all our target platforms provide this. Signed-off-by: Jan Kiszka --- cpus.c | 94 ++++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 47 insertions(+), 47 deletions(-) diff --git a/cpus.c b/cpus.c index 94af696..a10559d 100644 --- a/cpus.c +++ b/cpus.c @@ -235,11 +235,58 @@ static void qemu_init_sigbus(void) prctl(PR_MCE_KILL, PR_MCE_KILL_SET, PR_MCE_KILL_EARLY, 0, 0); } +static void qemu_kvm_eat_signals(CPUState *env) +{ + struct timespec ts = { 0, 0 }; + siginfo_t siginfo; + sigset_t waitset; + sigset_t chkset; + int r; + + sigemptyset(&waitset); + sigaddset(&waitset, SIG_IPI); + sigaddset(&waitset, SIGBUS); + + do { + r = sigtimedwait(&waitset, &siginfo, &ts); + if (r == -1 && !(errno == EAGAIN || errno == EINTR)) { + perror("sigtimedwait"); + exit(1); + } + + switch (r) { + case SIGBUS: + if (kvm_on_sigbus_vcpu(env, siginfo.si_code, siginfo.si_addr)) { + sigbus_reraise(); + } + break; + default: + break; + } + + r = sigpending(&chkset); + if (r == -1) { + perror("sigpending"); + exit(1); + } + } while (sigismember(&chkset, SIG_IPI) || sigismember(&chkset, SIGBUS)); + +#ifndef CONFIG_IOTHREAD + if (sigismember(&chkset, SIGIO) || sigismember(&chkset, SIGALRM)) { + qemu_notify_event(); + } +#endif +} + #else /* !CONFIG_LINUX */ static void qemu_init_sigbus(void) { } + +static void qemu_kvm_eat_signals(CPUState *env) +{ +} #endif /* !CONFIG_LINUX */ #ifndef _WIN32 @@ -364,49 +411,6 @@ static int qemu_signalfd_init(sigset_t mask) return 0; } -static void qemu_kvm_eat_signals(CPUState *env) -{ - struct timespec ts = { 0, 0 }; - siginfo_t siginfo; - sigset_t waitset; - sigset_t chkset; - int r; - - sigemptyset(&waitset); - sigaddset(&waitset, SIG_IPI); - sigaddset(&waitset, SIGBUS); - - do { - r = sigtimedwait(&waitset, &siginfo, &ts); - if (r == -1 && !(errno == EAGAIN || errno == EINTR)) { - perror("sigtimedwait"); - exit(1); - } - - switch (r) { - case SIGBUS: - if (kvm_on_sigbus_vcpu(env, siginfo.si_code, siginfo.si_addr)) { - sigbus_reraise(); - } - break; - default: - break; - } - - r = sigpending(&chkset); - if (r == -1) { - perror("sigpending"); - exit(1); - } - } while (sigismember(&chkset, SIG_IPI) || sigismember(&chkset, SIGBUS)); - -#ifndef CONFIG_IOTHREAD - if (sigismember(&chkset, SIGIO) || sigismember(&chkset, SIGALRM)) { - qemu_notify_event(); - } -#endif -} - #else /* _WIN32 */ HANDLE qemu_event_handle; @@ -434,10 +438,6 @@ static void qemu_event_increment(void) exit (1); } } - -static void qemu_kvm_eat_signals(CPUState *env) -{ -} #endif /* _WIN32 */ #ifndef CONFIG_IOTHREAD