From nobody Wed Nov 12 05:28:12 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568297582; cv=none; d=zoho.com; s=zohoarc; b=YWuBqwEVaV1q33m3+e9x11tyJ4h1zMwMyZQGfJCN3PeSi64DNMAH7BY1j+DbfxHQARFxu2v4Ym0aJotWqwCREngVyAeUd42zMgML6h8wjkeAgwsKyN3JSS73/FTO8tNiq9VacCfNoji+uTbND7UHf+93mK5zunS1lnPkICPSLoQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568297582; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=yfQGemEnxwcbOAasvmIJrH7W9BbuWiLFJARknx4F3e0=; b=NS8fkJTSgUyAzTfa/pVw0qdq27aVs87lJkTiM2tniFr351kL6kVdtZdh7y3WN+bQLKSMPT38hMDLrgrYsnuSDwF6rlCqYtv4fUlIkGQ1giKwjyDdfwApEl0mXbc2e+1QCXKg+sKRknJUxmf3Af2fzjXlJ92+fQ6lwxZLle5i4Rw= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568297582216982.2385201593055; Thu, 12 Sep 2019 07:13:02 -0700 (PDT) Received: from localhost ([::1]:34930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8PqE-0005T0-Iz for importer@patchew.org; Thu, 12 Sep 2019 10:12:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40602) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8PUs-0007Bu-Ao for qemu-devel@nongnu.org; Thu, 12 Sep 2019 09:50:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i8PUq-0003Cb-UV for qemu-devel@nongnu.org; Thu, 12 Sep 2019 09:50:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45310) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i8PUq-0003Bf-KF for qemu-devel@nongnu.org; Thu, 12 Sep 2019 09:50:52 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E067718C4274; Thu, 12 Sep 2019 13:50:51 +0000 (UTC) Received: from dgilbert-t580.localhost (unknown [10.36.118.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3CFB95D704; Thu, 12 Sep 2019 13:50:48 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, ivanren@tencent.com, peterx@redhat.com, richardw.yang@linux.intel.com, yury-kotov@yandex-team.ru, quintela@redhat.com Date: Thu, 12 Sep 2019 14:50:01 +0100 Message-Id: <20190912135006.14820-8-dgilbert@redhat.com> In-Reply-To: <20190912135006.14820-1-dgilbert@redhat.com> References: <20190912135006.14820-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Thu, 12 Sep 2019 13:50:51 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 07/12] tests/libqtest: Allow setting expected exit status X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Yury Kotov Add qtest_set_expected_status function to set expected exit status of child process. By default expected exit status is 0. Signed-off-by: Yury Kotov Message-Id: <20190903162246.18524-3-yury-kotov@yandex-team.ru> Acked-by: Thomas Huth Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Dr. David Alan Gilbert --- tests/libqtest.c | 36 +++++++++++++++++++++--------------- tests/libqtest.h | 9 +++++++++ 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index 0a6b91737e..4a7556462d 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -41,6 +41,7 @@ struct QTestState int qmp_fd; pid_t qemu_pid; /* our child QEMU process */ int wstatus; + int expected_status; bool big_endian; bool irq_level[MAX_IRQ]; GString *rx; @@ -111,6 +112,11 @@ bool qtest_probe_child(QTestState *s) return false; } =20 +void qtest_set_expected_status(QTestState *s, int status) +{ + s->expected_status =3D status; +} + static void kill_qemu(QTestState *s) { pid_t pid =3D s->qemu_pid; @@ -124,24 +130,23 @@ static void kill_qemu(QTestState *s) } =20 /* - * We expect qemu to exit with status 0; anything else is + * Check whether qemu exited with expected exit status; anything else = is * fishy and should be logged with as much detail as possible. */ wstatus =3D s->wstatus; - if (wstatus) { - if (WIFEXITED(wstatus)) { - fprintf(stderr, "%s:%d: kill_qemu() tried to terminate QEMU " - "process but encountered exit status %d\n", - __FILE__, __LINE__, WEXITSTATUS(wstatus)); - } else if (WIFSIGNALED(wstatus)) { - int sig =3D WTERMSIG(wstatus); - const char *signame =3D strsignal(sig) ?: "unknown ???"; - const char *dump =3D WCOREDUMP(wstatus) ? " (core dumped)" : "= "; - - fprintf(stderr, "%s:%d: kill_qemu() detected QEMU death " - "from signal %d (%s)%s\n", - __FILE__, __LINE__, sig, signame, dump); - } + if (WIFEXITED(wstatus) && WEXITSTATUS(wstatus) !=3D s->expected_status= ) { + fprintf(stderr, "%s:%d: kill_qemu() tried to terminate QEMU " + "process but encountered exit status %d (expected %d)\n", + __FILE__, __LINE__, WEXITSTATUS(wstatus), s->expected_stat= us); + abort(); + } else if (WIFSIGNALED(wstatus)) { + int sig =3D WTERMSIG(wstatus); + const char *signame =3D strsignal(sig) ?: "unknown ???"; + const char *dump =3D WCOREDUMP(wstatus) ? " (core dumped)" : ""; + + fprintf(stderr, "%s:%d: kill_qemu() detected QEMU death " + "from signal %d (%s)%s\n", + __FILE__, __LINE__, sig, signame, dump); abort(); } } @@ -246,6 +251,7 @@ QTestState *qtest_init_without_qmp_handshake(const char= *extra_args) g_test_message("starting QEMU: %s", command); =20 s->wstatus =3D 0; + s->expected_status =3D 0; s->qemu_pid =3D fork(); if (s->qemu_pid =3D=3D 0) { setenv("QEMU_AUDIO_DRV", "none", true); diff --git a/tests/libqtest.h b/tests/libqtest.h index c8cffe5d68..a177e502d9 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -708,4 +708,13 @@ void qmp_assert_error_class(QDict *rsp, const char *cl= ass); */ bool qtest_probe_child(QTestState *s); =20 +/** + * qtest_set_expected_status: + * @s: QTestState instance to operate on. + * @status: an expected exit status. + * + * Set expected exit status of the child. + */ +void qtest_set_expected_status(QTestState *s, int status); + #endif --=20 2.21.0