From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52969) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6kUX-0002vF-5W for qemu-devel@nongnu.org; Fri, 24 Jan 2014 12:24:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W6kUS-0007uT-6J for qemu-devel@nongnu.org; Fri, 24 Jan 2014 12:24:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53191) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6kUR-0007uN-Vr for qemu-devel@nongnu.org; Fri, 24 Jan 2014 12:24:24 -0500 From: Kevin Wolf Date: Fri, 24 Jan 2014 18:21:30 +0100 Message-Id: <1390584136-24703-48-git-send-email-kwolf@redhat.com> In-Reply-To: <1390584136-24703-1-git-send-email-kwolf@redhat.com> References: <1390584136-24703-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 47/93] qemu-progress: Fix progress printing on SIGUSR1 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org Since commit a7aae221 ('Switch SIG_IPI to SIGUSR1'), SIGUSR1 is blocked during startup, breaking the progress report in tools. This patch reenables the signal when initialising a progress report. Signed-off-by: Kevin Wolf Reviewed-by: Benoit Canet --- util/qemu-progress.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/util/qemu-progress.c b/util/qemu-progress.c index ad33fee..4ee5cd0 100644 --- a/util/qemu-progress.c +++ b/util/qemu-progress.c @@ -82,12 +82,22 @@ static void progress_dummy_init(void) { #ifdef CONFIG_POSIX struct sigaction action; + sigset_t set; memset(&action, 0, sizeof(action)); sigfillset(&action.sa_mask); action.sa_handler = sigusr_print; action.sa_flags = 0; sigaction(SIGUSR1, &action, NULL); + + /* + * SIGUSR1 is SIG_IPI and gets blocked in qemu_init_main_loop(). In the + * tools that use the progress report SIGUSR1 isn't used in this meaning + * and instead should print the progress, so reenable it. + */ + sigemptyset(&set); + sigaddset(&set, SIGUSR1); + pthread_sigmask(SIG_UNBLOCK, &set, NULL); #endif state.print = progress_dummy_print; -- 1.8.1.4