Re: [Qemu-devel] [PATCH 1/1] qga: update docs with systemd suspend support info

[Daniel Henrique Barboza]

On 11/13/18 2:32 PM, Eric Blake wrote:
> On 11/13/18 10:09 AM, Daniel Henrique Barboza wrote:
> > Commit 067927d62e ("qga: systemd hibernate/suspend/hybrid-sleep
> > support") failed to update qapi-schema.json after adding systemd
> > hibernate/suspend/hybrid-sleep capabilities to guest-suspend-* QGA
> > commands.
> >
> > Signed-off-by: Daniel Henrique Barboza <address@hidden>
> > ---
> >   qga/qapi-schema.json | 37 ++++++++++++++++++++++++++-----------
> >   1 file changed, 26 insertions(+), 11 deletions(-)
>
> > +++ b/qga/qapi-schema.json
> > @@ -532,12 +532,16 @@
> >   #
> >   # Suspend guest to disk.
> >   #
> > -# This command tries to execute the scripts provided by the pm-utils 
> > package.
> > -# If it's not available, the suspend operation will be performed by 
> > manually
> > -# writing to a sysfs file.
> > +# This command attempts to suspend the guest using three strategies, 
> > in this
> > +# order:
> >   #
> > -# For the best results it's strongly recommended to have the pm-utils
> > -# package installed in the guest.
> > +# - systemd hibernate
> > +# - pm-utils (via pm-hibernate)
> > +# - manual write into sysfs
> > +#
> > +# If the guest does not have systemd hibernate support, the scripts 
> > in pm-utils
> > +# package are executed, in case pm-utils is available. Manual write 
> > in sysfs
> > +# is a last resort.
>
> Does this paragraph add any information compared to the earlier list?

Perhaps we can remove the paragraph and add "if available" remarks in 
the listing?
Like:

+# - systemd hibernate, if supported
+# - pm-utils (via pm-hibernate), if pm-utils is installed
+# - manual write into sysfs as a last resort

Same for the other 2 cases below.

> >   #
> >   # This command does NOT return a response on success. There is a 
> > high chance
> >   # the command succeeded if the VM exits with a zero exit status or, 
> > when
> > @@ -560,12 +564,16 @@
> >   #
> >   # Suspend guest to ram.
> >   #
> > -# This command tries to execute the scripts provided by the pm-utils 
> > package.
> > -# If it's not available, the suspend operation will be performed by 
> > manually
> > -# writing to a sysfs file.
> > +# This command attempts to suspend the guest using three strategies, 
> > in this
> > +# order:
> > +#
> > +# - systemd suspend
> > +# - pm-utils (via pm-suspend)
> > +# - manual write into sysfs
> >   #
> > -# For the best results it's strongly recommended to have the pm-utils
> > -# package installed in the guest.
> > +# If the guest does not have systemd suspend support, the scripts in 
> > pm-utils
> > +# package are executed, in case pm-utils is available. Manual write 
> > in sysfs
> > +# is a last resort.
>
> Likewise.
>
> >   #
> >   # IMPORTANT: guest-suspend-ram requires QEMU to support the 
> > 'system_wakeup'
> >   # command.  Thus, it's *required* to query QEMU for the presence of 
> > the
> > @@ -592,7 +600,14 @@
> >   #
> >   # Save guest state to disk and suspend to ram.
> >   #
> > -# This command requires the pm-utils package to be installed in the 
> > guest.
> > +# This command attempts to suspend the guest using three strategies, 
> > in this
> > +# order:
> > +#
> > +# - systemd hybrid-sleep
> > +# - pm-utils (via pm-suspend-hybrid)
> > +#
> > +# If the guest does not have systemd hybrid-sleep support, the 
> > scripts in
> > +# pm-utils package are executed, in case pm-utils is available.
>
> "using three strategies" but a list of only 2 seems odd.

Copy/paste busted!