Re: [PATCH v2] qga: Fix suspend on Linux guests without systemd

[Konstantin Kostiuk]

Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>

On Thu, Apr 6, 2023 at 3:42 PM Mark Somerville <mark@qpok.net> wrote:

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>
---
v1: Identical to this version(!) but missing from qemu-devel... Sincere
    apologies to anyone receiving this patch twice. I ran up against a
    deeply frustrating and depressing SMTP issue which should now be
    resovled.

 qga/commands-posix.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 079689d79a..59e7154af4 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -1918,10 +1918,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);
@@ -1930,10 +1930,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);
--
2.40.0