From nobody Mon Sep 8 07:22:54 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=1753699062; cv=none; d=zohomail.com; s=zohoarc; b=RtubPyT37z2lC0FqOW2KBT4jMjx6AuKzd+uw7wBMS7DvQ4K8SZ9kDCPUonbJJiaJ7MtVA2DUqBfzic3qqxTYGGaqx8V7xa1j3Khq7zbcKdtb+kwdTBQFl+GEp7R0orvAeaw+zdiZVFIj5gpzC1xrhKAwoQFZp+ijtN+LWR0sxDI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753699062; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:Subject:Subject:To:To:Message-Id; bh=YShTnj4n6dookqJYUDDr5x3bGirGEW5YoGaPt3YR1UA=; b=bEmpP9K0PBfOGgQh2rsobiQ/WEWvL5InGdTFDo0E7rLNen46tKHMNA3bb9WoEby2NpmZ5zrM7Igl+TQKV5jaVwNajy87CsVe2cvcS7qlCYbHfkqCmkAlogOql9L1QW2J7+zW38DZGfe09yJyPjy0sKUDCT9MdtrAwmXXaM3jcJU= 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 1753699062299546.9306206071776; Mon, 28 Jul 2025 03:37:42 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3C7C7B45; Mon, 28 Jul 2025 06:37:41 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3FD04D0D; Mon, 28 Jul 2025 06:37:18 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id EC917C61; Mon, 28 Jul 2025 06:37:15 -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 67494C07 for ; Mon, 28 Jul 2025 06:37:15 -0400 (EDT) Received: from mx-prod-mc-03.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-627-FiRA9dWuNn2jh5-kDg83_w-1; Mon, 28 Jul 2025 06:37:13 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0CFD019560AF for ; Mon, 28 Jul 2025 10:37:13 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.32]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2DDCE1955F16; Mon, 28 Jul 2025 10:37:11 +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_PASS 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=1753699035; 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; bh=DNh0zCmwCg+QBeyJbDHKN091WYxOivjEw/lxjfJMGmc=; b=J2mbDo/0cSFcSJEZVeJMJx3UC8/ZSGFuCiTCrl0IJQ8mhcwF1JfePG4OL/dCrnzz8ZCMHY z0Cny4+wI8HUg6gDFTCEZGRJOeeyp0STJuUKMGwErDdiEY/6jad+rkIfCS87Ab3YnGFR23 TtfwIZPWQ/dKVxkVQ8uoe9UJJIJmw7s= X-MC-Unique: FiRA9dWuNn2jh5-kDg83_w-1 X-Mimecast-MFC-AGG-ID: FiRA9dWuNn2jh5-kDg83_w_1753699033 To: devel@lists.libvirt.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH] include: s/RECREATION/RECREATED/ in domain event names Date: Mon, 28 Jul 2025 11:37:10 +0100 Message-ID: <20250728103710.3415782-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Tg806JMBV6id9C9zRnA5ZWt1P-BbTk5wJcQQT5xeIZs_1753699033 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: XBEXQYIMNI3BIZVJKHESD2LFOQDLXHAH X-Message-ID-Hash: XBEXQYIMNI3BIZVJKHESD2LFOQDLXHAH X-MailFrom: berrange@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 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: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9_via_Devel?= Reply-To: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1753699064602116600 Content-Type: text/plain; charset="utf-8" From: Daniel P. Berrang=C3=A9 New event reasons were added in commit 1af740c5012bb45dfe96c77bcd6b20c28b6bb45d Author: Zhenzhong Duan Date: Thu Jul 10 03:21:21 2025 -0400 qemu: Send event VIR_DOMAIN_EVENT_[STOPPED|STARTED] during recreation but the naming did not match existing reason names, so adapt to match. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Martin Kletzander --- examples/c/misc/event-test.c | 8 ++++---- include/libvirt/libvirt-domain.h | 4 ++-- src/qemu/qemu_process.c | 4 ++-- tools/virsh-domain-event.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/c/misc/event-test.c b/examples/c/misc/event-test.c index bafa929c47..347ec44682 100644 --- a/examples/c/misc/event-test.c +++ b/examples/c/misc/event-test.c @@ -143,8 +143,8 @@ eventDetailToString(int event, case VIR_DOMAIN_EVENT_STARTED_WAKEUP: return "Event wakeup"; =20 - case VIR_DOMAIN_EVENT_STARTED_RECREATION: - return "Recreation"; + case VIR_DOMAIN_EVENT_STARTED_RECREATED: + return "Recreated"; =20 case VIR_DOMAIN_EVENT_STARTED_LAST: break; @@ -230,8 +230,8 @@ eventDetailToString(int event, case VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT: return "Snapshot"; =20 - case VIR_DOMAIN_EVENT_STOPPED_RECREATION: - return "Recreation"; + case VIR_DOMAIN_EVENT_STOPPED_RECREATED: + return "Recreated"; =20 case VIR_DOMAIN_EVENT_STOPPED_LAST: break; diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-dom= ain.h index fad58cf409..1811c55005 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -5051,7 +5051,7 @@ typedef enum { VIR_DOMAIN_EVENT_STARTED_RESTORED =3D 2, /* Restored from a state file= (Since: 0.5.0) */ VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT =3D 3, /* Restored from snapsho= t (Since: 0.8.0) */ VIR_DOMAIN_EVENT_STARTED_WAKEUP =3D 4, /* Started due to wakeup even= t (Since: 0.9.11) */ - VIR_DOMAIN_EVENT_STARTED_RECREATION =3D 5, /* Secure guest recreation = (Since: 10.1.0) */ + VIR_DOMAIN_EVENT_STARTED_RECREATED =3D 5, /* Secure guest recreation (= Since: 10.1.0) */ =20 # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_EVENT_STARTED_LAST /* (Since: 0.9.10) */ @@ -5116,7 +5116,7 @@ typedef enum { VIR_DOMAIN_EVENT_STOPPED_SAVED =3D 4, /* Saved to a state file (Si= nce: 0.5.0) */ VIR_DOMAIN_EVENT_STOPPED_FAILED =3D 5, /* Host emulator/mgmt failed= (Since: 0.5.0) */ VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT =3D 6, /* offline snapshot load= ed (Since: 0.8.0) */ - VIR_DOMAIN_EVENT_STOPPED_RECREATION =3D 7, /* Secure guest recreati= on (Since: 10.1.0) */ + VIR_DOMAIN_EVENT_STOPPED_RECREATED =3D 7, /* Secure guest recreatio= n (Since: 10.1.0) */ =20 # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_EVENT_STOPPED_LAST /* (Since: 0.9.10) */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 8f3d357b9f..6b7b971f27 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -476,7 +476,7 @@ qemuProcessFakeRebootViaRecreate(virDomainObj *vm, bool= locked) =20 event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_REC= REATION); + VIR_DOMAIN_EVENT_STOPPED_REC= REATED); virObjectEventStateQueue(driver->domainEventState, event); =20 /* skip remove inactive domain from active list */ @@ -501,7 +501,7 @@ qemuProcessFakeRebootViaRecreate(virDomainObj *vm, bool= locked) virDomainAuditStart(vm, "booted", true); event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STARTED, - VIR_DOMAIN_EVENT_STARTED_REC= REATION); + VIR_DOMAIN_EVENT_STARTED_REC= REATED); virObjectEventStateQueue(driver->domainEventState, event); =20 qemuDomainSaveStatus(vm); diff --git a/tools/virsh-domain-event.c b/tools/virsh-domain-event.c index 21dbf6e1d2..a47fdfc7fd 100644 --- a/tools/virsh-domain-event.c +++ b/tools/virsh-domain-event.c @@ -72,7 +72,7 @@ VIR_ENUM_IMPL(virshDomainEventStarted, N_("Restored"), N_("Snapshot"), N_("Event wakeup"), - N_("Recreation")); + N_("Recreated")); =20 VIR_ENUM_DECL(virshDomainEventSuspended); VIR_ENUM_IMPL(virshDomainEventSuspended, @@ -106,7 +106,7 @@ VIR_ENUM_IMPL(virshDomainEventStopped, N_("Saved"), N_("Failed"), N_("Snapshot"), - N_("Recreation")); + N_("Recreated")); =20 VIR_ENUM_DECL(virshDomainEventShutdown); VIR_ENUM_IMPL(virshDomainEventShutdown, --=20 2.50.1