From nobody Fri Dec 19 08:14:28 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; 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 8.43.85.245 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=1742913418; cv=none; d=zohomail.com; s=zohoarc; b=d+o62TSNGrpxjWODrbU8/kob5eNReodwPIKtEE4EAWpn9HbBqJpVgYyrAGhHR0p292VvfaYJnko1HwCnOlNEGrZnFFsSfbXmA/j7lGqXaQ1b3z4XVLWTH3oqzN7+9m5R1j4R9HATdOeSBqBLfrbGm9BYIRhTCCkBnsO3bIv7L0Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742913418; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=v7YUoz20TfxlNF5r7rhaoHCyrMmIbvrVDC9BLMmweCU=; b=Xa4vlh9W7Lmd+yfOEwjMwiodDObUgG70XEy2zmeimyXdCCKjrpdxxg49d2pDmey/F99hlApcu4UiMdDRlTsAb9G3luQlQnsdgH0KKB5pfDgYADPEZMRQY0O6qCaaW0sHvcIfWETG/IQIvHNhokwNaun8FTSHbkk6o81k+K+sNuc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 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 [8.43.85.245]) by mx.zohomail.com with SMTPS id 1742913418885892.3544805606188; Tue, 25 Mar 2025 07:36:58 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 53B351291; Tue, 25 Mar 2025 10:36:58 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 86B1D16AD; Tue, 25 Mar 2025 10:35:44 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 88D1F149B; Tue, 25 Mar 2025 10:35:40 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 21C52154B for ; Tue, 25 Mar 2025 10:35:31 -0400 (EDT) Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-73-Dk3KzjaUNYifQitnpBU18Q-1; Tue, 25 Mar 2025 10:35:29 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5DEE9196B373 for ; Tue, 25 Mar 2025 14:35:28 +0000 (UTC) Received: from kshcheti-thinkpadp1gen4i.tpbc.com (unknown [10.43.2.246]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 70F9E1801756; Tue, 25 Mar 2025 14:35:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742913330; 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=czX7x8JdEQgC9C+ckLaqs8U3vS0G2ZasY2i/m1AFNww=; b=KleE+GkmEHhnwIZcmYdkikzJDjNKh7jbQtpXB2Wyss03AegrjBqHwtKuFx0aYh3TLck6V6 aYVJTdoTHcmWaFq9atcKN2wULgqiaBE+oN9NwjIX0j4MK8mr7x1HcyyOuA3zoN4f41uYGg UmSu/xw8lO5oCrq4p8HjPDBQNf11d3s= X-MC-Unique: Dk3KzjaUNYifQitnpBU18Q-1 X-Mimecast-MFC-AGG-ID: Dk3KzjaUNYifQitnpBU18Q_1742913328 To: devel@lists.libvirt.org Subject: [PATCH 3/3] ch: virCHProcessEvent() vm shutdown event handler fix Date: Tue, 25 Mar 2025 15:11:59 +0100 Message-ID: <20250325143501.728342-4-kshcheti@redhat.com> In-Reply-To: <20250325143501.728342-1-kshcheti@redhat.com> References: <20250325143501.728342-1-kshcheti@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: F7eafR1ORAPMDjBKQwbswSVTzQibZ2EDKnJ8-mDpF1c_1742913328 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: A4S7AQV6QR4T7OO23CU3FZSITZSKD4EM X-Message-ID-Hash: A4S7AQV6QR4T7OO23CU3FZSITZSKD4EM X-MailFrom: kshcheti@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Kirill Shchetiniuk X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Kirill Shchetiniuk via Devel Reply-To: Kirill Shchetiniuk X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1742913419882019000 Content-Type: text/plain; charset="utf-8"; x-default="true" When the domain shutdown was executed from virsh, only the VM process (a child of the CH monitor) was terminated. Since we assume only one VM per monitor, the monitor process should also be terminated. Modified the VM shutdown event handler to match the VMM shutdown behavior, ensuring the VM monitor stops along with the VM. Also updated the virCHEventStopProcess job type, as it only destroys the domain rather than modifying anything. Signed-off-by: Kirill Shchetiniuk --- src/ch/ch_events.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/ch/ch_events.c b/src/ch/ch_events.c index 32846ba4e5..f1dc5c6f4c 100644 --- a/src/ch/ch_events.c +++ b/src/ch/ch_events.c @@ -57,7 +57,7 @@ virCHEventStopProcess(virDomainObj *vm, virCHDriver *driver =3D ((virCHDomainObjPrivate *)vm->privateData)->d= river; =20 virObjectLock(vm); - if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY)) + if (virDomainObjBeginJob(vm, VIR_JOB_DESTROY)) return -1; virCHProcessStop(driver, vm, reason); virDomainObjEndJob(vm); @@ -108,17 +108,13 @@ virCHProcessEvent(virCHMonitor *mon, case VIR_CH_EVENT_VM_DELETED: break; case VIR_CH_EVENT_VMM_SHUTDOWN: + case VIR_CH_EVENT_VM_SHUTDOWN: if (virCHEventStopProcess(vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN)) { VIR_WARN("Failed to mark the VM(%s) as SHUTDOWN!", vm->def->name); ret =3D -1; } break; - case VIR_CH_EVENT_VM_SHUTDOWN: - virObjectLock(vm); - virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, VIR_DOMAIN_SHUTOFF_SH= UTDOWN); - virObjectUnlock(vm); - break; case VIR_CH_EVENT_VM_REBOOTED: virObjectLock(vm); virCHProcessUpdateInfo(vm); --=20 2.48.1