From patchwork Tue Sep 18 18:52:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 10604801 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B3CF45A4 for ; Tue, 18 Sep 2018 18:54:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1E2F2B093 for ; Tue, 18 Sep 2018 18:54:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 94F8A2B0B0; Tue, 18 Sep 2018 18:54:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CA1DC2B093 for ; Tue, 18 Sep 2018 18:54:46 +0000 (UTC) Received: from localhost ([::1]:42129 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g2L93-0000TD-9J for patchwork-qemu-devel@patchwork.kernel.org; Tue, 18 Sep 2018 14:54:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57430) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g2L7k-0007oc-3j for qemu-devel@nongnu.org; Tue, 18 Sep 2018 14:53:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g2L7e-0003E8-Mb for qemu-devel@nongnu.org; Tue, 18 Sep 2018 14:53:20 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:36440) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g2L7c-000375-JS for qemu-devel@nongnu.org; Tue, 18 Sep 2018 14:53:18 -0400 Received: by mail-qt0-x244.google.com with SMTP id t5-v6so2746158qtn.3 for ; Tue, 18 Sep 2018 11:53:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Eh7t6eVrAJhmvryd/XEocpt5dlF7bWef9scYhurdfPI=; b=b64HxoHnvZwsIlCs0B4F/pyyqapoQ8RYPqvyROJgqZ5SgUKKQsuEF5tndBG7t6hUN+ CtIK93oSJaXJb/V10H+EoJVWeaXEPTaMo/mHFfn12BdpkAJsYQD33eUDwUtByRJDHLLf bZigpXt03P5haYJqML1WYsnXcAMyb/N4zxKirKKXWQtCzFOaONJsGHWhzGUTzgTLxPjN tq7ixEbsjpOmAAC2oZgixBRSLMgx7lS2IDH1oo20B3h1hh25JQTHy+glAOkyubkaryEI 8n//50b5GZ287vvVGguj5ZXi0VLwWb70m8WmGwNWpJb3feKwFSZk9zdXNSc6lhIOJKAk bLXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Eh7t6eVrAJhmvryd/XEocpt5dlF7bWef9scYhurdfPI=; b=J2ep98gS2+57jbd+/UKywLAV7TY4qd6pbTeNafRhtALVidFBre+MGz7Bzlz1MqtLwS U4GK7X1kw8r6IcViea0/+An5S+w/EFfPEXJ/qwjjQJ0Grzwa78BjyenpTDsB0JsjLI5O vdV6mdJnpI5cXLGKu3DgWl8glCzZXYFy1lrNKAxJyZ46d6+EwJTZXcgTKPYDEbby0ifJ HntDnNnFaYNtsJzFnHSB7Aa3lh4dhSz7PGBYxK5U4T1ZAZT90XJZhoIE+6uEsbAWjKRT O+FrRSQidNlinGCsPzI4mMzf5eTK0lwuIi9ESCYNs+5b1ry6eI99dT08Y23TJe696IJn U+gg== X-Gm-Message-State: APzg51BWp1d8CXgicGQ9kvHEnS6XgPV1f36uCjcsxAjeg/qSPEC6r6sQ NQ3PcOv3RT3dVxIsnB9pU2fNrlhtH+k= X-Google-Smtp-Source: ANB0VdZQNYe5QZ4Fgvmja7vjbVqhgOdqZ+IQ3a9/G5oLlVFJ3fmcOQdGjAbvwQ/HrEHHU5vVwsgrTQ== X-Received: by 2002:a0c:eac3:: with SMTP id y3-v6mr21604284qvp.89.1537296791975; Tue, 18 Sep 2018 11:53:11 -0700 (PDT) Received: from localhost.localdomain ([2804:431:f700:46a7:852b:e394:1f41:b69d]) by smtp.gmail.com with ESMTPSA id n186-v6sm10568244qkb.32.2018.09.18.11.53.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Sep 2018 11:53:11 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Date: Tue, 18 Sep 2018 15:52:44 -0300 Message-Id: <20180918185246.18109-2-danielhb413@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180918185246.18109-1-danielhb413@gmail.com> References: <20180918185246.18109-1-danielhb413@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH v9 1/3] qmp: query-current-machine with wakeup-suspend-support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ehabkost@redhat.com, mst@redhat.com, Daniel Henrique Barboza , armbru@redhat.com, mdroth@linux.vnet.ibm.com, imammedo@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP When issuing the qmp/hmp 'system_wakeup' command, what happens in a nutshell is: - qmp_system_wakeup_request set runstate to RUNNING, sets a wakeup_reason and notify the event - in the main_loop, all vcpus are paused, a system reset is issued, all subscribers of wakeup_notifiers receives a notification, vcpus are then resumed and the wake up QAPI event is fired Note that this procedure alone doesn't ensure that the guest will awake from SUSPENDED state - the subscribers of the wake up event must take action to resume the guest, otherwise the guest will simply reboot. At this moment, only the ACPI machines via acpi_pm1_cnt_init has wake-up from suspend support. However, only the presence of 'system_wakeup' is required for QGA to support 'guest-suspend-ram' and 'guest-suspend-hybrid' at this moment. This means that the user/management will expect to suspend the guest using one of those suspend commands and then resume execution using system_wakeup, regardless of the support offered in system_wakeup in the first place. This patch creates a new API called query-current-machine [1], that holds a new flag called 'wakeup-suspend-support' that indicates if the guest supports wake up from suspend via system_wakeup. The machine is considered to implement wake-up support if a call to a new 'qemu_register_wakeup_support' is made during its init, as it is now being done inside acpi_pm1_cnt_init. This allows for any other machine type to declare wake-up support regardless of ACPI state or wakeup_notifiers subscription, making easier for newer implementations that might have its own mechanisms in the future. This is the expected output of query-current-machine when running a x86 guest: {"execute" : "query-current-machine"} {"return": {"wakeup-suspend-support": true}} Running the same x86 guest, but with the --no-acpi option: {"execute" : "query-current-machine"} {"return": {"wakeup-suspend-support": false}} This is the output when running a pseries guest: {"execute" : "query-current-machine"} {"return": {"wakeup-suspend-support": false}} With this extra tool, management can avoid situations where a guest that does not have proper suspend/wake capabilities ends up in inconsistent state (e.g. https://github.com/open-power-host-os/qemu/issues/31). [1] the decision of creating the query-current-machine API is based on discussions in the QEMU mailing list where it was decided that query-target wasn't a proper place to store the wake-up flag, neither was query-machines because this isn't a static property of the machine object. This new API can then be used to store other dynamic machine properties that are scattered around the code ATM. More info at: https://lists.gnu.org/archive/html/qemu-devel/2018-05/msg04235.html Reported-by: Balamuruhan S Signed-off-by: Daniel Henrique Barboza --- hw/acpi/core.c | 1 + include/sysemu/sysemu.h | 1 + qapi/misc.json | 24 ++++++++++++++++++++++++ vl.c | 19 +++++++++++++++++++ 4 files changed, 45 insertions(+) diff --git a/hw/acpi/core.c b/hw/acpi/core.c index b8d39012cd..2dea893245 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -617,6 +617,7 @@ void acpi_pm1_cnt_init(ACPIREGS *ar, MemoryRegion *parent, ar->pm1.cnt.s4_val = s4_val; ar->wakeup.notify = acpi_notify_wakeup; qemu_register_wakeup_notifier(&ar->wakeup); + qemu_register_wakeup_support(); memory_region_init_io(&ar->pm1.cnt.io, memory_region_owner(parent), &acpi_pm_cnt_ops, ar, "acpi-cnt", 2); memory_region_add_subregion(parent, 4, &ar->pm1.cnt.io); diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 8d6095d98b..0446adacc6 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -77,6 +77,7 @@ void qemu_register_suspend_notifier(Notifier *notifier); void qemu_system_wakeup_request(WakeupReason reason); void qemu_system_wakeup_enable(WakeupReason reason, bool enabled); void qemu_register_wakeup_notifier(Notifier *notifier); +void qemu_register_wakeup_support(void); void qemu_system_shutdown_request(ShutdownCause reason); void qemu_system_powerdown_request(void); void qemu_register_powerdown_notifier(Notifier *notifier); diff --git a/qapi/misc.json b/qapi/misc.json index d450cfef21..b616d385a4 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -2003,6 +2003,30 @@ ## { 'command': 'query-machines', 'returns': ['MachineInfo'] } +## +# @CurrentMachineParams: +# +# Information describing the running machine parameters. +# +# @wakeup-suspend-support: true if the target supports wake up from +# suspend +# +# Since: 3.1.0 +## +{ 'struct': 'CurrentMachineParams', + 'data': { 'wakeup-suspend-support': 'bool'} } + +## +# @query-current-machine: +# +# Return a list of parameters of the running machine. +# +# Returns: CurrentMachineParams +# +# Since: 3.1.0 +## +{ 'command': 'query-current-machine', 'returns': 'CurrentMachineParams' } + ## # @CpuDefinitionInfo: # diff --git a/vl.c b/vl.c index 5ba06adf78..f78947f69c 100644 --- a/vl.c +++ b/vl.c @@ -184,6 +184,7 @@ bool boot_strict; uint8_t *boot_splash_filedata; size_t boot_splash_filedata_size; uint8_t qemu_extra_params_fw[2]; +bool wakeup_suspend_enabled; int icount_align_option; @@ -1753,6 +1754,24 @@ void qemu_register_wakeup_notifier(Notifier *notifier) notifier_list_add(&wakeup_notifiers, notifier); } +void qemu_register_wakeup_support(void) +{ + wakeup_suspend_enabled = true; +} + +static bool qemu_wakeup_suspend_enabled(void) +{ + return wakeup_suspend_enabled; +} + +CurrentMachineParams *qmp_query_current_machine(Error **errp) +{ + CurrentMachineParams *params = g_malloc0(sizeof(*params)); + params->wakeup_suspend_support = qemu_wakeup_suspend_enabled(); + + return params; +} + void qemu_system_killed(int signal, pid_t pid) { shutdown_signal = signal; From patchwork Tue Sep 18 18:52:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 10604817 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 058EF6CB for ; Tue, 18 Sep 2018 19:01:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E6FC92B467 for ; Tue, 18 Sep 2018 19:01:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D8E182B472; Tue, 18 Sep 2018 19:01:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 871312B467 for ; Tue, 18 Sep 2018 19:01:58 +0000 (UTC) Received: from localhost ([::1]:42182 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g2LG1-0006YO-Vi for patchwork-qemu-devel@patchwork.kernel.org; Tue, 18 Sep 2018 15:01:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g2L7k-0007og-6j for qemu-devel@nongnu.org; Tue, 18 Sep 2018 14:53:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g2L7f-0003Fh-N4 for qemu-devel@nongnu.org; Tue, 18 Sep 2018 14:53:21 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:37661) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g2L7e-00039K-8g for qemu-devel@nongnu.org; Tue, 18 Sep 2018 14:53:18 -0400 Received: by mail-qt0-x242.google.com with SMTP id n6-v6so2744695qtl.4 for ; Tue, 18 Sep 2018 11:53:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YoHDt3VFJvjZo9uSTOok/ssJkERyZnoUTNT2HKQUqAY=; b=sk4qJAVr07LOYOWc4SfAH/o01dOHsLC6zEUVojfcjzQ/2SeF0q6SOdLkZeUnJ8n3P5 COSfwBq//ib2J9w2w5hQDl8NR+cdL10QsEdqDtNmdoc1g5+6iXpAqXKbKlBKUtW2R6Cu W3I7caOVIMkmbRl0yuAuya9/C5wnz26Eo0Bq+onrjlRJNVgxNgT5wqq5YmlhMy7e1ETr jXXRcSLmarA81ezOCh2frbG0b7/5n2AXOP35GV+sA7WNdCt9r44D6nZHwBXEv1d5XbY1 XCn5BvVOmk2oNp6BHGHqh3YlYCgSgRNaq33dc+7MAaaDgcSN/qLKckAlndk8pk642O5V 4uLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YoHDt3VFJvjZo9uSTOok/ssJkERyZnoUTNT2HKQUqAY=; b=QyV4snpysuE2K7IT+xYPnQrZzQzpcmqp2QfZ7MQwYFqu4tUtZR2tcRCqZsnDJGHJzo mfHcnVuKNzGqUbMnXIIjMpxlfPePIFnCL/uM7bz0UvJWPDEY9+44fGL4Azx7gphjgZzh XZaUG7hWGX7UOofaX5zkIhuKIkAGH4McawZP1/XYg2LmeWqfWXvxHte/jI41VmeScAf3 NHZAjB+8yEG1BjGyFXUCNkA0vrLuTEgPeWUOCZRpvaAMo5fIZsePiav+B0qim8y6Q42J u5ONhqpPo5jP58HhQ3ppZfH2X9fmgCYNh0o2FcUZfUy++W4wejh3A81WIlbY4ejWTgTj 8mPQ== X-Gm-Message-State: APzg51CyG0I2oLZgdeaXHMjXoFzbfult4a4pi1LruhnGCM6/1h1wPDdG ojaVlwVN52bO/xGg/iuf9YUHeU5wQHw= X-Google-Smtp-Source: ANB0VdYqB7pyVi4U5u2SB8r1rwtr4EsoVBlcJCdMf7M8IRmsGwxz7qFrr7dIVl7AC5p7854YS1/xwQ== X-Received: by 2002:a0c:91d8:: with SMTP id r24-v6mr22237511qvr.113.1537296793840; Tue, 18 Sep 2018 11:53:13 -0700 (PDT) Received: from localhost.localdomain ([2804:431:f700:46a7:852b:e394:1f41:b69d]) by smtp.gmail.com with ESMTPSA id n186-v6sm10568244qkb.32.2018.09.18.11.53.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Sep 2018 11:53:13 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Date: Tue, 18 Sep 2018 15:52:45 -0300 Message-Id: <20180918185246.18109-3-danielhb413@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180918185246.18109-1-danielhb413@gmail.com> References: <20180918185246.18109-1-danielhb413@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH v9 2/3] qga: update guest-suspend-ram and guest-suspend-hybrid descriptions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ehabkost@redhat.com, mst@redhat.com, Daniel Henrique Barboza , armbru@redhat.com, mdroth@linux.vnet.ibm.com, imammedo@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch updates the descriptions of 'guest-suspend-ram' and 'guest-suspend-hybrid' to mention that both commands relies now on the proper support for wake up from suspend, retrieved by the 'wakeup-suspend-support' attribute of the 'query-current-machine' QMP command. Reported-by: Balamuruhan S Signed-off-by: Daniel Henrique Barboza Reviewed-by: Michael Roth --- qga/qapi-schema.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json index dfbc4a5e32..7ae7e2502c 100644 --- a/qga/qapi-schema.json +++ b/qga/qapi-schema.json @@ -567,9 +567,9 @@ # For the best results it's strongly recommended to have the pm-utils # package installed in the guest. # -# IMPORTANT: guest-suspend-ram requires QEMU to support the 'system_wakeup' -# command. Thus, it's *required* to query QEMU for the presence of the -# 'system_wakeup' command before issuing guest-suspend-ram. +# IMPORTANT: guest-suspend-ram requires working wakeup support in +# QEMU. You *must* check QMP command query-current-machine returns +# wakeup-suspend-support: true before issuing this command. # # This command does NOT return a response on success. There are two options # to check for success: @@ -594,9 +594,9 @@ # # This command requires the pm-utils package to be installed in the guest. # -# IMPORTANT: guest-suspend-hybrid requires QEMU to support the 'system_wakeup' -# command. Thus, it's *required* to query QEMU for the presence of the -# 'system_wakeup' command before issuing guest-suspend-hybrid. +# IMPORTANT: guest-suspend-hybrid requires working wakeup support in +# QEMU. You *must* check QMP command query-current-machine returns +# wakeup-suspend-support: true before issuing this command. # # This command does NOT return a response on success. There are two options # to check for success: From patchwork Tue Sep 18 18:52:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 10604815 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ECD6417E0 for ; Tue, 18 Sep 2018 19:00:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA4582B287 for ; Tue, 18 Sep 2018 19:00:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC68F2B35A; Tue, 18 Sep 2018 19:00:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 349232B287 for ; Tue, 18 Sep 2018 19:00:14 +0000 (UTC) Received: from localhost ([::1]:42170 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g2LEL-0005Pk-Aq for patchwork-qemu-devel@patchwork.kernel.org; Tue, 18 Sep 2018 15:00:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57438) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g2L7k-0007om-94 for qemu-devel@nongnu.org; Tue, 18 Sep 2018 14:53:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g2L7f-0003G2-QC for qemu-devel@nongnu.org; Tue, 18 Sep 2018 14:53:22 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:39540) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g2L7e-0003Bi-I6 for qemu-devel@nongnu.org; Tue, 18 Sep 2018 14:53:18 -0400 Received: by mail-qt0-x244.google.com with SMTP id o15-v6so2737712qtk.6 for ; Tue, 18 Sep 2018 11:53:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MFbd9+02Z5vYjnQEWIgMY3o8xceTpxWouVmsyIMX8Xs=; b=uCvL6B3NSbYG4hMVoMQ6VmcYFV8G8uNv1WAoX1K+SCUlogMtmsT4dOZJewCmlLZAEe BilGOHch0Bic44UBeK+JYyWRLuP8gm3LwIWumEJ5t5LDi74RKnJWtB9NB4pqOEDveYYa LY7YLbWRd+bqqT9KIlwSm9vIQT09B8bujaeJPHkBrc56kZ28I6GsbAAF4f2hyBZAOQHA FojdsPzzZAiuysALDNvpPIaKm2xQg2bY9EDeNNwCF27X2juXb4WSMAlqapvW/Jb5JHZt vTIzHh3PfQs+CdzizJ4hT023Odjpn8nJac6CcNgh1UnC+yokHHrygy62+rISK+Vi1dxs /3Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MFbd9+02Z5vYjnQEWIgMY3o8xceTpxWouVmsyIMX8Xs=; b=t1uJGtdY1DBcpGgNqy9diLvQrHEynTR72JshONyi3gLdP/isBiw2aTZHHiqstEq8s9 wugsKxb8t1VDh+Nf4ZPPPUMijMzcRUeyU6DzLUN2LJ5xVsMjJ+qUe/mvv8LSQ3welt7M NVFMJkPtAxAcNhsRPz5Y11CVnwT49DTK7Ht9tLFx/BKrphgTAE4Iguw9lTzFTRNEWw0c lbz2a7zVguYKNNlXb1GIWb6hYCHgymt/meaUNFEQnbLI1eJCz/DehxVAtKLdr8fmPSIn jgyclDK1pd6mNFN7c1mzAS7UeDKDwGZYFbxhih+etUkGkTB2+2ZqxHROPbKtAxKg4Znh IDKA== X-Gm-Message-State: APzg51AM7meOd0TAu5lizWR81vUvnGL96FYLwd+jJmyCwGQewrtGR5St z5cMaR/4WzkkMC37F9WMhnyDrlkj8jM= X-Google-Smtp-Source: ANB0VdbhmdSee7NJIpMQacCGuSJPSWrJbU+TGNcYwBi9ls8uJrPX1ubgCgrO1sfSv1+vSsY+yzY86w== X-Received: by 2002:a0c:c202:: with SMTP id l2-v6mr21891155qvh.209.1537296796328; Tue, 18 Sep 2018 11:53:16 -0700 (PDT) Received: from localhost.localdomain ([2804:431:f700:46a7:852b:e394:1f41:b69d]) by smtp.gmail.com with ESMTPSA id n186-v6sm10568244qkb.32.2018.09.18.11.53.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Sep 2018 11:53:15 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Date: Tue, 18 Sep 2018 15:52:46 -0300 Message-Id: <20180918185246.18109-4-danielhb413@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180918185246.18109-1-danielhb413@gmail.com> References: <20180918185246.18109-1-danielhb413@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH v9 3/3] qmp hmp: Make system_wakeup check wake-up support and run state X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ehabkost@redhat.com, mst@redhat.com, Daniel Henrique Barboza , armbru@redhat.com, mdroth@linux.vnet.ibm.com, imammedo@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The qmp/hmp command 'system_wakeup' is simply a direct call to 'qemu_system_wakeup_request' from vl.c. This function verifies if runstate is SUSPENDED and if the wake up reason is valid before proceeding. However, no error or warning is thrown if any of those pre-requirements isn't met. There is no way for the caller to differentiate between a successful wakeup or an error state caused when trying to wake up a guest that wasn't suspended. This means that system_wakeup is silently failing, which can be considered a bug. Adding error handling isn't an API break in this case - applications that didn't check the result will remain broken, the ones that check it will have a chance to deal with it. Adding to that, the commit before previous created a new QMP API called query-current-machine, with a new flag called wakeup-suspend-support, that indicates if the guest has the capability of waking up from suspended state. Although such guest will never reach SUSPENDED state and erroring it out in this scenario would suffice, it is more informative for the user to differentiate between a failure because the guest isn't suspended versus a failure because the guest does not have support for wake up at all. All this considered, this patch changes qmp_system_wakeup to: - check if the guest has the capability to wake-up from suspend. If not, error out informing about the lack of support; - make the runstate verification before proceeding to call qemu_system_wakeup_request, firing up an error message if the user tries to wake up a machine that isn't in SUSPENDED state. After this patch, this is the output of system_wakeup in a guest that does not have wake-up from suspend support (ppc64): (qemu) system_wakeup wake-up from suspend is not supported by this guest (qemu) And this is the output of system_wakeup in a x86 guest that has the support but isn't suspended: (qemu) system_wakeup Unable to wake up: guest is not in suspended state (qemu) Reported-by: Balamuruhan S Signed-off-by: Daniel Henrique Barboza --- hmp.c | 5 ++++- include/sysemu/sysemu.h | 1 + qapi/misc.json | 5 ++++- qmp.c | 10 ++++++++++ vl.c | 2 +- 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/hmp.c b/hmp.c index 4975fa56b0..e98c24782f 100644 --- a/hmp.c +++ b/hmp.c @@ -1203,7 +1203,10 @@ void hmp_cont(Monitor *mon, const QDict *qdict) void hmp_system_wakeup(Monitor *mon, const QDict *qdict) { - qmp_system_wakeup(NULL); + Error *err = NULL; + + qmp_system_wakeup(&err); + hmp_handle_error(mon, &err); } void hmp_nmi(Monitor *mon, const QDict *qdict) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 0446adacc6..8d91c5ad5b 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -74,6 +74,7 @@ void qemu_exit_preconfig_request(void); void qemu_system_reset_request(ShutdownCause reason); void qemu_system_suspend_request(void); void qemu_register_suspend_notifier(Notifier *notifier); +bool qemu_wakeup_suspend_enabled(void); void qemu_system_wakeup_request(WakeupReason reason); void qemu_system_wakeup_enable(WakeupReason reason, bool enabled); void qemu_register_wakeup_notifier(Notifier *notifier); diff --git a/qapi/misc.json b/qapi/misc.json index b616d385a4..2f5995f45f 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -1230,7 +1230,10 @@ ## # @system_wakeup: # -# Wakeup guest from suspend. Does nothing in case the guest isn't suspended. +# If the guest has wake-up from suspend support enabled +# (wakeup-suspend-support flag from query-current-machine), wakeup guest +# from suspend if the guest is in SUSPENDED state. Returns an error +# otherwise. # # Since: 1.1 # diff --git a/qmp.c b/qmp.c index e7c0a2fd60..44e619d1be 100644 --- a/qmp.c +++ b/qmp.c @@ -183,6 +183,16 @@ void qmp_cont(Error **errp) void qmp_system_wakeup(Error **errp) { + if (!qemu_wakeup_suspend_enabled()) { + error_setg(errp, + "wake-up from suspend is not supported by this guest"); + return; + } + if (!runstate_check(RUN_STATE_SUSPENDED)) { + error_setg(errp, + "Unable to wake up: guest is not in suspended state"); + return; + } qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); } diff --git a/vl.c b/vl.c index f78947f69c..35a33d61ba 100644 --- a/vl.c +++ b/vl.c @@ -1759,7 +1759,7 @@ void qemu_register_wakeup_support(void) wakeup_suspend_enabled = true; } -static bool qemu_wakeup_suspend_enabled(void) +bool qemu_wakeup_suspend_enabled(void) { return wakeup_suspend_enabled; }