From patchwork Tue Dec 21 04:05:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 76259 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 A00C1B7080 for ; Tue, 21 Dec 2010 15:05:10 +1100 (EST) Received: from localhost ([127.0.0.1]:57807 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PUtTH-0005Pn-1v for incoming@patchwork.ozlabs.org; Mon, 20 Dec 2010 23:05:07 -0500 Received: from [140.186.70.92] (port=41938 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PUtSk-0005Mr-HW for qemu-devel@nongnu.org; Mon, 20 Dec 2010 23:04:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PUtSi-0007wK-FF for qemu-devel@nongnu.org; Mon, 20 Dec 2010 23:04:34 -0500 Received: from [222.73.24.84] (port=53918 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PUtSh-0007uy-R7 for qemu-devel@nongnu.org; Mon, 20 Dec 2010 23:04:32 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 5859117079B; Tue, 21 Dec 2010 12:04:25 +0800 (CST) Received: from mailserver.fnst.cn.fujitus.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id oBL3xRJh004135; Tue, 21 Dec 2010 11:59:30 +0800 Received: from [10.167.225.226] ([10.167.225.226]) by mailserver.fnst.cn.fujitus.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2010122112041411-14955 ; Tue, 21 Dec 2010 12:04:14 +0800 Message-ID: <4D102795.9040107@cn.fujitsu.com> Date: Tue, 21 Dec 2010 12:05:41 +0800 From: Wen Congyang User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100413 Fedora/3.0.4-2.fc13 Thunderbird/3.0.4 MIME-Version: 1.0 To: =?ISO-8859-1?Q?Andreas_F=E4rber?= , qemu-devel , Luiz Capitulino , Anthony Liguori References: <4D005006.9080307@cn.fujitsu.com> <4D07378B.3050901@cn.fujitsu.com> <4D0EB06D.6060001@cn.fujitsu.com> <29897010-A575-4C94-8016-C0FC03652B64@web.de> In-Reply-To: <29897010-A575-4C94-8016-C0FC03652B64@web.de> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2010-12-21 12:04:14, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2010-12-21 12:04:19, Serialize complete at 2010-12-21 12:04:19 X-detected-operating-system: by eggs.gnu.org: FreeBSD 6.x (1) Cc: Subject: [Qemu-devel] [PATCH v2] disable sigcld handling before calling pclose() 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 When I use the command 'virsh save' to save the domain state, I receive the following error message: operation failed: Migration unexpectedly failed. I debug the qemu by adding some printf(), and find the function pclose() returns -1. I use strace to trace qemu, the log is as the following: ====== close(17) = 0 --- SIGCHLD (Child exited) @ 0 (0) --- wait4(-1, NULL, WNOHANG, NULL) = 22016 rt_sigreturn(0) = 0 wait4(22016, 0x7fff7f1034fc, 0, NULL) = -1 ECHILD (No child processes) ====== We wait the child twice: one is in signal SIGCHLD handling and the other one is in pclose(). We should disable sigcld handling before calling pclose(). v2: - Add stub functions for Win32 Signed-off-by: Wen Congyang --- os-posix.c | 19 +++++++++++++++++++ qemu-os-posix.h | 2 ++ qemu-os-win32.h | 2 ++ savevm.c | 2 ++ 4 files changed, 25 insertions(+), 0 deletions(-) diff --git a/os-posix.c b/os-posix.c index 38c29d1..b163995 100644 --- a/os-posix.c +++ b/os-posix.c @@ -86,6 +86,25 @@ void os_setup_signal_handling(void) sigaction(SIGCHLD, &act, NULL); } +void os_stop_sigchld_handling(void) +{ + struct sigaction act; + + memset(&act, 0, sizeof(act)); + act.sa_handler = SIG_DFL; + sigaction(SIGCHLD, &act, NULL); +} + +void os_resume_sigchld_handling(void) +{ + struct sigaction act; + + memset(&act, 0, sizeof(act)); + act.sa_handler = sigchld_handler; + act.sa_flags = SA_NOCLDSTOP; + sigaction(SIGCHLD, &act, NULL); +} + /* Find a likely location for support files using the location of the binary. For installed binaries this will be "$bindir/../share/qemu". When running from the build tree this will be "$bindir/../pc-bios". */ diff --git a/qemu-os-posix.h b/qemu-os-posix.h index 81fd9ab..1c317f1 100644 --- a/qemu-os-posix.h +++ b/qemu-os-posix.h @@ -33,6 +33,8 @@ static inline void os_host_main_loop_wait(int *timeout) void os_set_line_buffering(void); void os_set_proc_name(const char *s); void os_setup_signal_handling(void); +void os_stop_sigchld_handling(void); +void os_resume_sigchld_handling(void); void os_daemonize(void); void os_setup_post(void); diff --git a/qemu-os-win32.h b/qemu-os-win32.h index 1a07e5e..f31c5ef 100644 --- a/qemu-os-win32.h +++ b/qemu-os-win32.h @@ -43,6 +43,8 @@ void qemu_del_wait_object(HANDLE handle, WaitObjectFunc *func, void *opaque); void os_host_main_loop_wait(int *timeout); static inline void os_setup_signal_handling(void) {} +static inline void os_stop_sigchld_handling(void) {} +static inline void os_resume_sigchld_handling(void) {} static inline void os_daemonize(void) {} static inline void os_setup_post(void) {} void os_set_line_buffering(void); diff --git a/savevm.c b/savevm.c index 90aa237..387b70b 100644 --- a/savevm.c +++ b/savevm.c @@ -234,7 +234,9 @@ static int stdio_pclose(void *opaque) { QEMUFileStdio *s = opaque; int ret; + os_stop_sigchld_handling(); ret = pclose(s->stdio_file); + os_resume_sigchld_handling(); qemu_free(s); return ret; }