From nobody Tue Sep 22 10:51:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1783604847; cv=none; d=zohomail.com; s=zohoarc; b=n3nYjF1pOJ/Sg+TJfTncbOKzu5JNcBtpOhx9cFnT0OuAfdN/9Nju29cQOp8KiJjpGIMrBjnQ+b3q1gbdfbzTkhlqhh+0kTTq8bpXsBSSdItqSMIZV07q53QPIuIXW4KRERowuOv1aBxeU2slwn65E8g02MKkuUYLISoJfnKGxXg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1783604847; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=OD1X96Pt1qGWhn57eiE7YXIHZo4UHarM6G02PAWFQ2U=; b=O0tue9pUaGtFWfVdua8IvosVXxFo7LypaZXCKE8Q/7OyJjjsBtq5ySTkhYjDb4hpRiq5WyEFO4yiW7xBsI46QUF3/UP0mje5INqmNzxGO1BmGls5GN4nGb7g7XUcuZns00QqK70iDD3OeZoHQMHirsAT6OYYlg6QeC8IV91G33w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1783604847310771.3816845386217; Thu, 9 Jul 2026 06:47:27 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 15DE641BB9; Thu, 9 Jul 2026 09:47:25 -0400 (EDT) Received: from [172.19.199.10] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 203F4423D1; Thu, 9 Jul 2026 09:41:17 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 1C3D741AA9; Thu, 9 Jul 2026 09:38:29 -0400 (EDT) Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 503BA41AA9 for ; Thu, 9 Jul 2026 09:38:28 -0400 (EDT) Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=mami) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1whogz-006MF9-2N for devel@lists.libvirt.org; Thu, 09 Jul 2026 15:22:33 +0200 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=OD1X96Pt1qGWhn57eiE7YXIHZo4UHarM6G02PAWFQ2U=; b=bZle7UcpFfZO Kce6yBU3BzgW6QeshQ9vNEMvHHuFa754DxQS9+eqkR7xcZKgBIiuTCcAdI1LmDPUJpOg0q56meU9v 3gM6OUNNuruXxp0uG+mIjBIF/VOd3at9Di7S0OJYwQhsizVRRMo6kntcxAeU4Lcd8fvu5i/pLokbr lFzP75LPuS1FL5NvMp3JdRdvI88sMrQMPBo+x51NoyluhBDUO2dDfE2AD2Z79dUYTsV8VgRkiW7T0 pJw0mUtXTaEftgm93ECmxca/aULT3LdOTS4yRS/338KrRZk65qw0QymDqDrXPyPyim3M+zAi5bIFK /La+3fmS0wkYTDVR0T5lDw==; To: devel@lists.libvirt.org Subject: [PATCH 2/6] qemu: Extract qemuProcessResetAgent helper Date: Thu, 9 Jul 2026 15:15:15 +0200 Message-ID: <20260709132213.2392145-3-polina.vishneva@virtuozzo.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260709132213.2392145-1-polina.vishneva@virtuozzo.com> References: <20260709132213.2392145-1-polina.vishneva@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MailFrom: polina.vishneva@virtuozzo.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation Message-ID-Hash: JMSVRGBMZNROYENTVDBILYZM7QGNYHYV X-Message-ID-Hash: JMSVRGBMZNROYENTVDBILYZM7QGNYHYV X-Mailman-Approved-At: Thu, 09 Jul 2026 13:40:43 +0000 X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Polina Vishneva via Devel Reply-To: Polina Vishneva X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1783604849301158500 Content-Type: text/plain; charset="utf-8" Several paths repeat the same guest-agent teardown sequence; extract it into one helper so it stays in sync. Signed-off-by: Polina Vishneva --- src/qemu/qemu_driver.c | 5 +---- src/qemu/qemu_process.c | 15 +++++++++++---- src/qemu/qemu_process.h | 2 ++ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8ec9e1f9c4..0edc568bd7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3929,10 +3929,7 @@ processSerialChangedEvent(virQEMUDriver *driver, if (qemuConnectAgent(driver, vm) < 0) goto endjob; } else { - if (priv->agent) { - g_clear_pointer(&priv->agent, qemuAgentClose); - } - priv->agentError =3D false; + qemuProcessResetAgent(vm); } =20 agentEvent =3D virDomainEventAgentLifecycleNewFromObj(vm, newstate, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 4c94ff3c91..77d9880d14 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -140,6 +140,16 @@ qemuProcessRemoveDomainStatus(virQEMUDriver *driver, } =20 =20 +void +qemuProcessResetAgent(virDomainObj *vm) +{ + qemuDomainObjPrivate *priv =3D vm->privateData; + + g_clear_pointer(&priv->agent, qemuAgentClose); + priv->agentError =3D false; +} + + /* * This is a callback registered with a qemuAgent *instance, * and to be invoked when the agent console hits an end of file @@ -9401,10 +9411,7 @@ qemuProcessStop(virDomainObj *vm, virObjectLock(vm); } =20 - if (priv->agent) { - g_clear_pointer(&priv->agent, qemuAgentClose); - } - priv->agentError =3D false; + qemuProcessResetAgent(vm); =20 if (priv->mon) { g_clear_pointer(&priv->mon, qemuMonitorClose); diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 5874214596..3fc9f844d3 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -210,6 +210,8 @@ virDomainDiskDef *qemuProcessFindDomainDiskByAliasOrQOM= (virDomainObj *vm, =20 int qemuConnectAgent(virQEMUDriver *driver, virDomainObj *vm); =20 +void qemuProcessResetAgent(virDomainObj *vm); + =20 int qemuProcessSetupVcpu(virDomainObj *vm, unsigned int vcpuid, --=20 2.54.0