NuKVM/libvirt
3
0 Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2026-10-02 12:20:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

include: s/RECREATION/RECREATED/ in domain event names

Browse Source 
New event reasons were added in

  commit 1af740c501
  Author: Zhenzhong Duan <zhenzhong.duan@intel.com>
  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. The version tags are also updated to reflect when
this was merged.

Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé committed 2025-07-28 13:46:25 +01:00
1 parent ff43c139d3
commit c4c1ad0692
4 files changed
+10 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

examples/c/misc/event-test.c
+4 -4
View File
@@ -143,8 +143,8 @@ eventDetailToString(int event,
case VIR_DOMAIN_EVENT_STARTED_WAKEUP:
return "Event wakeup";
case VIR_DOMAIN_EVENT_STARTED_RECREATION:
return "Recreation";
case VIR_DOMAIN_EVENT_STARTED_RECREATED:
return "Recreated";
case VIR_DOMAIN_EVENT_STARTED_LAST:
break;
@@ -230,8 +230,8 @@ eventDetailToString(int event,
case VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT:
return "Snapshot";
case VIR_DOMAIN_EVENT_STOPPED_RECREATION:
return "Recreation";
case VIR_DOMAIN_EVENT_STOPPED_RECREATED:
return "Recreated";
case VIR_DOMAIN_EVENT_STOPPED_LAST:
break;
include/libvirt/libvirt-domain.h
+2 -2
View File
@@ -5051,7 +5051,7 @@ typedef enum {
VIR_DOMAIN_EVENT_STARTED_RESTORED = 2, /* Restored from a state file (Since: 0.5.0) */
VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT = 3, /* Restored from snapshot (Since: 0.8.0) */
VIR_DOMAIN_EVENT_STARTED_WAKEUP = 4, /* Started due to wakeup event (Since: 0.9.11) */
VIR_DOMAIN_EVENT_STARTED_RECREATION = 5, /* Secure guest recreation (Since: 10.1.0) */
VIR_DOMAIN_EVENT_STARTED_RECREATED = 5, /* Secure guest recreation (Since: 11.6.0) */
# ifdef VIR_ENUM_SENTINELS
VIR_DOMAIN_EVENT_STARTED_LAST /* (Since: 0.9.10) */
@@ -5116,7 +5116,7 @@ typedef enum {
VIR_DOMAIN_EVENT_STOPPED_SAVED = 4, /* Saved to a state file (Since: 0.5.0) */
VIR_DOMAIN_EVENT_STOPPED_FAILED = 5, /* Host emulator/mgmt failed (Since: 0.5.0) */
VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT = 6, /* offline snapshot loaded (Since: 0.8.0) */
VIR_DOMAIN_EVENT_STOPPED_RECREATION = 7, /* Secure guest recreation (Since: 10.1.0) */
VIR_DOMAIN_EVENT_STOPPED_RECREATED = 7, /* Secure guest recreation (Since: 11.6.0) */
# ifdef VIR_ENUM_SENTINELS
VIR_DOMAIN_EVENT_STOPPED_LAST /* (Since: 0.9.10) */
src/qemu/qemu_process.c
+2 -2
View File
@@ -476,7 +476,7 @@ qemuProcessFakeRebootViaRecreate(virDomainObj *vm, bool locked)
event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_RECREATION);
VIR_DOMAIN_EVENT_STOPPED_RECREATED);
virObjectEventStateQueue(driver->domainEventState, event);
/* skip remove inactive domain from active list */
@@ -501,7 +501,7 @@ qemuProcessFakeRebootViaRecreate(virDomainObj *vm, bool locked)
virDomainAuditStart(vm, "booted", true);
event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_RECREATION);
VIR_DOMAIN_EVENT_STARTED_RECREATED);
virObjectEventStateQueue(driver->domainEventState, event);
qemuDomainSaveStatus(vm);
tools/virsh-domain-event.c
+2 -2
View File
@@ -72,7 +72,7 @@ VIR_ENUM_IMPL(virshDomainEventStarted,
N_("Restored"),
N_("Snapshot"),
N_("Event wakeup"),
N_("Recreation"));
N_("Recreated"));
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"));
VIR_ENUM_DECL(virshDomainEventShutdown);
VIR_ENUM_IMPL(virshDomainEventShutdown,