0f2ee777b8
- qemu: Always assume support for 'QEMU_CAPS_SET_ACTION' (RHEL-242546) - qemu: Remove unused 'qemuProcessRebootAllowed' (RHEL-242546) - qemu: monitor: Remove support for 'watchdog-set-action' (RHEL-242546) - qemu: Remove 'allowReboot' field (RHEL-242546) - qemu: capabilities: Retire QEMU_CAPS_SET_ACTION (RHEL-242546) - qemuProcessSetupLifecycleActions: Prepare to handle other actions (RHEL-242546) - qemuDomainModifyLifecycleActionLive: Prepare to handle other actions (RHEL-242546) - processGuestPanicEvent: Don't pass panic action via parameter (RHEL-242546) - conf: Use proper enum types for 'onReboot', 'onPoweroff', 'onCrash', and 'onLockFailure' (RHEL-242546) - qemuMonitorGuestPanicEventInfoFormatMsg: Directly return message (RHEL-242546) - qemuProcessGuestPanicEventInfo: Fold into only caller (RHEL-242546) - qemu: processGuestPanicEvent: Split individual steps under separate conditions (RHEL-242546) - Add support for keeping VM running when panic notifier is used (RHEL-242546) - qemu: Fix proper ordering of 'virtlockd' shutdown (RHEL-180876) - Add guest device info to virDomainGetGuestInfo (RHEL-243300) - qemu_agent: Introduce guest-get-devices (RHEL-243300) - qemuagenttest: Introduce GetGuestDeviceInfo test case (RHEL-243300) - qemu: Implement device info for virDomainGetGuestInfo() API (RHEL-243300) - virsh: Add support for VIR_DOMAIN_GUEST_INFO_DEVICES (RHEL-243300) Resolves: RHEL-180876, RHEL-242546, RHEL-243300
138 lines
4.7 KiB
Diff
138 lines
4.7 KiB
Diff
From 1dac70d29c2782687113be80990c29389cfda28e Mon Sep 17 00:00:00 2001
|
|
Message-ID: <1dac70d29c2782687113be80990c29389cfda28e.1787144643.git.jdenemar@redhat.com>
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
Date: Tue, 21 Jul 2026 10:21:50 +0200
|
|
Subject: [PATCH] conf: Use proper enum types for 'onReboot', 'onPoweroff',
|
|
'onCrash', and 'onLockFailure'
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This ensures that 'switch' statements work correctly.
|
|
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
(cherry picked from commit 997b9816dcaef7ed0d7fdbfe4f1b2354b1b82c58)
|
|
|
|
https://redhat.atlassian.net/browse/RHEL-242546
|
|
---
|
|
src/conf/domain_conf.c | 10 ++++++----
|
|
src/conf/domain_conf.h | 9 ++++-----
|
|
src/libxl/xen_common.c | 10 +++++++---
|
|
src/qemu/qemu_driver.c | 2 ++
|
|
4 files changed, 19 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
|
index 47200d27c5..7097ff7065 100644
|
|
--- a/src/conf/domain_conf.c
|
|
+++ b/src/conf/domain_conf.c
|
|
@@ -14078,21 +14078,23 @@ static int
|
|
virDomainEventActionParseXML(xmlXPathContextPtr ctxt,
|
|
const char *name,
|
|
const char *xpath,
|
|
- int *val,
|
|
- int defaultVal,
|
|
+ unsigned int *val,
|
|
+ unsigned int defaultVal,
|
|
virEventActionFromStringFunc convFunc)
|
|
{
|
|
g_autofree char *tmp = virXPathString(xpath, ctxt);
|
|
+ int tmpval;
|
|
|
|
if (tmp == NULL) {
|
|
*val = defaultVal;
|
|
} else {
|
|
- *val = convFunc(tmp);
|
|
- if (*val < 0) {
|
|
+ tmpval = convFunc(tmp);
|
|
+ if (tmpval < 0) {
|
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
_("unknown %1$s action: %2$s"), name, tmp);
|
|
return -1;
|
|
}
|
|
+ *val = tmpval;
|
|
}
|
|
return 0;
|
|
}
|
|
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
|
|
index 3a1a2fdce1..fc7584b6c1 100644
|
|
--- a/src/conf/domain_conf.h
|
|
+++ b/src/conf/domain_conf.h
|
|
@@ -3217,12 +3217,11 @@ struct _virDomainDef {
|
|
virDomainResourceDef *resource;
|
|
virDomainIdMapDef idmap;
|
|
|
|
- /* These 3 are based on virDomainLifecycleAction enum flags */
|
|
- int onReboot;
|
|
- int onPoweroff;
|
|
- int onCrash;
|
|
+ virDomainLifecycleAction onReboot;
|
|
+ virDomainLifecycleAction onPoweroff;
|
|
+ virDomainLifecycleAction onCrash;
|
|
|
|
- int onLockFailure; /* enum virDomainLockFailureAction */
|
|
+ virDomainLockFailureAction onLockFailure;
|
|
|
|
virDomainPowerManagement pm;
|
|
|
|
diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c
|
|
index f19e4f6abb..fcb0339b35 100644
|
|
--- a/src/libxl/xen_common.c
|
|
+++ b/src/libxl/xen_common.c
|
|
@@ -336,33 +336,37 @@ xenParseEventsActions(virConf *conf, virDomainDef *def)
|
|
g_autofree char *on_poweroff = NULL;
|
|
g_autofree char *on_reboot = NULL;
|
|
g_autofree char *on_crash = NULL;
|
|
+ int tmp;
|
|
|
|
if (xenConfigGetString(conf, "on_poweroff", &on_poweroff, "destroy") < 0)
|
|
return -1;
|
|
|
|
- if ((def->onPoweroff = virDomainLifecycleActionTypeFromString(on_poweroff)) < 0) {
|
|
+ if ((tmp = virDomainLifecycleActionTypeFromString(on_poweroff)) < 0) {
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
_("unexpected value %1$s for on_poweroff"), on_poweroff);
|
|
return -1;
|
|
}
|
|
+ def->onPoweroff = tmp;
|
|
|
|
if (xenConfigGetString(conf, "on_reboot", &on_reboot, "restart") < 0)
|
|
return -1;
|
|
|
|
- if ((def->onReboot = virDomainLifecycleActionTypeFromString(on_reboot)) < 0) {
|
|
+ if ((tmp = virDomainLifecycleActionTypeFromString(on_reboot)) < 0) {
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
_("unexpected value %1$s for on_reboot"), on_reboot);
|
|
return -1;
|
|
}
|
|
+ def->onReboot = tmp;
|
|
|
|
if (xenConfigGetString(conf, "on_crash", &on_crash, "restart") < 0)
|
|
return -1;
|
|
|
|
- if ((def->onCrash = virDomainLifecycleActionTypeFromString(on_crash)) < 0) {
|
|
+ if ((tmp = virDomainLifecycleActionTypeFromString(on_crash)) < 0) {
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
_("unexpected value %1$s for on_crash"), on_crash);
|
|
return -1;
|
|
}
|
|
+ def->onCrash = tmp;
|
|
|
|
return 0;
|
|
}
|
|
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
index cae7072831..ddd6e8f7ac 100644
|
|
--- a/src/qemu/qemu_driver.c
|
|
+++ b/src/qemu/qemu_driver.c
|
|
@@ -3584,6 +3584,8 @@ processGuestPanicEvent(virQEMUDriver *driver,
|
|
/* the VM is kept around for debugging */
|
|
break;
|
|
|
|
+ case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME:
|
|
+ case VIR_DOMAIN_LIFECYCLE_ACTION_LAST:
|
|
default:
|
|
break;
|
|
}
|
|
--
|
|
2.55.0
|