From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] Implement qemu_kvm_eat_signals only for CONFIG_LINUX Date: Sun, 06 Mar 2011 19:59:17 +0100 Message-ID: <4D73D985.5020206@web.de> References: Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Marcelo Tosatti , Anthony Liguori , "qemu-devel@nongnu.org Developers" , kvm@vger.kernel.org, Avi Kivity To: =?windows-1252?Q?Andreas_F=E4rber?= Return-path: Received: from fmmailgate02.web.de ([217.72.192.227]:36427 "EHLO fmmailgate02.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752279Ab1CFS7T (ORCPT ); Sun, 6 Mar 2011 13:59:19 -0500 In-Reply-To: Sender: kvm-owner@vger.kernel.org List-ID: On 2011-03-06 18:46, Andreas F=E4rber wrote: > Hello, >=20 > Am 22.02.2010 um 22:26 schrieb Marcelo Tosatti: >=20 >> Change the way the internal qemu signal, used for communication betw= een >> iothread and vcpus, is handled. >> >> Block and consume it with sigtimedwait on the outer vcpu loop, which >> allows more precise timing control. >=20 > Mac OS X v10.5 does not seem to support sigtimedwait(): >=20 > CC arm-softmmu/cpus.o > /Users/andreas/QEMU/qemu/cpus.c: In function =91qemu_kvm_eat_signals=92= : > /Users/andreas/QEMU/qemu/cpus.c:379: warning: implicit declaration of > function =91sigtimedwait=92 > /Users/andreas/QEMU/qemu/cpus.c:379: warning: nested extern declarati= on > of =91sigtimedwait=92 > /Users/andreas/QEMU/qemu/cpus.c:388: warning: implicit declaration of > function =91sigbus_reraise=92 > /Users/andreas/QEMU/qemu/cpus.c:388: warning: nested extern declarati= on > of =91sigbus_reraise=92 >=20 > Could you please add some #ifdef? It used to be an optional POSIX > extension. This should fix it. Jan ------8<------- =46rom: Jan Kiszka qemu_kvm_eat_signals requires POSIX support with realtime extensions fo= r 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); } =20 +static void qemu_kvm_eat_signals(CPUState *env) +{ + struct timespec ts =3D { 0, 0 }; + siginfo_t siginfo; + sigset_t waitset; + sigset_t chkset; + int r; + + sigemptyset(&waitset); + sigaddset(&waitset, SIG_IPI); + sigaddset(&waitset, SIGBUS); + + do { + r =3D sigtimedwait(&waitset, &siginfo, &ts); + if (r =3D=3D -1 && !(errno =3D=3D EAGAIN || errno =3D=3D EINTR= )) { + perror("sigtimedwait"); + exit(1); + } + + switch (r) { + case SIGBUS: + if (kvm_on_sigbus_vcpu(env, siginfo.si_code, siginfo.si_ad= dr)) { + sigbus_reraise(); + } + break; + default: + break; + } + + r =3D sigpending(&chkset); + if (r =3D=3D -1) { + perror("sigpending"); + exit(1); + } + } while (sigismember(&chkset, SIG_IPI) || sigismember(&chkset, SIG= BUS)); + +#ifndef CONFIG_IOTHREAD + if (sigismember(&chkset, SIGIO) || sigismember(&chkset, SIGALRM)) = { + qemu_notify_event(); + } +#endif +} + #else /* !CONFIG_LINUX */ =20 static void qemu_init_sigbus(void) { } + +static void qemu_kvm_eat_signals(CPUState *env) +{ +} #endif /* !CONFIG_LINUX */ =20 #ifndef _WIN32 @@ -364,49 +411,6 @@ static int qemu_signalfd_init(sigset_t mask) return 0; } =20 -static void qemu_kvm_eat_signals(CPUState *env) -{ - struct timespec ts =3D { 0, 0 }; - siginfo_t siginfo; - sigset_t waitset; - sigset_t chkset; - int r; - - sigemptyset(&waitset); - sigaddset(&waitset, SIG_IPI); - sigaddset(&waitset, SIGBUS); - - do { - r =3D sigtimedwait(&waitset, &siginfo, &ts); - if (r =3D=3D -1 && !(errno =3D=3D EAGAIN || errno =3D=3D EINTR= )) { - perror("sigtimedwait"); - exit(1); - } - - switch (r) { - case SIGBUS: - if (kvm_on_sigbus_vcpu(env, siginfo.si_code, siginfo.si_ad= dr)) { - sigbus_reraise(); - } - break; - default: - break; - } - - r =3D sigpending(&chkset); - if (r =3D=3D -1) { - perror("sigpending"); - exit(1); - } - } while (sigismember(&chkset, SIG_IPI) || sigismember(&chkset, SIG= BUS)); - -#ifndef CONFIG_IOTHREAD - if (sigismember(&chkset, SIGIO) || sigismember(&chkset, SIGALRM)) = { - qemu_notify_event(); - } -#endif -} - #else /* _WIN32 */ =20 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 */ =20 #ifndef CONFIG_IOTHREAD