Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- src/conf/domain_conf.c | 10 +++++----- src/conf/domain_conf.h | 2 +- src/libvirt_private.syms | 4 ++-- src/xenconfig/xen_common.c | 8 ++++---- src/xenconfig/xen_sxpr.c | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fe2c3a29b6..39a4c4d80f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -208,7 +208,7 @@ VIR_ENUM_IMPL(virDomainCapsFeature, VIR_DOMAIN_CAPS_FEATURE_LAST, "syslog", "wake_alarm") -VIR_ENUM_IMPL(virDomainLifecycle, VIR_DOMAIN_LIFECYCLE_ACTION_LAST, +VIR_ENUM_IMPL(virDomainLifecycleAction, VIR_DOMAIN_LIFECYCLE_ACTION_LAST, "destroy", "restart", "rename-restart", @@ -18584,14 +18584,14 @@ virDomainDefParseXML(xmlDocPtr xml, "string(./on_reboot[1])", &def->onReboot, VIR_DOMAIN_LIFECYCLE_ACTION_RESTART, - virDomainLifecycleTypeFromString) < 0) + virDomainLifecycleActionTypeFromString) < 0) goto error; if (virDomainEventActionParseXML(ctxt, "on_poweroff", "string(./on_poweroff[1])", &def->onPoweroff, VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY, - virDomainLifecycleTypeFromString) < 0) + virDomainLifecycleActionTypeFromString) < 0) goto error; if (virDomainEventActionParseXML(ctxt, "on_crash", @@ -25862,11 +25862,11 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (virDomainEventActionDefFormat(buf, def->onPoweroff, "on_poweroff", - virDomainLifecycleTypeToString) < 0) + virDomainLifecycleActionTypeToString) < 0) goto error; if (virDomainEventActionDefFormat(buf, def->onReboot, "on_reboot", - virDomainLifecycleTypeToString) < 0) + virDomainLifecycleActionTypeToString) < 0) goto error; if (virDomainEventActionDefFormat(buf, def->onCrash, "on_crash", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4a821fb0f2..a284a40f80 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3211,7 +3211,7 @@ VIR_ENUM_DECL(virDomainBoot) VIR_ENUM_DECL(virDomainFeature) VIR_ENUM_DECL(virDomainCapabilitiesPolicy) VIR_ENUM_DECL(virDomainCapsFeature) -VIR_ENUM_DECL(virDomainLifecycle) +VIR_ENUM_DECL(virDomainLifecycleAction) VIR_ENUM_DECL(virDomainLifecycleCrash) VIR_ENUM_DECL(virDomainDevice) VIR_ENUM_DECL(virDomainDeviceAddress) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4c56f17e29..1fef62a0cb 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -400,10 +400,10 @@ virDomainLeaseInsertPreAlloc; virDomainLeaseInsertPreAlloced; virDomainLeaseRemove; virDomainLeaseRemoveAt; +virDomainLifecycleActionTypeFromString; +virDomainLifecycleActionTypeToString; virDomainLifecycleCrashTypeFromString; virDomainLifecycleCrashTypeToString; -virDomainLifecycleTypeFromString; -virDomainLifecycleTypeToString; virDomainLoaderDefFree; virDomainLoaderTypeFromString; virDomainLoaderTypeToString; diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index 6d7dc2cde4..a3b82c178e 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -361,7 +361,7 @@ xenParseEventsActions(virConfPtr conf, virDomainDefPtr def) if (xenConfigGetString(conf, "on_poweroff", &str, "destroy") < 0) return -1; - if ((def->onPoweroff = virDomainLifecycleTypeFromString(str)) < 0) { + if ((def->onPoweroff = virDomainLifecycleActionTypeFromString(str)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected value %s for on_poweroff"), str); return -1; @@ -370,7 +370,7 @@ xenParseEventsActions(virConfPtr conf, virDomainDefPtr def) if (xenConfigGetString(conf, "on_reboot", &str, "restart") < 0) return -1; - if ((def->onReboot = virDomainLifecycleTypeFromString(str)) < 0) { + if ((def->onReboot = virDomainLifecycleActionTypeFromString(str)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected value %s for on_reboot"), str); return -1; @@ -1449,7 +1449,7 @@ xenFormatEventActions(virConfPtr conf, virDomainDefPtr def) { const char *lifecycle = NULL; - if (!(lifecycle = virDomainLifecycleTypeToString(def->onPoweroff))) { + if (!(lifecycle = virDomainLifecycleActionTypeToString(def->onPoweroff))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected lifecycle action %d"), def->onPoweroff); return -1; @@ -1458,7 +1458,7 @@ xenFormatEventActions(virConfPtr conf, virDomainDefPtr def) return -1; - if (!(lifecycle = virDomainLifecycleTypeToString(def->onReboot))) { + if (!(lifecycle = virDomainLifecycleActionTypeToString(def->onReboot))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected lifecycle action %d"), def->onReboot); return -1; diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index cf62215e54..d26026fed2 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -1245,7 +1245,7 @@ xenParseSxpr(const struct sexpr *root, tmp = sexpr_node(root, "domain/on_poweroff"); if (tmp != NULL) { - if ((def->onPoweroff = virDomainLifecycleTypeFromString(tmp)) < 0) { + if ((def->onPoweroff = virDomainLifecycleActionTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unknown lifecycle type %s"), tmp); goto error; @@ -1256,7 +1256,7 @@ xenParseSxpr(const struct sexpr *root, tmp = sexpr_node(root, "domain/on_reboot"); if (tmp != NULL) { - if ((def->onReboot = virDomainLifecycleTypeFromString(tmp)) < 0) { + if ((def->onReboot = virDomainLifecycleActionTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unknown lifecycle type %s"), tmp); goto error; @@ -2214,14 +2214,14 @@ xenFormatSxpr(virConnectPtr conn, virDomainDefPtr def) virBufferEscapeSexpr(&buf, "(bootloader_args '%s')", def->os.bootloaderArgs); } - if (!(tmp = virDomainLifecycleTypeToString(def->onPoweroff))) { + if (!(tmp = virDomainLifecycleActionTypeToString(def->onPoweroff))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected lifecycle value %d"), def->onPoweroff); goto error; } virBufferAsprintf(&buf, "(on_poweroff '%s')", tmp); - if (!(tmp = virDomainLifecycleTypeToString(def->onReboot))) { + if (!(tmp = virDomainLifecycleActionTypeToString(def->onReboot))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected lifecycle value %d"), def->onReboot); goto error; -- 2.13.6

There is no need to have two different enums where one has the same values as the other one with some additions. Currently for on_poweroff and on_reboot we allow only subset of actions that are allowed for on_crash. This was covered in parse time using two different enums. Now to make sure that we don't allow setting actions that are not supported we need to check it while validating domain config. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- src/conf/domain_conf.c | 69 +++++++++++++++++++++++++++++++++++++------ src/conf/domain_conf.h | 14 ++------- src/libvirt_private.syms | 2 -- src/libxl/libxl_conf.c | 33 +++------------------ src/libxl/libxl_domain.c | 20 ++++++++----- src/lxc/lxc_native.c | 2 +- src/qemu/qemu_command.c | 4 +-- src/qemu/qemu_driver.c | 10 +++---- src/qemu/qemu_parse_command.c | 2 +- src/vmx/vmx.c | 2 +- src/vz/vz_sdk.c | 4 +-- src/xenapi/xenapi_utils.c | 30 +++++++++---------- src/xenapi/xenapi_utils.h | 4 +-- src/xenconfig/xen_common.c | 4 +-- src/xenconfig/xen_sxpr.c | 6 ++-- 15 files changed, 112 insertions(+), 94 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e9d7f8911e..f69bcc2530 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -217,12 +217,6 @@ VIR_ENUM_IMPL(virDomainLifecycleAction, VIR_DOMAIN_LIFECYCLE_ACTION_LAST, "destroy", "restart", "rename-restart", - "preserve") - -VIR_ENUM_IMPL(virDomainLifecycleCrash, VIR_DOMAIN_LIFECYCLE_CRASH_LAST, - "destroy", - "restart", - "rename-restart", "preserve", "coredump-destroy", "coredump-restart") @@ -5618,6 +5612,60 @@ virDomainDefCheckDuplicateDriveAddresses(const virDomainDef *def) } +static bool +virDomainDefLifecycleActionAllowed(virDomainLifecycle type, + virDomainLifecycleAction action) +{ + switch (type) { + case VIR_DOMAIN_LIFECYCLE_POWEROFF: + case VIR_DOMAIN_LIFECYCLE_REBOOT: + switch (action) { + case VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY: + case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART: + case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME: + case VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE: + case VIR_DOMAIN_LIFECYCLE_ACTION_LAST: + return true; + case VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_DESTROY: + case VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_RESTART: + break; + } + break; + case VIR_DOMAIN_LIFECYCLE_CRASH: + case VIR_DOMAIN_LIFECYCLE_LAST: + return true; + } + + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Lifecycle event '%s' doesn't support '%s' action"), + virDomainLifecycleTypeToString(type), + virDomainLifecycleActionTypeToString(action)); + return false; +} + + +static int +virDomainDefLifecycleActionValidate(const virDomainDef *def) +{ + if (!virDomainDefLifecycleActionAllowed(VIR_DOMAIN_LIFECYCLE_POWEROFF, + def->onPoweroff)) { + return -1; + } + + if (!virDomainDefLifecycleActionAllowed(VIR_DOMAIN_LIFECYCLE_REBOOT, + def->onReboot)) { + return -1; + } + + if (!virDomainDefLifecycleActionAllowed(VIR_DOMAIN_LIFECYCLE_CRASH, + def->onCrash)) { + return -1; + } + + return 0; +} + + static int virDomainDefValidateInternal(const virDomainDef *def) { @@ -5648,6 +5696,9 @@ virDomainDefValidateInternal(const virDomainDef *def) return -1; } + if (virDomainDefLifecycleActionValidate(def) < 0) + return -1; + return 0; } @@ -18602,8 +18653,8 @@ virDomainDefParseXML(xmlDocPtr xml, if (virDomainEventActionParseXML(ctxt, "on_crash", "string(./on_crash[1])", &def->onCrash, - VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY, - virDomainLifecycleCrashTypeFromString) < 0) + VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY, + virDomainLifecycleActionTypeFromString) < 0) goto error; if (virDomainEventActionParseXML(ctxt, "on_lockfailure", @@ -25875,7 +25926,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, goto error; if (virDomainEventActionDefFormat(buf, def->onCrash, "on_crash", - virDomainLifecycleCrashTypeToString) < 0) + virDomainLifecycleActionTypeToString) < 0) goto error; if (def->onLockFailure != VIR_DOMAIN_LOCK_FAILURE_DEFAULT && virDomainEventActionDefFormat(buf, def->onLockFailure, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index bc03c6ec17..38b966f6de 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1804,22 +1804,13 @@ typedef enum { VIR_DOMAIN_LIFECYCLE_ACTION_RESTART, VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME, VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE, + VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_DESTROY, + VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_RESTART, VIR_DOMAIN_LIFECYCLE_ACTION_LAST } virDomainLifecycleAction; typedef enum { - VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY, - VIR_DOMAIN_LIFECYCLE_CRASH_RESTART, - VIR_DOMAIN_LIFECYCLE_CRASH_RESTART_RENAME, - VIR_DOMAIN_LIFECYCLE_CRASH_PRESERVE, - VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_DESTROY, - VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_RESTART, - - VIR_DOMAIN_LIFECYCLE_CRASH_LAST -} virDomainLifecycleCrashAction; - -typedef enum { VIR_DOMAIN_LOCK_FAILURE_DEFAULT, VIR_DOMAIN_LOCK_FAILURE_POWEROFF, VIR_DOMAIN_LOCK_FAILURE_RESTART, @@ -3221,7 +3212,6 @@ VIR_ENUM_DECL(virDomainCapabilitiesPolicy) VIR_ENUM_DECL(virDomainCapsFeature) VIR_ENUM_DECL(virDomainLifecycle) VIR_ENUM_DECL(virDomainLifecycleAction) -VIR_ENUM_DECL(virDomainLifecycleCrash) VIR_ENUM_DECL(virDomainDevice) VIR_ENUM_DECL(virDomainDeviceAddress) VIR_ENUM_DECL(virDomainDiskDevice) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1fef62a0cb..4cd328eded 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -402,8 +402,6 @@ virDomainLeaseRemove; virDomainLeaseRemoveAt; virDomainLifecycleActionTypeFromString; virDomainLifecycleActionTypeToString; -virDomainLifecycleCrashTypeFromString; -virDomainLifecycleCrashTypeToString; virDomainLoaderDefFree; virDomainLoaderTypeFromString; virDomainLoaderTypeToString; diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 15111af0b7..ecbabfc797 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -110,38 +110,13 @@ libxlActionFromVirLifecycle(virDomainLifecycleAction action) case VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE: return LIBXL_ACTION_ON_SHUTDOWN_PRESERVE; - case VIR_DOMAIN_LIFECYCLE_ACTION_LAST: - break; - } - - return 0; -} - - -static libxl_action_on_shutdown -libxlActionFromVirLifecycleCrash(virDomainLifecycleCrashAction action) -{ - - switch (action) { - case VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY: - return LIBXL_ACTION_ON_SHUTDOWN_DESTROY; - - case VIR_DOMAIN_LIFECYCLE_CRASH_RESTART: - return LIBXL_ACTION_ON_SHUTDOWN_RESTART; - - case VIR_DOMAIN_LIFECYCLE_CRASH_RESTART_RENAME: - return LIBXL_ACTION_ON_SHUTDOWN_RESTART_RENAME; - - case VIR_DOMAIN_LIFECYCLE_CRASH_PRESERVE: - return LIBXL_ACTION_ON_SHUTDOWN_PRESERVE; - - case VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_DESTROY: + case VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_DESTROY: return LIBXL_ACTION_ON_SHUTDOWN_COREDUMP_DESTROY; - case VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_RESTART: + case VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_RESTART: return LIBXL_ACTION_ON_SHUTDOWN_COREDUMP_RESTART; - case VIR_DOMAIN_LIFECYCLE_CRASH_LAST: + case VIR_DOMAIN_LIFECYCLE_ACTION_LAST: break; } @@ -2247,7 +2222,7 @@ libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, d_config->on_reboot = libxlActionFromVirLifecycle(def->onReboot); d_config->on_poweroff = libxlActionFromVirLifecycle(def->onPoweroff); - d_config->on_crash = libxlActionFromVirLifecycleCrash(def->onCrash); + d_config->on_crash = libxlActionFromVirLifecycle(def->onCrash); return 0; } diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 3b260ee15c..09bfc88f54 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -474,6 +474,8 @@ libxlDomainShutdownThread(void *opaque) case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME: goto restart; case VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE: + case VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_DESTROY: + case VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_RESTART: case VIR_DOMAIN_LIFECYCLE_ACTION_LAST: goto endjob; } @@ -484,19 +486,19 @@ libxlDomainShutdownThread(void *opaque) dom_event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_CRASHED); - switch ((virDomainLifecycleCrashAction) vm->def->onCrash) { - case VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY: + switch ((virDomainLifecycleAction) vm->def->onCrash) { + case VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY: goto destroy; - case VIR_DOMAIN_LIFECYCLE_CRASH_RESTART: - case VIR_DOMAIN_LIFECYCLE_CRASH_RESTART_RENAME: + case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART: + case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME: goto restart; - case VIR_DOMAIN_LIFECYCLE_CRASH_PRESERVE: - case VIR_DOMAIN_LIFECYCLE_CRASH_LAST: + case VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE: + case VIR_DOMAIN_LIFECYCLE_ACTION_LAST: goto endjob; - case VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_DESTROY: + case VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_DESTROY: libxlDomainAutoCoreDump(driver, vm); goto destroy; - case VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_RESTART: + case VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_RESTART: libxlDomainAutoCoreDump(driver, vm); goto restart; } @@ -514,6 +516,8 @@ libxlDomainShutdownThread(void *opaque) case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME: goto restart; case VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE: + case VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_DESTROY: + case VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_RESTART: case VIR_DOMAIN_LIFECYCLE_ACTION_LAST: goto endjob; } diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 08f82f2580..68636dc2a4 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -1016,7 +1016,7 @@ lxcParseConfigString(const char *config, virDomainDefSetMemoryTotal(vmdef, 64 * 1024); vmdef->onReboot = VIR_DOMAIN_LIFECYCLE_ACTION_RESTART; - vmdef->onCrash = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY; + vmdef->onCrash = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY; vmdef->onPoweroff = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY; vmdef->virtType = VIR_DOMAIN_VIRT_LXC; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 174385324c..6b6de08e47 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6496,8 +6496,8 @@ qemuBuildPMCommandLine(virCommandPtr cmd, /* Only add -no-reboot option if each event destroys domain */ if (def->onReboot == VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY && def->onPoweroff == VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY && - (def->onCrash == VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY || - def->onCrash == VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_DESTROY)) { + (def->onCrash == VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY || + def->onCrash == VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_DESTROY)) { allowReboot = false; virCommandAddArg(cmd, "-no-reboot"); } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d9abe40f29..f7d713ab59 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4238,12 +4238,12 @@ processGuestPanicEvent(virQEMUDriverPtr driver, VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); switch (action) { - case VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_DESTROY: + case VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_DESTROY: if (doCoreDumpToAutoDumpPath(driver, vm, VIR_DUMP_MEMORY_ONLY) < 0) goto endjob; ATTRIBUTE_FALLTHROUGH; - case VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY: + case VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY: qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_CRASHED, QEMU_ASYNC_JOB_DUMP, 0); event = virDomainEventLifecycleNewFromObj(vm, @@ -4255,17 +4255,17 @@ processGuestPanicEvent(virQEMUDriverPtr driver, removeInactive = true; break; - case VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_RESTART: + case VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_RESTART: if (doCoreDumpToAutoDumpPath(driver, vm, VIR_DUMP_MEMORY_ONLY) < 0) goto endjob; ATTRIBUTE_FALLTHROUGH; - case VIR_DOMAIN_LIFECYCLE_CRASH_RESTART: + case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART: qemuDomainSetFakeReboot(driver, vm, true); qemuProcessShutdownOrReboot(driver, vm); break; - case VIR_DOMAIN_LIFECYCLE_CRASH_PRESERVE: + case VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE: break; default: diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 659db96d10..4ef28cdd55 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -1834,7 +1834,7 @@ qemuParseCommandLine(virCapsPtr caps, def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC; def->onReboot = VIR_DOMAIN_LIFECYCLE_ACTION_RESTART; - def->onCrash = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY; + def->onCrash = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY; def->onPoweroff = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY; def->virtType = VIR_DOMAIN_VIRT_QEMU; if (VIR_STRDUP(def->emulator, progargv[0]) < 0) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 2cb48bb729..622f22f037 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1580,7 +1580,7 @@ virVMXParseConfig(virVMXContext *ctx, /* def:lifecycle */ def->onReboot = VIR_DOMAIN_LIFECYCLE_ACTION_RESTART; def->onPoweroff = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY; - def->onCrash = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY; + def->onCrash = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY; /* def:os */ def->os.type = VIR_DOMAIN_OSTYPE_HVM; diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index c4ffbde9a4..28d30f248d 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1889,7 +1889,7 @@ prlsdkLoadDomain(vzDriverPtr driver, def->onReboot = VIR_DOMAIN_LIFECYCLE_ACTION_RESTART; def->onPoweroff = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY; - def->onCrash = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY; + def->onCrash = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY; /* get RAM parameters */ pret = PrlVmCfg_GetRamSize(sdkdom, &ram); @@ -2593,7 +2593,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr def) if (def->onReboot != VIR_DOMAIN_LIFECYCLE_ACTION_RESTART || def->onPoweroff != VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY || - def->onCrash != VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY) { + def->onCrash != VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("on_reboot, on_poweroff and on_crash parameters " diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index c4bbecc336..cf5bf66732 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -140,20 +140,20 @@ actionShutdownLibvirt2XenapiEnum(virDomainLifecycleAction action) enum xen_on_crash_behaviour -actionCrashLibvirt2XenapiEnum(virDomainLifecycleCrashAction action) +actionCrashLibvirt2XenapiEnum(virDomainLifecycleAction action) { enum xen_on_crash_behaviour num = XEN_ON_CRASH_BEHAVIOUR_RESTART; - if (action == VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY) + if (action == VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY) num = XEN_ON_CRASH_BEHAVIOUR_DESTROY; - else if (action == VIR_DOMAIN_LIFECYCLE_CRASH_RESTART) + else if (action == VIR_DOMAIN_LIFECYCLE_ACTION_RESTART) num = XEN_ON_CRASH_BEHAVIOUR_RESTART; - else if (action == VIR_DOMAIN_LIFECYCLE_CRASH_PRESERVE) + else if (action == VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE) num = XEN_ON_CRASH_BEHAVIOUR_PRESERVE; - else if (action == VIR_DOMAIN_LIFECYCLE_CRASH_RESTART_RENAME) + else if (action == VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME) num = XEN_ON_CRASH_BEHAVIOUR_RENAME_RESTART; - else if (action == VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_DESTROY) + else if (action == VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_DESTROY) num = XEN_ON_CRASH_BEHAVIOUR_COREDUMP_AND_DESTROY; - else if (action == VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_RESTART) + else if (action == VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_RESTART) num = XEN_ON_CRASH_BEHAVIOUR_COREDUMP_AND_RESTART; return num; } @@ -210,22 +210,22 @@ xenapiNormalExitEnum2virDomainLifecycle(enum xen_on_normal_exit action) } -virDomainLifecycleCrashAction +virDomainLifecycleAction xenapiCrashExitEnum2virDomainLifecycle(enum xen_on_crash_behaviour action) { - virDomainLifecycleCrashAction num = VIR_DOMAIN_LIFECYCLE_CRASH_RESTART; + virDomainLifecycleAction num = VIR_DOMAIN_LIFECYCLE_ACTION_RESTART; if (action == XEN_ON_CRASH_BEHAVIOUR_DESTROY) - num = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY; + num = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY; else if (action == XEN_ON_CRASH_BEHAVIOUR_RESTART) - num = VIR_DOMAIN_LIFECYCLE_CRASH_RESTART; + num = VIR_DOMAIN_LIFECYCLE_ACTION_RESTART; else if (action == XEN_ON_CRASH_BEHAVIOUR_PRESERVE) - num = VIR_DOMAIN_LIFECYCLE_CRASH_PRESERVE; + num = VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE; else if (action == XEN_ON_CRASH_BEHAVIOUR_RENAME_RESTART) - num = VIR_DOMAIN_LIFECYCLE_CRASH_RESTART_RENAME; + num = VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME; else if (action == XEN_ON_CRASH_BEHAVIOUR_COREDUMP_AND_DESTROY) - num = VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_DESTROY; + num = VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_DESTROY; else if (action == XEN_ON_CRASH_BEHAVIOUR_COREDUMP_AND_RESTART) - num = VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_RESTART; + num = VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_RESTART; return num; } diff --git a/src/xenapi/xenapi_utils.h b/src/xenapi/xenapi_utils.h index 26e1ac29c5..72c42d11ea 100644 --- a/src/xenapi/xenapi_utils.h +++ b/src/xenapi/xenapi_utils.h @@ -46,7 +46,7 @@ enum xen_on_normal_exit actionShutdownLibvirt2XenapiEnum(virDomainLifecycleAction action); enum xen_on_crash_behaviour -actionCrashLibvirt2XenapiEnum(virDomainLifecycleCrashAction action); +actionCrashLibvirt2XenapiEnum(virDomainLifecycleAction action); char * createXenAPIBootOrderString(int nboot, int *bootDevs); @@ -56,7 +56,7 @@ virDomainBootOrder map2LibvirtBootOrder(char c); virDomainLifecycleAction xenapiNormalExitEnum2virDomainLifecycle(enum xen_on_normal_exit action); -virDomainLifecycleCrashAction +virDomainLifecycleAction xenapiCrashExitEnum2virDomainLifecycle(enum xen_on_crash_behaviour action); void getCpuBitMapfromString(char *mask, unsigned char *cpumap, int maplen); diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index a3b82c178e..8fc24b24eb 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -379,7 +379,7 @@ xenParseEventsActions(virConfPtr conf, virDomainDefPtr def) if (xenConfigGetString(conf, "on_crash", &str, "restart") < 0) return -1; - if ((def->onCrash = virDomainLifecycleCrashTypeFromString(str)) < 0) { + if ((def->onCrash = virDomainLifecycleActionTypeFromString(str)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected value %s for on_crash"), str); return -1; @@ -1467,7 +1467,7 @@ xenFormatEventActions(virConfPtr conf, virDomainDefPtr def) return -1; - if (!(lifecycle = virDomainLifecycleCrashTypeToString(def->onCrash))) { + if (!(lifecycle = virDomainLifecycleActionTypeToString(def->onCrash))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected lifecycle action %d"), def->onCrash); return -1; diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index d26026fed2..0946804420 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -1267,13 +1267,13 @@ xenParseSxpr(const struct sexpr *root, tmp = sexpr_node(root, "domain/on_crash"); if (tmp != NULL) { - if ((def->onCrash = virDomainLifecycleCrashTypeFromString(tmp)) < 0) { + if ((def->onCrash = virDomainLifecycleActionTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unknown lifecycle type %s"), tmp); goto error; } } else { - def->onCrash = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY; + def->onCrash = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY; } if (hvm) { @@ -2228,7 +2228,7 @@ xenFormatSxpr(virConnectPtr conn, virDomainDefPtr def) } virBufferAsprintf(&buf, "(on_reboot '%s')", tmp); - if (!(tmp = virDomainLifecycleCrashTypeToString(def->onCrash))) { + if (!(tmp = virDomainLifecycleActionTypeToString(def->onCrash))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected lifecycle value %d"), def->onCrash); goto error; -- 2.13.6

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- src/qemu/qemu_command.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 935b05226d..fa70d15c43 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5609,20 +5609,17 @@ qemuBuildMonitorCommandLine(virLogManagerPtr logManager, virCommandPtr cmd, virQEMUDriverConfigPtr cfg, virDomainDefPtr def, - virQEMUCapsPtr qemuCaps, - virDomainChrSourceDefPtr monitor_chr, - bool monitor_json, - bool chardevStdioLogd) + qemuDomainObjPrivatePtr priv) { char *chrdev; - if (!monitor_chr) + if (!priv->monConfig) return 0; if (!(chrdev = qemuBuildChrChardevStr(logManager, cmd, cfg, def, - monitor_chr, "monitor", - qemuCaps, true, - chardevStdioLogd))) + priv->monConfig, "monitor", + priv->qemuCaps, true, + priv->chardevStdioLogd))) return -1; virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, chrdev); @@ -5631,7 +5628,7 @@ qemuBuildMonitorCommandLine(virLogManagerPtr logManager, virCommandAddArg(cmd, "-mon"); virCommandAddArgFormat(cmd, "chardev=charmonitor,id=monitor,mode=%s", - monitor_json ? "control" : "readline"); + priv->monJSON ? "control" : "readline"); return 0; } @@ -9963,7 +9960,6 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, unsigned int bootHostdevNet = 0; qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDefPtr def = vm->def; - virDomainChrSourceDefPtr monitor_chr = priv->monConfig; bool monitor_json = priv->monJSON; virQEMUCapsPtr qemuCaps = priv->qemuCaps; virBitmapPtr nodeset = priv->autoNodeset; @@ -9972,7 +9968,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p def=%p mon=%p json=%d " "qemuCaps=%p migrateURI=%s snapshot=%p vmop=%d", - driver, def, monitor_chr, monitor_json, + driver, def, priv->monConfig, monitor_json, qemuCaps, migrateURI, snapshot, vmop); if (qemuBuildCommandLineValidate(driver, def) < 0) @@ -10066,10 +10062,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, if (qemuBuildSgaCommandLine(cmd, def, qemuCaps) < 0) goto error; - if (qemuBuildMonitorCommandLine(logManager, cmd, cfg, def, - qemuCaps, monitor_chr, - monitor_json, - chardevStdioLogd) < 0) + if (qemuBuildMonitorCommandLine(logManager, cmd, cfg, def, priv) < 0) goto error; if (qemuBuildClockCommandLine(cmd, def, qemuCaps) < 0) -- 2.13.6

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- src/qemu/qemu_command.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index da59a1fd63..5441f5e37f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -201,8 +201,7 @@ qemuBuildHasMasterKey(virQEMUCapsPtr qemuCaps) */ static int qemuBuildMasterKeyCommandLine(virCommandPtr cmd, - virQEMUCapsPtr qemuCaps, - const char *domainLibDir) + qemuDomainObjPrivatePtr priv) { int ret = -1; char *alias = NULL; @@ -213,7 +212,7 @@ qemuBuildMasterKeyCommandLine(virCommandPtr cmd, * means the domain won't be able to use a secret master key and is * not a failure. */ - if (!qemuBuildHasMasterKey(qemuCaps)) { + if (!qemuBuildHasMasterKey(priv->qemuCaps)) { VIR_INFO("secret object is not supported by this QEMU binary"); return 0; } @@ -226,7 +225,7 @@ qemuBuildMasterKeyCommandLine(virCommandPtr cmd, * than other command line options which do not check for the * existence of socket files before using. */ - if (!(path = qemuDomainGetMasterKeyFilePath(domainLibDir))) + if (!(path = qemuDomainGetMasterKeyFilePath(priv->libDir))) goto cleanup; virCommandAddArg(cmd, "-object"); @@ -9962,7 +9961,6 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, virDomainDefPtr def = vm->def; virQEMUCapsPtr qemuCaps = priv->qemuCaps; virBitmapPtr nodeset = priv->autoNodeset; - const char *domainLibDir = priv->libDir; bool chardevStdioLogd = priv->chardevStdioLogd; VIR_DEBUG("driver=%p def=%p mon=%p json=%d " @@ -9991,7 +9989,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, if (!standalone) virCommandAddArg(cmd, "-S"); /* freeze CPU */ - if (qemuBuildMasterKeyCommandLine(cmd, qemuCaps, domainLibDir) < 0) + if (qemuBuildMasterKeyCommandLine(cmd, priv) < 0) goto error; if (enableFips) -- 2.13.6

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- docs/formatdomain.html.in | 6 +++++ include/libvirt/libvirt-domain.h | 28 ++++++++++++++++++++ src/conf/domain_conf.h | 19 -------------- src/driver-hypervisor.h | 7 +++++ src/libvirt-domain.c | 56 ++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 5 ++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 14 +++++++++- 8 files changed, 116 insertions(+), 20 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index b93ace7cba..cb19a547fe 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1623,6 +1623,12 @@ </dl> <p> + The lifecycle events can be configured via + virDomainSetLifecycleAction() API + <span class="since">since 3.9.0 (QEMU only)</span>. + </p> + + <p> The <code>on_lockfailure</code> element (<span class="since">since 1.0.0</span>) may be used to configure what action should be taken when a lock manager loses resource locks. The following diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 9fb94a9837..4048acf38a 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -4728,4 +4728,32 @@ int virDomainSetBlockThreshold(virDomainPtr domain, unsigned long long threshold, unsigned int flags); +typedef enum { + VIR_DOMAIN_LIFECYCLE_POWEROFF = 0, + VIR_DOMAIN_LIFECYCLE_REBOOT = 1, + VIR_DOMAIN_LIFECYCLE_CRASH = 2, + +# ifdef VIR_ENUM_SENTINELS + VIR_DOMAIN_LIFECYCLE_LAST +# endif +} virDomainLifecycle; + +typedef enum { + VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY = 0, + VIR_DOMAIN_LIFECYCLE_ACTION_RESTART = 1, + VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME = 2, + VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE = 3, + VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_DESTROY = 4, + VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_RESTART = 5, + +# ifdef VIR_ENUM_SENTINELS + VIR_DOMAIN_LIFECYCLE_ACTION_LAST +# endif +} virDomainLifecycleAction; + +int virDomainSetLifecycleAction(virDomainPtr domain, + unsigned int type, + unsigned int action, + unsigned int flags); + #endif /* __VIR_LIBVIRT_DOMAIN_H__ */ diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 38b966f6de..8240433611 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1792,25 +1792,6 @@ typedef enum { } virDomainCapsFeature; typedef enum { - VIR_DOMAIN_LIFECYCLE_POWEROFF, - VIR_DOMAIN_LIFECYCLE_REBOOT, - VIR_DOMAIN_LIFECYCLE_CRASH, - - VIR_DOMAIN_LIFECYCLE_LAST -} virDomainLifecycle; - -typedef enum { - VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY, - VIR_DOMAIN_LIFECYCLE_ACTION_RESTART, - VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME, - VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE, - VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_DESTROY, - VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_RESTART, - - VIR_DOMAIN_LIFECYCLE_ACTION_LAST -} virDomainLifecycleAction; - -typedef enum { VIR_DOMAIN_LOCK_FAILURE_DEFAULT, VIR_DOMAIN_LOCK_FAILURE_POWEROFF, VIR_DOMAIN_LOCK_FAILURE_RESTART, diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h index 4de0581c3f..ce0e2b2525 100644 --- a/src/driver-hypervisor.h +++ b/src/driver-hypervisor.h @@ -1277,6 +1277,12 @@ typedef int unsigned long long threshold, unsigned int flags); +typedef int +(*virDrvDomainSetLifecycleAction)(virDomainPtr domain, + unsigned int type, + unsigned int action, + unsigned int flags); + typedef struct _virHypervisorDriver virHypervisorDriver; typedef virHypervisorDriver *virHypervisorDriverPtr; @@ -1521,6 +1527,7 @@ struct _virHypervisorDriver { virDrvDomainSetGuestVcpus domainSetGuestVcpus; virDrvDomainSetVcpu domainSetVcpu; virDrvDomainSetBlockThreshold domainSetBlockThreshold; + virDrvDomainSetLifecycleAction domainSetLifecycleAction; }; diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index fc2e4ce381..a51d8e3820 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -12035,3 +12035,59 @@ virDomainSetBlockThreshold(virDomainPtr domain, virDispatchError(domain->conn); return -1; } + + +/** + * virDomainSetLifecycleAction: + * @domain: pointer to domain object + * @type: the lifecycle type from virDomainLifecycle + * @action: the action type from virDomainLifecycleAction + * @flags: bitwise-OR of virDomainModificationImpact + * + * Changes the actions of lifecycle events for domain represented as + * <on_$type>$action</on_$type> in the domain XML. + * + * Returns 0 on success, -1 on failure. + */ +int virDomainSetLifecycleAction(virDomainPtr domain, + unsigned int type, + unsigned int action, + unsigned int flags) +{ + VIR_DOMAIN_DEBUG(domain, "type='%u' action='%u' flags='0x%x'", + type, action, flags); + + virResetLastError(); + + virCheckDomainReturn(domain, -1); + virCheckReadOnlyGoto(domain->conn->flags, error); + + if (type >= VIR_DOMAIN_LIFECYCLE_LAST) { + virReportError(VIR_ERR_INVALID_ARG, + _("invalid lifecycle type '%u'"), type); + goto error; + } + + if (action >= VIR_DOMAIN_LIFECYCLE_ACTION_LAST) { + virReportError(VIR_ERR_INVALID_ARG, + _("invalid lifecycle action '%u'"), action); + goto error; + } + + if (domain->conn->driver->domainSetLifecycleAction) { + int ret; + ret = domain->conn->driver->domainSetLifecycleAction(domain, + type, + action, + flags); + if (ret < 0) + goto error; + return ret; + } + + virReportUnsupportedError(); + + error: + virDispatchError(domain->conn); + return -1; +} diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 4986019431..0efde25a7f 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -774,4 +774,9 @@ LIBVIRT_3.7.0 { virDomainManagedSaveGetXMLDesc; virDomainManagedSaveDefineXML; } LIBVIRT_3.4.0; + +LIBVIRT_3.9.0 { + global: + virDomainSetLifecycleAction; +} LIBVIRT_3.7.0; # .... define new API here using predicted next version number .... diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 00e8086d51..06719bb825 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -8497,6 +8497,7 @@ static virHypervisorDriver hypervisor_driver = { .domainSetGuestVcpus = remoteDomainSetGuestVcpus, /* 2.0.0 */ .domainSetVcpu = remoteDomainSetVcpu, /* 3.1.0 */ .domainSetBlockThreshold = remoteDomainSetBlockThreshold, /* 3.2.0 */ + .domainSetLifecycleAction = remoteDomainSetLifecycleAction /* 3.9.0 */ }; static virNetworkDriver network_driver = { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index e3014f66bc..0aed25220d 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -3433,6 +3433,12 @@ struct remote_domain_set_block_threshold_args { unsigned int flags; }; +struct remote_domain_set_lifecycle_action_args { + remote_nonnull_domain dom; + unsigned int type; + unsigned int action; + unsigned int flags; +}; /*----- Protocol. -----*/ @@ -6108,5 +6114,11 @@ enum remote_procedure { * @acl: domain:write * @acl: domain:hibernate */ - REMOTE_PROC_DOMAIN_MANAGED_SAVE_DEFINE_XML = 389 + REMOTE_PROC_DOMAIN_MANAGED_SAVE_DEFINE_XML = 389, + + /** + * @generate: both + * @acl: domain:write + */ + REMOTE_PROC_DOMAIN_SET_LIFECYCLE_ACTION = 390 }; -- 2.13.6

On Wed, Oct 18, 2017 at 04:38:23PM -0400, John Ferlan wrote: Fixed The sentence "Not all hypervisors ..." is used few paragraphs above this one so I'll just remove the (QEMU only) part. We actually have a matrix of supported APIs by drivers <https://libvirt.org/hvsupport.html> so there is no need to mention that not all hypervisors support this API. Usually when it's at the end of a whole paragraph it indicates that everything in that paragraph is covered by the "since" limitation. It can definitely be at the beginning :) I personally don't care. Thanks Pavel

On 10/16/2017 07:06 AM, Pavel Hrdina wrote: unreachable ;-) as the order is reversed (Coverity didn't even notice, go figure! s/action/I<action> s/type/I<type> consider "lifecycle event type" - IDC if you do or not, just a thought Probably should add the obligatory what --config, --live, and --current do. John

This will be used later on in implementation of new API virDomainSetLifecycleAction(). In order to use it, we need to store the value in status XML to not lose the information if libvirtd is restarted. If some guest was started by old libvirt where it was not possible to change the lifecycle action for running guest, we can safely detect it based on the current actions from the status XML. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- src/qemu/qemu_command.c | 10 ++-------- src/qemu/qemu_domain.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_process.c | 30 ++++++++++++++++++++++++++++++ tests/qemuxml2xmltest.c | 3 ++- 5 files changed, 75 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index db6cc55495..046a8fc78f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6484,23 +6484,17 @@ qemuBuildPMCommandLine(virCommandPtr cmd, const virDomainDef *def, qemuDomainObjPrivatePtr priv) { - bool allowReboot = true; virQEMUCapsPtr qemuCaps = priv->qemuCaps; /* Only add -no-reboot option if each event destroys domain */ - if (def->onReboot == VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY && - def->onPoweroff == VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY && - (def->onCrash == VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY || - def->onCrash == VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_DESTROY)) { - allowReboot = false; + if (priv->allowReboot == VIR_TRISTATE_BOOL_NO) virCommandAddArg(cmd, "-no-reboot"); - } /* If JSON monitor is enabled, we can receive an event * when QEMU stops. If we use no-shutdown, then we can * watch for this event and do a soft/warm reboot. */ - if (priv->monJSON && allowReboot && + if (priv->monJSON && priv->allowReboot == VIR_TRISTATE_BOOL_YES && virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) { virCommandAddArg(cmd, "-no-shutdown"); } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ed27a91fa6..2630b73221 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1767,6 +1767,7 @@ qemuDomainObjPrivateDataClear(qemuDomainObjPrivatePtr priv) priv->namespaces = NULL; priv->reconnectBlockjobs = VIR_TRISTATE_BOOL_ABSENT; + priv->allowReboot = VIR_TRISTATE_BOOL_ABSENT; } @@ -1876,6 +1877,16 @@ qemuDomainObjPrivateXMLFormatBlockjobs(virBufferPtr buf, } +static void +qemuDomainObjPrivateXMLFormatAllowReboot(virBufferPtr buf, + virTristateBool allowReboot) +{ + virBufferAsprintf(buf, "<allowReboot value='%s'/>\n", + virTristateBoolTypeToString(allowReboot)); + +} + + static int qemuDomainObjPrivateXMLFormat(virBufferPtr buf, virDomainObjPtr vm) @@ -1998,6 +2009,8 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf, if (priv->chardevStdioLogd) virBufferAddLit(buf, "<chardevStdioLogd/>\n"); + qemuDomainObjPrivateXMLFormatAllowReboot(buf, priv->allowReboot); + if (qemuDomainObjPrivateXMLFormatBlockjobs(buf, vm) < 0) return -1; @@ -2109,6 +2122,31 @@ qemuDomainObjPrivateXMLParseBlockjobs(qemuDomainObjPrivatePtr priv, static int +qemuDomainObjPrivateXMLParseAllowReboot(xmlXPathContextPtr ctxt, + virTristateBool *allowReboot) +{ + int ret = -1; + int val; + char *valStr; + + if ((valStr = virXPathString("string(./allowReboot/@value)", ctxt))) { + if ((val = virTristateBoolTypeFromString(valStr)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid allowReboot value '%s'"), valStr); + goto cleanup; + } + *allowReboot = val; + } + + ret = 0; + + cleanup: + VIR_FREE(valStr); + return ret; +} + + +static int qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, virDomainObjPtr vm, virDomainDefParserConfigPtr config) @@ -2323,6 +2361,8 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, priv->chardevStdioLogd = virXPathBoolean("boolean(./chardevStdioLogd)", ctxt) == 1; + qemuDomainObjPrivateXMLParseAllowReboot(ctxt, &priv->allowReboot); + if (qemuDomainObjPrivateXMLParseBlockjobs(priv, ctxt) < 0) goto error; diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 00226a3fc8..be4aaa5613 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -261,6 +261,7 @@ struct _qemuDomainObjPrivate { char *lockState; bool fakeReboot; + virTristateBool allowReboot; int jobs_queued; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 11914a72f3..e555ec9c96 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5309,6 +5309,26 @@ qemuProcessPrepareDomainStorage(virConnectPtr conn, } +static void +qemuProcessPrepareAllowReboot(virDomainObjPtr vm) +{ + virDomainDefPtr def = vm->def; + qemuDomainObjPrivatePtr priv = vm->privateData; + + if (priv->allowReboot != VIR_TRISTATE_BOOL_ABSENT) + return; + + if (def->onReboot == VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY && + def->onPoweroff == VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY && + (def->onCrash == VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY || + def->onCrash == VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_DESTROY)) { + priv->allowReboot = VIR_TRISTATE_BOOL_NO; + } else { + priv->allowReboot = VIR_TRISTATE_BOOL_YES; + } +} + + /** * qemuProcessPrepareDomain: * @conn: connection object (for looking up storage volumes) @@ -5365,6 +5385,8 @@ qemuProcessPrepareDomain(virConnectPtr conn, priv->chardevStdioLogd = true; } + qemuProcessPrepareAllowReboot(vm); + /* * Normally PCI addresses are assigned in the virDomainCreate * or virDomainDefine methods. We might still need to assign @@ -6618,6 +6640,10 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, priv->gotShutdown = false; + /* Attaching to running QEMU so we need to detect whether it was started + * with -no-reboot. */ + qemuProcessPrepareAllowReboot(vm); + /* * Normally PCI addresses are assigned in the virDomainCreate * or virDomainDefine methods. We might still need to assign @@ -6934,6 +6960,10 @@ qemuProcessReconnect(void *opaque) if (qemuDomainMasterKeyReadFile(priv) < 0) goto error; + /* If we are connecting to a guest started by old libvirt there is no + * allowReboot in status XML and we need to initialize it. */ + qemuProcessPrepareAllowReboot(obj); + VIR_DEBUG("Reconnect monitor to %p '%s'", obj, obj->def->name); /* XXX check PID liveliness & EXE path */ diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 14f5b58fe9..2185532a6c 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -109,7 +109,8 @@ static const char testStatusXMLPrefixBodyStatic[] = "</devices>\n" "<numad nodeset='0-2' cpuset='1,3'/>\n" "<libDir path='/tmp'/>\n" -"<channelTargetDir path='/tmp/channel'/>\n"; +"<channelTargetDir path='/tmp/channel'/>\n" +"<allowReboot value='yes'/>\n"; static const char testStatusXMLSuffix[] = "</domstatus>\n"; -- 2.13.6

There is one limitation for using this API, when the guest is started with all actions set to "destroy" we put "-no-reboot" on the QEMU command line. That cannot be changed while QEMU is running and the QEMU process is always terminated no matter what is configured for any action. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1460677 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 4 +++ src/libvirt-domain.c | 4 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 103 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f69bcc2530..feea8523a7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5612,7 +5612,7 @@ virDomainDefCheckDuplicateDriveAddresses(const virDomainDef *def) } -static bool +bool virDomainDefLifecycleActionAllowed(virDomainLifecycle type, virDomainLifecycleAction action) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 8240433611..354b7adfa5 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3409,4 +3409,8 @@ virDomainNetTypeSharesHostView(const virDomainNetDef *net) return false; } +bool +virDomainDefLifecycleActionAllowed(virDomainLifecycle type, + virDomainLifecycleAction action); + #endif /* __DOMAIN_CONF_H */ diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index a51d8e3820..eaec0979ad 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -12047,6 +12047,10 @@ virDomainSetBlockThreshold(virDomainPtr domain, * Changes the actions of lifecycle events for domain represented as * <on_$type>$action</on_$type> in the domain XML. * + * QEMU driver has a limitation that if all lifecycle events are set + * to destroy when the domain is started, it's not possible to change + * any action for running domain. + * * Returns 0 on success, -1 on failure. */ int virDomainSetLifecycleAction(virDomainPtr domain, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4cd328eded..a8983f2246 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -269,6 +269,7 @@ virDomainDefHasDeviceAddress; virDomainDefHasMemballoon; virDomainDefHasMemoryHotplug; virDomainDefHasVcpusOffline; +virDomainDefLifecycleActionAllowed; virDomainDefMaybeAddController; virDomainDefMaybeAddInput; virDomainDefNeedsPlacementAdvice; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f7d713ab59..58a1c7d94e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20914,6 +20914,97 @@ qemuDomainSetBlockThreshold(virDomainPtr dom, } +static void +qemuDomainModifyLifecycleAction(virDomainDefPtr def, + virDomainLifecycle type, + virDomainLifecycleAction action) +{ + switch (type) { + case VIR_DOMAIN_LIFECYCLE_POWEROFF: + def->onPoweroff = action; + break; + case VIR_DOMAIN_LIFECYCLE_REBOOT: + def->onReboot = action; + break; + case VIR_DOMAIN_LIFECYCLE_CRASH: + def->onCrash = action; + break; + case VIR_DOMAIN_LIFECYCLE_LAST: + break; + } +} + + + +static int +qemuDomainSetLifecycleAction(virDomainPtr dom, + unsigned int type, + unsigned int action, + unsigned int flags) +{ + virQEMUDriverPtr driver = dom->conn->privateData; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + qemuDomainObjPrivatePtr priv; + virDomainObjPtr vm = NULL; + virDomainDefPtr def = NULL; + virDomainDefPtr persistentDef = NULL; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); + + if (!virDomainDefLifecycleActionAllowed(type, action)) + goto cleanup; + + if (!(vm = qemuDomObjFromDomain(dom))) + goto cleanup; + + priv = vm->privateData; + + if (virDomainSetLifecycleActionEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + + if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0) + goto endjob; + + if (def) { + if (priv->allowReboot == VIR_TRISTATE_BOOL_NO) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("cannot update lifecycle action because QEMU " + "was started with -no-reboot option")); + goto endjob; + } + + qemuDomainModifyLifecycleAction(def, type, action); + + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, + vm, driver->caps) < 0) + goto endjob; + } + + if (persistentDef) { + qemuDomainModifyLifecycleAction(persistentDef, type, action); + + if (virDomainSaveConfig(cfg->configDir, driver->caps, + persistentDef) < 0) + goto endjob; + } + + ret = 0; + + endjob: + qemuDomainObjEndJob(driver, vm); + + cleanup: + virDomainObjEndAPI(&vm); + virObjectUnref(cfg); + return ret; +} + + static virHypervisorDriver qemuHypervisorDriver = { .name = QEMU_DRIVER_NAME, .connectOpen = qemuConnectOpen, /* 0.2.0 */ @@ -21131,7 +21222,8 @@ static virHypervisorDriver qemuHypervisorDriver = { .domainGetGuestVcpus = qemuDomainGetGuestVcpus, /* 2.0.0 */ .domainSetGuestVcpus = qemuDomainSetGuestVcpus, /* 2.0.0 */ .domainSetVcpu = qemuDomainSetVcpu, /* 3.1.0 */ - .domainSetBlockThreshold = qemuDomainSetBlockThreshold /* 3.2.0 */ + .domainSetBlockThreshold = qemuDomainSetBlockThreshold, /* 3.2.0 */ + .domainSetLifecycleAction = qemuDomainSetLifecycleAction, /* 3.9.0 */ }; -- 2.13.6

On Wed, Oct 18, 2017 at 09:59:46AM -0400, John Ferlan wrote: Interesting is that it worked for me even without this. I'll squash it into the patch "lib: introduce virDomainSetLifecycleAction() API". I'm missing pdwtags so this check was skipped. Thanks Pavel