mirror of https://github.com/xemu-project/xemu.git
qga: Fix suspend on Linux guests without systemd
Allow the Linux guest agent to attempt each of the suspend methods
(systemctl, pm-* and writing to /sys) in turn.
Prior to this guests without systemd failed to suspend due to
`guest_suspend` returning early regardless of the return value of
`systemd_supports_mode`.
Signed-off-by: Mark Somerville <mark@qpok.net>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
(cherry picked from commit 86dcb6ab9b
)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
parent
8e84a20705
commit
07e7102b8e
|
@ -1925,10 +1925,10 @@ static void guest_suspend(SuspendMode mode, Error **errp)
|
|||
if (systemd_supports_mode(mode, &local_err)) {
|
||||
mode_supported = true;
|
||||
systemd_suspend(mode, &local_err);
|
||||
}
|
||||
|
||||
if (!local_err) {
|
||||
return;
|
||||
if (!local_err) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
error_free(local_err);
|
||||
|
@ -1937,10 +1937,10 @@ static void guest_suspend(SuspendMode mode, Error **errp)
|
|||
if (pmutils_supports_mode(mode, &local_err)) {
|
||||
mode_supported = true;
|
||||
pmutils_suspend(mode, &local_err);
|
||||
}
|
||||
|
||||
if (!local_err) {
|
||||
return;
|
||||
if (!local_err) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
error_free(local_err);
|
||||
|
|
Loading…
Reference in New Issue