From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56681) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLsfE-0004b8-AA for qemu-devel@nongnu.org; Thu, 24 May 2018 12:00:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fLsf8-00047x-CQ for qemu-devel@nongnu.org; Thu, 24 May 2018 12:00:28 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:33448 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fLsf8-00046H-7d for qemu-devel@nongnu.org; Thu, 24 May 2018 12:00:22 -0400 Date: Thu, 24 May 2018 19:00:21 +0300 From: "Michael S. Tsirkin" Message-ID: <20180524185656-mutt-send-email-mst@kernel.org> References: <1527176250-178968-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: Re: [Qemu-devel] [PATCH v2 2/1] libqtest: add more exit status checks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake Cc: qemu-devel@nongnu.org, Thomas Huth , Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= , Markus Armbruster On Thu, May 24, 2018 at 10:52:26AM -0500, Eric Blake wrote: > On 05/24/2018 10:38 AM, Michael S. Tsirkin wrote: > > Add more checks on how did QEMU exit. > > > > Legal ways to exit right now: > > - exit(0) or return from main > > - kill(SIGTERM) - sent by testing infrastructure > > > > Signed-off-by: Michael S. Tsirkin > > --- > > > > Changes from v1: > > - drop SIGTERM as suggested by Eric > > > > > +++ b/tests/libqtest.c > > @@ -110,7 +110,12 @@ static void kill_qemu(QTestState *s) > > pid = waitpid(s->qemu_pid, &wstatus, 0); > > if (pid == s->qemu_pid && WIFSIGNALED(wstatus)) { > > Wait a moment. If WIFSIGNALED() is true... > > > + /* Core dump is never OK */ > > assert(!WCOREDUMP(wstatus)); > > + /* Must exit normally */ > > + assert(WIFEXITED(wstatus)); > > ...then WIFEXITED() is false. This is bogus. > > > + /* If exited normally - check exit status */ > > + assert(!WIFEXITED(wstatus) || !WEXITSTATUS(wstatus)); > > And you have some redundancy - !WIFEXITED() is not possible if you just > asserted WIFEXITED(). > > Better would be: > > if (pid == s->qemu_pid) { > /* > * Since sending SIGTERM turns into a normal exit, we want to flag > * any non-normal exit, whether or not it dumped core, as a test > * failure (even if it was a SIGKILL from someone desperate to stop > * the testsuite). > */ > assert(WIFEXITED(wstatus) && !WEXITSTATUS(wstatus)); > } > > Also, since waitpid() can only return either s->qemu_pid or -1 as we aren't > using WNOHANG, > it may also be worth asserting that if pid == -1, we either > have EAGAIN (but why aren't we looping in that case?) I don't think waitpid can return EAGAIN > or ECHILD. Right but checking for known failures explicitly is helpful for debugging. > -- > Eric Blake, Principal Software Engineer > Red Hat, Inc. +1-919-301-3266 > Virtualization: qemu.org | libvirt.org