From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=60237 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ptd9R-0003om-8T for qemu-devel@nongnu.org; Sun, 27 Feb 2011 04:42:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ptd9P-0004qh-QL for qemu-devel@nongnu.org; Sun, 27 Feb 2011 04:42:53 -0500 Received: from fmmailgate02.web.de ([217.72.192.227]:56532) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ptd9P-0004qa-D3 for qemu-devel@nongnu.org; Sun, 27 Feb 2011 04:42:51 -0500 Message-ID: <4D6A1C58.4050605@web.de> Date: Sun, 27 Feb 2011 10:41:44 +0100 From: Jan Kiszka MIME-Version: 1.0 References: <1298734819-1960-1-git-send-email-pbonzini@redhat.com> <1298734819-1960-20-git-send-email-pbonzini@redhat.com> In-Reply-To: <1298734819-1960-20-git-send-email-pbonzini@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigDDB047F1708799568EAA294C" Sender: jan.kiszka@web.de Subject: [Qemu-devel] Re: [PATCH v2 upstream 19/22] move blocking of signals to qemu_signalfd_init List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org, Aurelien Jarno This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigDDB047F1708799568EAA294C Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable On 2011-02-26 16:40, Paolo Bonzini wrote: > Signed-off-by: Paolo Bonzini > --- > cpus.c | 87 ++++++++++++++++++++++++++------------------------------= ------- > 1 files changed, 36 insertions(+), 51 deletions(-) >=20 > diff --git a/cpus.c b/cpus.c > index 32e9352..8c440f1 100644 > --- a/cpus.c > +++ b/cpus.c > @@ -346,11 +346,37 @@ static void sigfd_handler(void *opaque) > } > } > =20 > -static int qemu_signalfd_init(sigset_t mask) > +static int qemu_signalfd_init(void) > { > int sigfd; > + sigset_t set; > =20 > - sigfd =3D qemu_signalfd(&mask); > +#ifdef CONFIG_IOTHREAD > + /* SIGUSR2 used by posix-aio-compat.c */ > + sigemptyset(&set); > + sigaddset(&set, SIGUSR2); > + pthread_sigmask(SIG_UNBLOCK, &set, NULL); Didn't you want to rename the function for the sake of non-signalfd blocks like above? > + > + sigemptyset(&set); > + sigaddset(&set, SIGIO); > + sigaddset(&set, SIGALRM); > + sigaddset(&set, SIG_IPI); > + sigaddset(&set, SIGBUS); > + pthread_sigmask(SIG_BLOCK, &set, NULL); > +#else > + sigemptyset(&set); This line is shared and can be moved out of the #ifdef. > + sigaddset(&set, SIGBUS); > + if (kvm_enabled()) { > + /* > + * We need to process timer signals synchronously to avoid a r= ace > + * between exit_request check and KVM vcpu entry. > + */ > + sigaddset(&set, SIGIO); > + sigaddset(&set, SIGALRM); > + } > +#endif > + > + sigfd =3D qemu_signalfd(&set); > if (sigfd =3D=3D -1) { > fprintf(stderr, "failed to create signalfd\n"); > return -errno; > @@ -438,6 +464,12 @@ static void qemu_event_increment(void) > static void qemu_kvm_eat_signals(CPUState *env) > { > } > + > +static int qemu_signalfd_init(void) > +{ > + return 0; > +} > + > #endif /* _WIN32 */ > =20 > #ifndef CONFIG_IOTHREAD > @@ -471,39 +503,14 @@ static void qemu_kvm_init_cpu_signals(CPUState *e= nv) > #endif > } > =20 > -#ifndef _WIN32 > -static sigset_t block_synchronous_signals(void) > -{ > - sigset_t set; > - > - sigemptyset(&set); > - sigaddset(&set, SIGBUS); > - if (kvm_enabled()) { > - /* > - * We need to process timer signals synchronously to avoid a r= ace > - * between exit_request check and KVM vcpu entry. > - */ > - sigaddset(&set, SIGIO); > - sigaddset(&set, SIGALRM); > - } > - > - return set; > -} > -#endif > - > int qemu_init_main_loop(void) > { > -#ifndef _WIN32 > - sigset_t blocked_signals; > int ret; > =20 > - blocked_signals =3D block_synchronous_signals(); > - > - ret =3D qemu_signalfd_init(blocked_signals); > + ret =3D qemu_signalfd_init(); > if (ret) { > return ret; > } > -#endif > =20 > qemu_init_sigbus(); > =20 > @@ -651,35 +658,13 @@ static void qemu_tcg_init_cpu_signals(void) > pthread_sigmask(SIG_UNBLOCK, &set, NULL); > } > =20 > -static sigset_t block_io_signals(void) > -{ > - sigset_t set; > - > - /* SIGUSR2 used by posix-aio-compat.c */ > - sigemptyset(&set); > - sigaddset(&set, SIGUSR2); > - pthread_sigmask(SIG_UNBLOCK, &set, NULL); > - > - sigemptyset(&set); > - sigaddset(&set, SIGIO); > - sigaddset(&set, SIGALRM); > - sigaddset(&set, SIG_IPI); > - sigaddset(&set, SIGBUS); > - pthread_sigmask(SIG_BLOCK, &set, NULL); > - > - return set; > -} > - > int qemu_init_main_loop(void) > { > int ret; > - sigset_t blocked_signals; > =20 > qemu_init_sigbus(); > =20 > - blocked_signals =3D block_io_signals(); > - > - ret =3D qemu_signalfd_init(blocked_signals); > + ret =3D qemu_signalfd_init(); > if (ret) { > return ret; > } Beside the minor nits, this looks good. Jan --------------enigDDB047F1708799568EAA294C Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org/ iEYEARECAAYFAk1qHFgACgkQitSsb3rl5xRnBwCgsaruFutq8SJQlmb+pTMwa6YA r1QAoLforXA6djXFCxzQ6liRl3jpFQ8o =hT89 -----END PGP SIGNATURE----- --------------enigDDB047F1708799568EAA294C--