Currently automatic VM managed save is only performed in session
daemons, on desktop session close, or host OS shutdown request.
With this change it is possible to control shutdown behaviour for
all daemons. A recommended setup might be:
auto_shutdown_try_save = "persistent"
auto_shutdown_try_shutdown = "all"
auto_shutdown_poweroff = "all"
Each setting accepts 'none', 'persistent', 'transient', and 'all'
to control what types of guest it applies to.
For historical compatibility, for the system daemon, the settings
currently default to:
auto_shutdown_try_save = "none"
auto_shutdown_try_shutdown = "none"
auto_shutdown_poweroff = "none"
while for the session daemon they currently default to
auto_shutdown_try_save = "all"
auto_shutdown_try_shutdown = "none"
auto_shutdown_poweroff = "none"
The system daemon settings should NOT be enabled if the traditional
libvirt-guests.service is already enabled.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
src/qemu/libvirtd_qemu.aug | 3 ++
src/qemu/qemu.conf.in | 37 ++++++++++++++++++++++
src/qemu/qemu_conf.c | 51 ++++++++++++++++++++++++++++++
src/qemu/qemu_conf.h | 3 ++
src/qemu/qemu_driver.c | 9 +++---
src/qemu/test_libvirtd_qemu.aug.in | 3 ++
6 files changed, 101 insertions(+), 5 deletions(-)
diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug
index 642093c40b..e465a231fc 100644
--- a/src/qemu/libvirtd_qemu.aug
+++ b/src/qemu/libvirtd_qemu.aug
@@ -98,6 +98,9 @@ module Libvirtd_qemu =
| bool_entry "auto_dump_bypass_cache"
| bool_entry "auto_start_bypass_cache"
| int_entry "auto_start_delay"
+ | str_entry "auto_shutdown_try_save"
+ | str_entry "auto_shutdown_try_shutdown"
+ | str_entry "auto_shutdown_powerdown"
let process_entry = str_entry "hugetlbfs_mount"
| str_entry "bridge_helper"
diff --git a/src/qemu/qemu.conf.in b/src/qemu/qemu.conf.in
index a3e9bbfcf3..d8890c4c32 100644
--- a/src/qemu/qemu.conf.in
+++ b/src/qemu/qemu.conf.in
@@ -638,6 +638,43 @@
#
#auto_start_delay = 0
+# Whether to perform managed save of running VMs if a host OS
+# shutdown is requested (system/session daemons), or the desktop
+# session terminates (session daemon only). Accepts
+#
+# * "none" - do not try to save any running VMs
+# * "persistent" - only try to save persistent running VMs
+# * "transient" - only try to save transient running VMs
+# * "all" - try to save all running VMs
+#
+# Defaults to "all" for session daemons and "none"
+# for system daemons
+#
+# If 'libvirt-guests.service' is enabled, then this must be
+# set to 'none' for system daemons to avoid dueling actions
+#auto_shutdown_try_save = "all"
+
+# As above, but with a graceful shutdown action instead of
+# managed save. If managed save is enabled, shutdown will
+# be tried only on failure to perform managed save.
+#
+# Defaults to "none"
+#
+# If 'libvirt-guests.service' is enabled, then this must be
+# set to 'none' for system daemons to avoid dueling actions
+#auto_shutdown_try_shutdown = "none"
+
+# As above, but with a forced poweroff instead of managed
+# save. If managed save or graceful shutdown are enabled,
+# forced poweroff will be tried only on failure of the
+# other options.
+#
+# Defaults to "none"
+#
+# If 'libvirt-guests.service' is enabled, then this must be
+# set to 'none' for system daemons to avoid dueling actions
+#auto_shutdown_powerdown = "none"
+
# If provided by the host and a hugetlbfs mount point is configured,
# a guest may request huge page backing. When this mount point is
# unspecified here, determination of a host mount point in /proc/mounts
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 0b6b923bcb..a57eccf569 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -303,6 +303,21 @@ virQEMUDriverConfig *virQEMUDriverConfigNew(bool privileged,
cfg->dumpGuestCore = true;
#endif
+ if (privileged) {
+ /*
+ * Defer to libvirt-guests.service.
+ *
+ * XXX, or query if libvirt-guests.service is enabled perhaps ?
+ */
+ cfg->autoShutdownTrySave = VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCOPE_NONE;
+ cfg->autoShutdownTryShutdown = VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCOPE_NONE;
+ cfg->autoShutdownPoweroff = VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCOPE_NONE;
+ } else {
+ cfg->autoShutdownTrySave = VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCOPE_ALL;
+ cfg->autoShutdownTryShutdown = VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCOPE_NONE;
+ cfg->autoShutdownPoweroff = VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCOPE_NONE;
+ }
+
return g_steal_pointer(&cfg);
}
@@ -626,6 +641,8 @@ static int
virQEMUDriverConfigLoadSaveEntry(virQEMUDriverConfig *cfg,
virConf *conf)
{
+ g_autofree char *autoShutdownScope = NULL;
+
if (virConfGetValueString(conf, "save_image_format", &cfg->saveImageFormat) < 0)
return -1;
if (virConfGetValueString(conf, "dump_image_format", &cfg->dumpImageFormat) < 0)
@@ -640,6 +657,40 @@ virQEMUDriverConfigLoadSaveEntry(virQEMUDriverConfig *cfg,
return -1;
if (virConfGetValueInt(conf, "auto_start_delay", &cfg->autoStartDelayMS) < 0)
return -1;
+ if (virConfGetValueString(conf, "auto_shutdown_try_save", &autoShutdownScope) < 0)
+ return -1;
+
+ if (autoShutdownScope != NULL &&
+ (cfg->autoShutdownTrySave =
+ virDomainDriverAutoShutdownScopeTypeFromString(autoShutdownScope)) < 0) {
+ virReportError(VIR_ERR_INVALID_ARG,
+ _("unknown auto_shutdown_try_save '%1$s'"),
+ autoShutdownScope);
+ return -1;
+ }
+
+ if (virConfGetValueString(conf, "auto_shutdown_try_shutdown", &autoShutdownScope) < 0)
+ return -1;
+
+ if (autoShutdownScope != NULL &&
+ (cfg->autoShutdownTryShutdown =
+ virDomainDriverAutoShutdownScopeTypeFromString(autoShutdownScope)) < 0) {
+ virReportError(VIR_ERR_INVALID_ARG,
+ _("unknown auto_shutdown_try_shutdown '%1$s'"),
+ autoShutdownScope);
+ return -1;
+ }
+ if (virConfGetValueString(conf, "auto_shutdown_poweroff", &autoShutdownScope) < 0)
+ return -1;
+
+ if (autoShutdownScope != NULL &&
+ (cfg->autoShutdownPoweroff =
+ virDomainDriverAutoShutdownScopeTypeFromString(autoShutdownScope)) < 0) {
+ virReportError(VIR_ERR_INVALID_ARG,
+ _("unknown auto_shutdown_poweroff '%1$s'"),
+ autoShutdownScope);
+ return -1;
+ }
return 0;
}
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 61a2bdce51..5d9ace6dcc 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -201,6 +201,9 @@ struct _virQEMUDriverConfig {
bool autoDumpBypassCache;
bool autoStartBypassCache;
int autoStartDelayMS;
+ int autoShutdownTrySave;
+ int autoShutdownTryShutdown;
+ int autoShutdownPoweroff;
char *lockManagerName;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 8e15a77be2..641b45fd8f 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -947,13 +947,12 @@ qemuStateStop(void)
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(qemu_driver);
virDomainDriverAutoShutdownConfig ascfg = {
.uri = cfg->uri,
- .trySave = VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCOPE_ALL,
- .tryShutdown = VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCOPE_NONE,
- .poweroff = VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCOPE_NONE
+ .trySave = cfg->autoShutdownTrySave,
+ .tryShutdown = cfg->autoShutdownTryShutdown,
+ .poweroff = cfg->autoShutdownPoweroff,
};
- if (!qemu_driver->privileged)
- virDomainDriverAutoShutdown(&ascfg);
+ virDomainDriverAutoShutdown(&ascfg);
return 0;
}
diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in
index c2a1d7d829..e7137f686f 100644
--- a/src/qemu/test_libvirtd_qemu.aug.in
+++ b/src/qemu/test_libvirtd_qemu.aug.in
@@ -76,6 +76,9 @@ module Test_libvirtd_qemu =
{ "auto_dump_bypass_cache" = "0" }
{ "auto_start_bypass_cache" = "0" }
{ "auto_start_delay" = "0" }
+{ "auto_shutdown_try_save" = "all" }
+{ "auto_shutdown_try_shutdown" = "none" }
+{ "auto_shutdown_poweroff" = "none" }
{ "hugetlbfs_mount" = "/dev/hugepages" }
{ "bridge_helper" = "qemu-bridge-helper" }
{ "set_process_name" = "1" }
--
2.47.1