From nobody Tue Nov 4 18:40:46 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530821399752916.5503767644135; Thu, 5 Jul 2018 13:09:59 -0700 (PDT) Received: from localhost ([::1]:54655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbAZf-0004pY-6K for importer@patchew.org; Thu, 05 Jul 2018 16:09:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbAYN-0004Ch-0k for qemu-devel@nongnu.org; Thu, 05 Jul 2018 16:08:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fbAYL-0002dd-LA for qemu-devel@nongnu.org; Thu, 05 Jul 2018 16:08:34 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:37551) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fbAYL-0002cn-Fo for qemu-devel@nongnu.org; Thu, 05 Jul 2018 16:08:33 -0400 Received: by mail-qt0-x243.google.com with SMTP id a18-v6so8189585qtj.4 for ; Thu, 05 Jul 2018 13:08:33 -0700 (PDT) Received: from localhost.localdomain ([2804:431:f701:af73:9fee:2075:22ee:3d6b]) by smtp.gmail.com with ESMTPSA id 32-v6sm4418264qtf.13.2018.07.05.13.08.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 13:08:32 -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=RW1NkT3VxbGHIwflWbtDY/5FkKMTPpm8FU6VzXlrVrw=; b=BSDtqoU1DsDw3q+WWC3O1WAJ9sQToQTW2hDm9IigToIFobw8fCH1dtJMz+X+atUivU KhPcwePl2xVWSOQ4uZVi9uvjL4jYC+PpbhrWwPA8G7wvJyRLlCdItDqKVakRlGrynAh1 fdrkKwujjUQcnf1HnVqOCk9b8RlU1Bj+LiKufxHaTcDEllEzXzOSVimUai3ndEfLJ/Ad u9RMXA7Ln02zC+l+caw1l76unDJCYxhsWsgkRdEKxgqghz5iXRReG1riKhl5LGWVnWNc P9wgVWQZwUhikhMgpEzO7mhZ1fZ0n9M+k7JhNmjGKAcgzM+izKQ8TLdjdvNLqtU/zUBo d1Lg== 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=RW1NkT3VxbGHIwflWbtDY/5FkKMTPpm8FU6VzXlrVrw=; b=cUAFe9KRi2dHT1VCsEizTmGflufK01IGrAvX3gKzWSzschTZwN8sIsSD1iTrqHtli/ DeCPuxesdokcrcecj8UJj5xLYSiDz744TqaYIr5Rvnptj4VxqGssFJGs73kMN1kszNS7 mraniRhwv8a7Ochf0r76qDljHq5l33XNehoIKQZqUJt5IWnVHerZIybsnmZFUQPs0kzX JR2sA0RnBzkj9DcfTHsVOsfG002irCJyZCdvtp3fGDHa0YmtgZPgeOEd2Cc0YAQ3KvzY vI1bJpRgoLZKxJiVyqAIR9JDUTsGwUtKHRAqNavEc+7FDdfeCFdauLjmY/W8+yLv9VUR vk7A== X-Gm-Message-State: APt69E0/W/InfFYMeAsfkOUJAAUqFF82PoTQyjYKtsPBJc2sXgHVPERS /0xUlUJ+IBU9ZybBslv9gBcM92QB X-Google-Smtp-Source: AAOMgpdX7ot5KEysk0e+wwdY6DBMoGB0HCH6uW0fhbhQii5rqFha3n4nDktk8JDZkg5GTp3ANh1qpA== X-Received: by 2002:ac8:172c:: with SMTP id w41-v6mr6685013qtj.32.1530821312917; Thu, 05 Jul 2018 13:08:32 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Date: Thu, 5 Jul 2018 17:08:11 -0300 Message-Id: <20180705200813.2033-2-danielhb413@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705200813.2033-1-danielhb413@gmail.com> References: <20180705200813.2033-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::243 Subject: [Qemu-devel] [PATCH v8 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: mdroth@linux.vnet.ibm.com, Daniel Henrique Barboza , ehabkost@redhat.com, armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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, there are only two subscribers of the wake up event: one in hw/acpi/core.c and another in hw/i386/xen/xen-hvm.c. This means that system_wakeup does not work as intended with other architectures. 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', which indicates if the guest supports wake up from suspend via system_wakeup. The guest is considered to implement wake-up support if: - there is at least one subscriber for the wake up event; and, for the PC machine type: - ACPI is enabled. 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 --- qapi/misc.json | 24 ++++++++++++++++++++++++ vl.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/qapi/misc.json b/qapi/misc.json index 29da7856e3..266f88cb09 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -2003,6 +2003,30 @@ ## { 'command': 'query-machines', 'returns': ['MachineInfo'] } =20 +## +# @CurrentMachineParams: +# +# Information describing the running machine parameters. +# +# @wakeup-suspend-support: true if the target supports wake up from +# suspend +# +# Since: 3.0.0 +## +{ 'struct': 'CurrentMachineParams', + 'data': { 'wakeup-suspend-support': 'bool'} } + +## +# @query-current-machine: +# +# Return a list of parameters of the running machine. +# +# Returns: CurrentMachineParams +# +# Since: 3.0.0 +## +{ 'command': 'query-current-machine', 'returns': 'CurrentMachineParams' } + ## # @CpuDefinitionInfo: # diff --git a/vl.c b/vl.c index ef6cfcec40..96ad448d57 100644 --- a/vl.c +++ b/vl.c @@ -1747,11 +1747,41 @@ void qemu_system_wakeup_enable(WakeupReason reason,= bool enabled) } } =20 +/* + * The existence of a wake-up notifier is being checked in the function + * qemu_wakeup_suspend_support and it's used in the logic of the + * wakeup-suspend-support flag of QMP 'query-current-machine' command. + * The idea of this flag is to indicate whether the guest supports wake-up + * from suspend (via system_wakeup QMP/HMP call for example), warning the + * user that the guest can't handle both wake-up from suspend and the + * suspend itself via QGA guest-suspend-ram and guest-suspend-hybrid (if + * it can't wake up, it can't be suspended safely). + * + * An assumption is made by the wakeup-suspend-support flag that only the + * guests that can go to RUN_STATE_SUSPENDED and wake up properly would + * be interested in this wakeup_notifier. Adding a wakeup_notifier for + * any other reason will break the logic of the wakeup-suspend-support + * flag and can lead to user/management confusion about the suspend/wake-up + * support of the guest. + */ void qemu_register_wakeup_notifier(Notifier *notifier) { notifier_list_add(&wakeup_notifiers, notifier); } =20 +static bool qemu_wakeup_suspend_support(void) +{ + return !QLIST_EMPTY(&wakeup_notifiers.notifiers) && acpi_enabled; +} + +CurrentMachineParams *qmp_query_current_machine(Error **errp) +{ + CurrentMachineParams *params =3D g_malloc0(sizeof(*params)); + params->wakeup_suspend_support =3D qemu_wakeup_suspend_support(); + + return params; +} + void qemu_system_killed(int signal, pid_t pid) { shutdown_signal =3D signal; --=20 2.17.1 From nobody Tue Nov 4 18:40:46 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153082150930452.06831461748118; Thu, 5 Jul 2018 13:11:49 -0700 (PDT) Received: from localhost ([::1]:54669 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbAbU-0006Ib-H7 for importer@patchew.org; Thu, 05 Jul 2018 16:11:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49725) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbAYO-0004DT-CX for qemu-devel@nongnu.org; Thu, 05 Jul 2018 16:08:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fbAYN-0002h6-Ek for qemu-devel@nongnu.org; Thu, 05 Jul 2018 16:08:36 -0400 Received: from mail-qt0-x235.google.com ([2607:f8b0:400d:c0d::235]:35422) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fbAYN-0002gE-AH for qemu-devel@nongnu.org; Thu, 05 Jul 2018 16:08:35 -0400 Received: by mail-qt0-x235.google.com with SMTP id z6-v6so8191658qti.2 for ; Thu, 05 Jul 2018 13:08:35 -0700 (PDT) Received: from localhost.localdomain ([2804:431:f701:af73:9fee:2075:22ee:3d6b]) by smtp.gmail.com with ESMTPSA id 32-v6sm4418264qtf.13.2018.07.05.13.08.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 13:08:34 -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=xfm13l8uX9GZj8lMZ14pHe9rPLZ5LbrruxUtbqd2Hfg=; b=YpuPjrTAuQ2Tl+M7ZCtwxMXeUegavDx5IWC5IYNQCbof/GuMTTw/Ay+bRjFagJ7yA/ 89ya2FVc07soF4RK0koc9oDYSQqfCHlo4eE4gsRY6rB9/kLOjjGU7xNPRaB7D8nrxpPQ HjC8Uu/FudGxs/Ir/tLP683D0mW/aYhTYXVEaltu4dt++hJiz8WWLa8geDMfsOiR9HqJ 4h2JpErIqVCC2MbeTVu1/G/oDVaTS8K+zAKxYC2X/ruAXovRum4XzBg7n3ql304ZOH34 Gi0ic5PtftOxCbpslc18UQHznC1AEI0dquevqayBKWZ0/31ECct7Knszc5LPpP2D8aWF m9DA== 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=xfm13l8uX9GZj8lMZ14pHe9rPLZ5LbrruxUtbqd2Hfg=; b=e5fh9B0sLve2ek/n4bpGxnST5zwTKjOXk8mvucSnL18J2hlPapHBo+T/l9FrdzQMcA YYvYkp1eoj9ucTOhC2XN5//7ARNCpxboUvnHWxlAgfH7xyYsJvLfyiYBFMmb5GEnoBdN +TghQRpoq6MHSllWsYV6uPoLf/dxAbOV6I3fjVUpFE9wMC/eG1JRFzebn/Ym0GXNiFcf ztj846+EYkmARQdvd/UeG6ZF4eovE7+G01K09BobpQfGJMaqrDblYZz1n4tEM4kSRbll MP4xBASGp/h6V5SNpld1kIT4r3gem12Tr9Y39PJNZJq2J5N6eU+k0UAi7Tywd/3HFtxo EHqg== X-Gm-Message-State: APt69E1Q87cetavfug3K7PN9g73FsBx8Tco2Z/ONvjYNo5ecr7K+73I2 yujeuBFt1Xup7btoLu3OtsRcrBWU X-Google-Smtp-Source: AAOMgpcGGQYKWqRTbmVXuXtwC2OdFIQehwCjc2Uulvm0K6vHQsrKr6ClKkPYYegXF/49ecVuiFlXng== X-Received: by 2002:ac8:3477:: with SMTP id v52-v6mr6478507qtb.316.1530821314810; Thu, 05 Jul 2018 13:08:34 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Date: Thu, 5 Jul 2018 17:08:12 -0300 Message-Id: <20180705200813.2033-3-danielhb413@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705200813.2033-1-danielhb413@gmail.com> References: <20180705200813.2033-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::235 Subject: [Qemu-devel] [PATCH v8 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: mdroth@linux.vnet.ibm.com, Daniel Henrique Barboza , ehabkost@redhat.com, armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 17884c7c70..912e7505bd 100644 --- a/qga/qapi-schema.json +++ b/qga/qapi-schema.json @@ -565,9 +565,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: @@ -592,9 +592,9 @@ # # This command requires the pm-utils package to be installed in the guest. # -# IMPORTANT: guest-suspend-hybrid requires QEMU to support the 'system_wak= eup' -# 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: --=20 2.17.1 From nobody Tue Nov 4 18:40:46 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530821508214378.54902353995294; Thu, 5 Jul 2018 13:11:48 -0700 (PDT) Received: from localhost ([::1]:54668 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbAbP-0006Ev-Qd for importer@patchew.org; Thu, 05 Jul 2018 16:11:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbAYQ-0004FR-Sl for qemu-devel@nongnu.org; Thu, 05 Jul 2018 16:08:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fbAYP-0002lQ-Hw for qemu-devel@nongnu.org; Thu, 05 Jul 2018 16:08:38 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:42156) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fbAYP-0002kg-D7 for qemu-devel@nongnu.org; Thu, 05 Jul 2018 16:08:37 -0400 Received: by mail-qk0-x243.google.com with SMTP id u62-v6so5164570qkf.9 for ; Thu, 05 Jul 2018 13:08:37 -0700 (PDT) Received: from localhost.localdomain ([2804:431:f701:af73:9fee:2075:22ee:3d6b]) by smtp.gmail.com with ESMTPSA id 32-v6sm4418264qtf.13.2018.07.05.13.08.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 13:08:36 -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=nnm433ZrLBmSbWhsI+bplXiiPjbHH32yD2CrBmgFpsk=; b=i5Mndt3oUcoBZi8l+hq2HDGjZQr7DD/sDXi6hweWCaFZu9p2M2UFzLjm1dQ/y9EI+/ Qm8/SvWMFG8wiIN347IYErsqb/y1JKDhqJH4/y4Q6ScxJssv4gCXNQO5brL6aZ2QVAJi XofCF3nu7NFdere4VWeCjjOWV1Yki6Weiicf5zwLD4RWzoLaj44jtZQIpshpXtxayfPR fXLezOQD+XzDyza9KQz0xYRYB9G0vHAZ8A+HiM/3A0wNXGA3r9W5YBLNhv9L7+kOQhvf ifqJ5UrImbJ2bpjGarNVLx5i0VLIs/Fx+zxirCskLCPh1gz4V2iMaW7Bkgd+/+rdW8kg PsOA== 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=nnm433ZrLBmSbWhsI+bplXiiPjbHH32yD2CrBmgFpsk=; b=EKXh+aHkxPiFYpUCkCCoYxEpGWH8rK16zxnZ+Clgedl9fdKUSs3KPu1zwZoN3lyeDy 8mrjXKqp/4Rnm/TdKhBJvmMhxjxdQelNoNsXIwyhTn6+upyXxUuBYGU1AGQFZT1nSL2u rQrJRuXwW5TP1fC8mgpz8vlR8WxBsyfxympOciTuAHPTkX+AICrcvKvV/ln2Vk98liIM C2BJ/cAlyBETnJq3A9rIeAA5wZgkqxWAFdYPlWTIrnhzYEbnYZlt+UXAKOGS5FYkohA+ UtlhHzkAA7CN4A2mJ3UAKMxoWGiAXQEyWdWXVi1SfG1X7HbY84WTmjyr8WJabJwYqm7j lFSg== X-Gm-Message-State: APt69E2FHmRxpvhw4C+nr02lvU1JtPFKsiEIdJNP3U9TzTyc/3HuF0A2 AQTZ/lANV0OW5vvKfSzj1dSC0pZJ X-Google-Smtp-Source: AAOMgpfc7B4jE5OwW5H9vqyBpsS+bDyhinakwM0hHj+Iv9N+6DLjMdtzkQFxKEieJYRi6xb++DUpQg== X-Received: by 2002:a37:67d5:: with SMTP id b204-v6mr6217396qkc.108.1530821316710; Thu, 05 Jul 2018 13:08:36 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Date: Thu, 5 Jul 2018 17:08:13 -0300 Message-Id: <20180705200813.2033-4-danielhb413@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705200813.2033-1-danielhb413@gmail.com> References: <20180705200813.2033-1-danielhb413@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH v8 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: mdroth@linux.vnet.ibm.com, Daniel Henrique Barboza , ehabkost@redhat.com, armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 | 11 ++++++++++- vl.c | 2 +- 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/hmp.c b/hmp.c index 41f5e39b72..83a8041d11 100644 --- a/hmp.c +++ b/hmp.c @@ -1169,7 +1169,10 @@ void hmp_cont(Monitor *mon, const QDict *qdict) =20 void hmp_system_wakeup(Monitor *mon, const QDict *qdict) { - qmp_system_wakeup(NULL); + Error *err =3D NULL; + + qmp_system_wakeup(&err); + hmp_handle_error(mon, &err); } =20 void hmp_nmi(Monitor *mon, const QDict *qdict) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index b921c6f3b7..483f804b36 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -70,6 +70,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_support(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 266f88cb09..86195d79e9 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 suspend= ed. +# 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 73e46d795f..0673ff1fa5 100644 --- a/qmp.c +++ b/qmp.c @@ -215,7 +215,16 @@ void qmp_cont(Error **errp) =20 void qmp_system_wakeup(Error **errp) { - qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); + if (!qemu_wakeup_suspend_support()) { + 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; + } } =20 ObjectPropertyInfoList *qmp_qom_list(const char *path, Error **errp) diff --git a/vl.c b/vl.c index 96ad448d57..2af10b75cb 100644 --- a/vl.c +++ b/vl.c @@ -1769,7 +1769,7 @@ void qemu_register_wakeup_notifier(Notifier *notifier) notifier_list_add(&wakeup_notifiers, notifier); } =20 -static bool qemu_wakeup_suspend_support(void) +bool qemu_wakeup_suspend_support(void) { return !QLIST_EMPTY(&wakeup_notifiers.notifiers) && acpi_enabled; } --=20 2.17.1