shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-30 18:50:18 +03:00
Code Releases Activity

remote: always invoke virStateStop for all daemons

Browse Source 
Currently the virStateStop method is only wired up to run save for
the unprivileged daemons, so there is no functional change.

IOW, session exit, or host OS shutdown will trigger VM managed saved
for QEMU session daemon, but not the system daemon.

This changes the daemon code to always run virStateStop for all
daemons. Instead the QEMU driver is responsible for skipping its
own logic when running privileged...for now.

This means that virStateStop will now be triggered by logind's
PrepareForShutdown signal.

Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2024-12-17 17:06:18 +00:00
parent 991a20a938
commit 2b792b35a4
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qemu/qemu_driver.c
View File

@ -968,7 +968,8 @@ qemuStateStop(void)
.uri = cfg->uri,
};
virDomainDriverAutoShutdown(&ascfg);
if (!qemu_driver->privileged)
virDomainDriverAutoShutdown(&ascfg);
return 0;
}

34
src/remote/remote_daemon.c
View File

@ -628,30 +628,32 @@ static void daemonRunStateInit(void *opaque)
virStateShutdownPrepare,
virStateShutdownWait);
/* Tie the non-privileged daemons to the session/shutdown lifecycle */
/* Signal for VM shutdown when desktop session is terminated, in
* unprivileged daemons */
if (!virNetDaemonIsPrivileged(dmn)) {
if (virGDBusHasSessionBus()) {
sessionBus = virGDBusGetSessionBus();
if (sessionBus != NULL)
g_dbus_connection_add_filter(sessionBus,
handleSessionMessageFunc, dmn, NULL);
}
}
if (virGDBusHasSystemBus()) {
systemBus = virGDBusGetSystemBus();
if (systemBus != NULL)
g_dbus_connection_signal_subscribe(systemBus,
"org.freedesktop.login1",
"org.freedesktop.login1.Manager",
"PrepareForShutdown",
NULL,
NULL,
G_DBUS_SIGNAL_FLAGS_NONE,
handleSystemMessageFunc,
dmn,
NULL);
}
if (virGDBusHasSystemBus()) {
/* Signal for VM shutdown when host OS shutdown is requested, in
* both privileged and unprivileged daemons */
systemBus = virGDBusGetSystemBus();
if (systemBus != NULL)
g_dbus_connection_signal_subscribe(systemBus,
"org.freedesktop.login1",
"org.freedesktop.login1.Manager",
"PrepareForShutdown",
NULL,
NULL,
G_DBUS_SIGNAL_FLAGS_NONE,
handleSystemMessageFunc,
dmn,
NULL);
}
/* Only now accept clients from network */