From nobody Tue Nov 18 04:25:28 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1607365627; cv=none; d=zohomail.com; s=zohoarc; b=b3dNB18TwRODGJ1V8fBnO0nbaQu6CqZTvjzq+TUo1q5GVa8u5R++TV/8D4KNeOZDHWiOXL+qNqFtiF2czGim3R4rAHEplJjqUOyqk4ZVXi06EXxTwK711U0I7ea5mWO3C1gN58ZxtEXFQ1swAziEXLOwabelO7B4prrmUVet+Rg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607365627; h=Content-Type:Content-Transfer-Encoding:Cc: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; bh=mCiZaM28lfZG1PeWK0dkKTsEqfZ+eX95FyupjddJxpQ=; b=h1RLPzIjiHBdQC075pCF3rzVdac84oJFfpcjG4iEhVmMYobhOpYryQKZVp6EOe/E6B5it7EyVEekWjZcnG89gdYgIkilwGpFh9lqitORi35eVTgLWCLWV7loVPDyUkr7yxLm2TFHmSKFobKLpFhgwNX5oQX+Asz3SuWNyIxAPj0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1607365627181456.9774181657973; Mon, 7 Dec 2020 10:27:07 -0800 (PST) Received: from localhost ([::1]:40988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmKMu-00065k-EK for importer@patchew.org; Mon, 07 Dec 2020 12:32:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46548) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmKFt-0000mQ-Dg for qemu-devel@nongnu.org; Mon, 07 Dec 2020 12:24:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:56579) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kmKFr-0006wi-AG for qemu-devel@nongnu.org; Mon, 07 Dec 2020 12:24:57 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-249-dzptBeBJNyydeSVXodRP9A-1; Mon, 07 Dec 2020 12:24:53 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D5D6A1842141; Mon, 7 Dec 2020 17:24:51 +0000 (UTC) Received: from localhost (ovpn-114-128.ams2.redhat.com [10.36.114.128]) by smtp.corp.redhat.com (Postfix) with ESMTP id 914D260BD8; Mon, 7 Dec 2020 17:24:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607361894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mCiZaM28lfZG1PeWK0dkKTsEqfZ+eX95FyupjddJxpQ=; b=FQOlZRySHv38BBYmwdXueVnIP3ItRCwkV5s2cPJ3s95ZrEJWpvbt6FDrCdFAo1xkhn7eEr CXyiOHB/X0cruL58EMpd+5gwCZpUaw8GQNWmeAB0IHtaOXOp5pyN1dgosqBJOv04tYbdnA 2mzND29A8Wwawd42SSZT9faNc77LVuM= X-MC-Unique: dzptBeBJNyydeSVXodRP9A-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH v2 03/12] libqtest: add qtest_kill_qemu() Date: Mon, 7 Dec 2020 17:20:21 +0000 Message-Id: <20201207172030.251905-4-stefanha@redhat.com> In-Reply-To: <20201207172030.251905-1-stefanha@redhat.com> References: <20201207172030.251905-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Cc: Laurent Vivier , Kevin Wolf , Thomas Huth , qemu-block@nongnu.org, Peter Maydell , "Michael S . Tsirkin" , Coiby Xu , Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Raphael Norwitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Tests that manage multiple processes may wish to kill QEMU before destroying the QTestState. Expose a function to do that. The vhost-user-blk-test testcase will need this. Signed-off-by: Stefan Hajnoczi Reviewed-by: Wainer dos Santos Moschetta --- tests/qtest/libqos/libqtest.h | 11 +++++++++++ tests/qtest/libqtest.c | 7 ++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tests/qtest/libqos/libqtest.h b/tests/qtest/libqos/libqtest.h index e5f1ec590c..51287b9276 100644 --- a/tests/qtest/libqos/libqtest.h +++ b/tests/qtest/libqos/libqtest.h @@ -74,6 +74,17 @@ QTestState *qtest_init_without_qmp_handshake(const char = *extra_args); */ QTestState *qtest_init_with_serial(const char *extra_args, int *sock_fd); =20 +/** + * qtest_kill_qemu: + * @s: #QTestState instance to operate on. + * + * Kill the QEMU process and wait for it to terminate. It is safe to call = this + * function multiple times. Normally qtest_quit() is used instead because = it + * also frees QTestState. Use qtest_kill_qemu() when you just want to kill= QEMU + * and qtest_quit() will be called later. + */ +void qtest_kill_qemu(QTestState *s); + /** * qtest_quit: * @s: #QTestState instance to operate on. diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index bc389d422b..cc2cec4a35 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -133,7 +133,7 @@ void qtest_set_expected_status(QTestState *s, int statu= s) s->expected_status =3D status; } =20 -static void kill_qemu(QTestState *s) +void qtest_kill_qemu(QTestState *s) { pid_t pid =3D s->qemu_pid; int wstatus; @@ -143,6 +143,7 @@ static void kill_qemu(QTestState *s) kill(pid, SIGTERM); TFR(pid =3D waitpid(s->qemu_pid, &s->wstatus, 0)); assert(pid =3D=3D s->qemu_pid); + s->qemu_pid =3D -1; } =20 /* @@ -169,7 +170,7 @@ static void kill_qemu(QTestState *s) =20 static void kill_qemu_hook_func(void *s) { - kill_qemu(s); + qtest_kill_qemu(s); } =20 static void sigabrt_handler(int signo) @@ -373,7 +374,7 @@ void qtest_quit(QTestState *s) /* Uninstall SIGABRT handler on last instance */ cleanup_sigabrt_handler(); =20 - kill_qemu(s); + qtest_kill_qemu(s); close(s->fd); close(s->qmp_fd); g_string_free(s->rx, true); --=20 2.28.0