| Message ID | 20240927183906.1248-2-annie.li@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Support ACPI Control Method Sleep button | expand |
On Fri, 27 Sep 2024 14:38:56 -0400 Annie Li <annie.li@oracle.com> wrote: > Followng hmp/qmp commands are implemented for pressing virtual > sleep button, > > hmp: system_sleep > qmp: { "execute": "system_sleep" } > > These commands put the guest into suspend or other power states > depending on the power settings inside the guest. > > Signed-off-by: Annie Li <annie.li@oracle.com> > --- > hmp-commands.hx | 14 ++++++++++++++ > hw/core/machine-hmp-cmds.c | 5 +++++ > hw/core/machine-qmp-cmds.c | 9 +++++++++ > include/monitor/hmp.h | 1 + > qapi/machine.json | 18 ++++++++++++++++++ > qapi/pragma.json | 1 + > 6 files changed, 48 insertions(+) > > diff --git a/hmp-commands.hx b/hmp-commands.hx > index 06746f0afc..4c149f403f 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -639,6 +639,20 @@ SRST > whether profiling is on or off. > ERST > > + { > + .name = "system_sleep", > + .args_type = "", > + .params = "", > + .help = "send ACPI sleep event", > + .cmd = hmp_system_sleep, > + }, > + > +SRST > +``system_sleep`` > + Push the virtual sleep button; if supported the system will enter > + an ACPI sleep state. perhaps comma after 'if supported' > +ERST > + > { > .name = "system_reset", > .args_type = "", > diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c > index 8701f00cc7..3ee529d8d5 100644 > --- a/hw/core/machine-hmp-cmds.c > +++ b/hw/core/machine-hmp-cmds.c > @@ -189,6 +189,11 @@ void hmp_system_reset(Monitor *mon, const QDict *qdict) > qmp_system_reset(NULL); > } > > +void hmp_system_sleep(Monitor *mon, const QDict *qdict) > +{ > + qmp_system_sleep(NULL); > +} > + > void hmp_system_powerdown(Monitor *mon, const QDict *qdict) > { > qmp_system_powerdown(NULL); > diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c > index 130217da8f..770f8189ba 100644 > --- a/hw/core/machine-qmp-cmds.c > +++ b/hw/core/machine-qmp-cmds.c > @@ -276,6 +276,15 @@ void qmp_system_reset(Error **errp) > qemu_system_reset_request(SHUTDOWN_CAUSE_HOST_QMP_SYSTEM_RESET); > } > > +void qmp_system_sleep(Error **errp) > +{ > + if (!qemu_wakeup_suspend_enabled()) { > + error_setg(errp, > + "suspend from running is not supported by this guest"); it's machine and not the guest that doesn't support, isn't it? > + return; > + } I'd reorder this after 6/11, to avoid adding function that does nothing and then explaining why it is done this way. > +} > + > void qmp_system_powerdown(Error **errp) > { > qemu_system_powerdown_request(); > diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h > index ae116d9804..e543eec109 100644 > --- a/include/monitor/hmp.h > +++ b/include/monitor/hmp.h > @@ -43,6 +43,7 @@ void hmp_quit(Monitor *mon, const QDict *qdict); > void hmp_stop(Monitor *mon, const QDict *qdict); > void hmp_sync_profile(Monitor *mon, const QDict *qdict); > void hmp_system_reset(Monitor *mon, const QDict *qdict); > +void hmp_system_sleep(Monitor *mon, const QDict *qdict); > void hmp_system_powerdown(Monitor *mon, const QDict *qdict); > void hmp_exit_preconfig(Monitor *mon, const QDict *qdict); > void hmp_announce_self(Monitor *mon, const QDict *qdict); > diff --git a/qapi/machine.json b/qapi/machine.json > index d4317435e7..b32d231aa9 100644 > --- a/qapi/machine.json > +++ b/qapi/machine.json > @@ -362,6 +362,24 @@ > ## > { 'command': 'system_reset' } > > +## > +# @system_sleep: > +# > +# Requests that a guest perform a ACPI sleep transition by pushing a virtual > +# sleep button. > +# > +# .. note:: A guest may or may not respond to this command. This command > +# returning does not indicate that a guest has accepted the request > +# or that it has gone to sleep. > +# > +# .. qmp-example:: > +# > +# -> { "execute": "system_sleep" } > +# <- { "return": {} } > +# > +## > +{ 'command': 'system_sleep' } > + > ## > # @system_powerdown: > # > diff --git a/qapi/pragma.json b/qapi/pragma.json > index 59fbe74b8c..e2c5dcb829 100644 > --- a/qapi/pragma.json > +++ b/qapi/pragma.json > @@ -23,6 +23,7 @@ > 'set_password', > 'system_powerdown', > 'system_reset', > + 'system_sleep', > 'system_wakeup' ], > # Commands allowed to return a non-dictionary > 'command-returns-exceptions': [
On 10/7/2024 8:44 AM, Igor Mammedov wrote: > On Fri, 27 Sep 2024 14:38:56 -0400 > Annie Li <annie.li@oracle.com> wrote: > >> Followng hmp/qmp commands are implemented for pressing virtual >> sleep button, >> >> hmp: system_sleep >> qmp: { "execute": "system_sleep" } >> >> These commands put the guest into suspend or other power states >> depending on the power settings inside the guest. >> >> Signed-off-by: Annie Li <annie.li@oracle.com> >> --- >> hmp-commands.hx | 14 ++++++++++++++ >> hw/core/machine-hmp-cmds.c | 5 +++++ >> hw/core/machine-qmp-cmds.c | 9 +++++++++ >> include/monitor/hmp.h | 1 + >> qapi/machine.json | 18 ++++++++++++++++++ >> qapi/pragma.json | 1 + >> 6 files changed, 48 insertions(+) >> >> diff --git a/hmp-commands.hx b/hmp-commands.hx >> index 06746f0afc..4c149f403f 100644 >> --- a/hmp-commands.hx >> +++ b/hmp-commands.hx >> @@ -639,6 +639,20 @@ SRST >> whether profiling is on or off. >> ERST >> >> + { >> + .name = "system_sleep", >> + .args_type = "", >> + .params = "", >> + .help = "send ACPI sleep event", >> + .cmd = hmp_system_sleep, >> + }, >> + >> +SRST >> +``system_sleep`` >> + Push the virtual sleep button; if supported the system will enter >> + an ACPI sleep state. > perhaps comma after 'if supported' Sure thing > > >> +ERST >> + >> { >> .name = "system_reset", >> .args_type = "", >> diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c >> index 8701f00cc7..3ee529d8d5 100644 >> --- a/hw/core/machine-hmp-cmds.c >> +++ b/hw/core/machine-hmp-cmds.c >> @@ -189,6 +189,11 @@ void hmp_system_reset(Monitor *mon, const QDict *qdict) >> qmp_system_reset(NULL); >> } >> >> +void hmp_system_sleep(Monitor *mon, const QDict *qdict) >> +{ >> + qmp_system_sleep(NULL); >> +} >> + >> void hmp_system_powerdown(Monitor *mon, const QDict *qdict) >> { >> qmp_system_powerdown(NULL); >> diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c >> index 130217da8f..770f8189ba 100644 >> --- a/hw/core/machine-qmp-cmds.c >> +++ b/hw/core/machine-qmp-cmds.c >> @@ -276,6 +276,15 @@ void qmp_system_reset(Error **errp) >> qemu_system_reset_request(SHUTDOWN_CAUSE_HOST_QMP_SYSTEM_RESET); >> } >> >> +void qmp_system_sleep(Error **errp) >> +{ >> + if (!qemu_wakeup_suspend_enabled()) { >> + error_setg(errp, >> + "suspend from running is not supported by this guest"); > it's machine and not the guest that doesn't support, isn't it? Not the guest, will change this > >> + return; >> + } > I'd reorder this after 6/11, to avoid adding function that does nothing > and then explaining why it is done this way. OK, will do. Thanks Annie >> +} >> + >> void qmp_system_powerdown(Error **errp) >> { >> qemu_system_powerdown_request(); >> diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h >> index ae116d9804..e543eec109 100644 >> --- a/include/monitor/hmp.h >> +++ b/include/monitor/hmp.h >> @@ -43,6 +43,7 @@ void hmp_quit(Monitor *mon, const QDict *qdict); >> void hmp_stop(Monitor *mon, const QDict *qdict); >> void hmp_sync_profile(Monitor *mon, const QDict *qdict); >> void hmp_system_reset(Monitor *mon, const QDict *qdict); >> +void hmp_system_sleep(Monitor *mon, const QDict *qdict); >> void hmp_system_powerdown(Monitor *mon, const QDict *qdict); >> void hmp_exit_preconfig(Monitor *mon, const QDict *qdict); >> void hmp_announce_self(Monitor *mon, const QDict *qdict); >> diff --git a/qapi/machine.json b/qapi/machine.json >> index d4317435e7..b32d231aa9 100644 >> --- a/qapi/machine.json >> +++ b/qapi/machine.json >> @@ -362,6 +362,24 @@ >> ## >> { 'command': 'system_reset' } >> >> +## >> +# @system_sleep: >> +# >> +# Requests that a guest perform a ACPI sleep transition by pushing a virtual >> +# sleep button. >> +# >> +# .. note:: A guest may or may not respond to this command. This command >> +# returning does not indicate that a guest has accepted the request >> +# or that it has gone to sleep. >> +# >> +# .. qmp-example:: >> +# >> +# -> { "execute": "system_sleep" } >> +# <- { "return": {} } >> +# >> +## >> +{ 'command': 'system_sleep' } >> + >> ## >> # @system_powerdown: >> # >> diff --git a/qapi/pragma.json b/qapi/pragma.json >> index 59fbe74b8c..e2c5dcb829 100644 >> --- a/qapi/pragma.json >> +++ b/qapi/pragma.json >> @@ -23,6 +23,7 @@ >> 'set_password', >> 'system_powerdown', >> 'system_reset', >> + 'system_sleep', >> 'system_wakeup' ], >> # Commands allowed to return a non-dictionary >> 'command-returns-exceptions': [
diff --git a/hmp-commands.hx b/hmp-commands.hx index 06746f0afc..4c149f403f 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -639,6 +639,20 @@ SRST whether profiling is on or off. ERST + { + .name = "system_sleep", + .args_type = "", + .params = "", + .help = "send ACPI sleep event", + .cmd = hmp_system_sleep, + }, + +SRST +``system_sleep`` + Push the virtual sleep button; if supported the system will enter + an ACPI sleep state. +ERST + { .name = "system_reset", .args_type = "", diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c index 8701f00cc7..3ee529d8d5 100644 --- a/hw/core/machine-hmp-cmds.c +++ b/hw/core/machine-hmp-cmds.c @@ -189,6 +189,11 @@ void hmp_system_reset(Monitor *mon, const QDict *qdict) qmp_system_reset(NULL); } +void hmp_system_sleep(Monitor *mon, const QDict *qdict) +{ + qmp_system_sleep(NULL); +} + void hmp_system_powerdown(Monitor *mon, const QDict *qdict) { qmp_system_powerdown(NULL); diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index 130217da8f..770f8189ba 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -276,6 +276,15 @@ void qmp_system_reset(Error **errp) qemu_system_reset_request(SHUTDOWN_CAUSE_HOST_QMP_SYSTEM_RESET); } +void qmp_system_sleep(Error **errp) +{ + if (!qemu_wakeup_suspend_enabled()) { + error_setg(errp, + "suspend from running is not supported by this guest"); + return; + } +} + void qmp_system_powerdown(Error **errp) { qemu_system_powerdown_request(); diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index ae116d9804..e543eec109 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -43,6 +43,7 @@ void hmp_quit(Monitor *mon, const QDict *qdict); void hmp_stop(Monitor *mon, const QDict *qdict); void hmp_sync_profile(Monitor *mon, const QDict *qdict); void hmp_system_reset(Monitor *mon, const QDict *qdict); +void hmp_system_sleep(Monitor *mon, const QDict *qdict); void hmp_system_powerdown(Monitor *mon, const QDict *qdict); void hmp_exit_preconfig(Monitor *mon, const QDict *qdict); void hmp_announce_self(Monitor *mon, const QDict *qdict); diff --git a/qapi/machine.json b/qapi/machine.json index d4317435e7..b32d231aa9 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -362,6 +362,24 @@ ## { 'command': 'system_reset' } +## +# @system_sleep: +# +# Requests that a guest perform a ACPI sleep transition by pushing a virtual +# sleep button. +# +# .. note:: A guest may or may not respond to this command. This command +# returning does not indicate that a guest has accepted the request +# or that it has gone to sleep. +# +# .. qmp-example:: +# +# -> { "execute": "system_sleep" } +# <- { "return": {} } +# +## +{ 'command': 'system_sleep' } + ## # @system_powerdown: # diff --git a/qapi/pragma.json b/qapi/pragma.json index 59fbe74b8c..e2c5dcb829 100644 --- a/qapi/pragma.json +++ b/qapi/pragma.json @@ -23,6 +23,7 @@ 'set_password', 'system_powerdown', 'system_reset', + 'system_sleep', 'system_wakeup' ], # Commands allowed to return a non-dictionary 'command-returns-exceptions': [
Followng hmp/qmp commands are implemented for pressing virtual sleep button, hmp: system_sleep qmp: { "execute": "system_sleep" } These commands put the guest into suspend or other power states depending on the power settings inside the guest. Signed-off-by: Annie Li <annie.li@oracle.com> --- hmp-commands.hx | 14 ++++++++++++++ hw/core/machine-hmp-cmds.c | 5 +++++ hw/core/machine-qmp-cmds.c | 9 +++++++++ include/monitor/hmp.h | 1 + qapi/machine.json | 18 ++++++++++++++++++ qapi/pragma.json | 1 + 6 files changed, 48 insertions(+)