From nobody Thu Apr 25 01:27:07 2024 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 1544039365006510.0830226297377; Wed, 5 Dec 2018 11:49:25 -0800 (PST) Received: from localhost ([::1]:36453 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUdAh-0004tQ-Ud for importer@patchew.org; Wed, 05 Dec 2018 14:49:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUd8q-00024Y-SO for qemu-devel@nongnu.org; Wed, 05 Dec 2018 14:47:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gUd8m-0008En-OE for qemu-devel@nongnu.org; Wed, 05 Dec 2018 14:47:28 -0500 Received: from mail-qt1-x841.google.com ([2607:f8b0:4864:20::841]:43722) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gUd8h-0008Bt-3d for qemu-devel@nongnu.org; Wed, 05 Dec 2018 14:47:19 -0500 Received: by mail-qt1-x841.google.com with SMTP id i7so23689972qtj.10 for ; Wed, 05 Dec 2018 11:47:18 -0800 (PST) Received: from localhost.localdomain ([2804:431:f700:5b3d:a6d3:486e:8166:3fca]) by smtp.gmail.com with ESMTPSA id q72sm12446248qki.24.2018.12.05.11.47.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Dec 2018 11:47:17 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=S5nm/HnRYDWu83U/A39/x3nQbTiJYvldGEMh84Ram18=; b=ccnM57uBY2J0xVXqKgE3WQmyCZh94FOLGtjtqPRkN41Q2K95XeC+bfW3B4O2mIrky1 2ZoooDv9LO3R+NfYFp5ic5RtTg9ReFfV6VB9PXAn9z0i9HZU40xjVURcnu5pIvDc//Cw 4u5iyrSoDuzGK/Vao7r6mx7WB+ULKbvkVnrD3Xqn3E83N/Aa4Y51dEMR8BBKPhwNFfnq sCtSwaLvXy3kw114dkEyJaqshYP0yPJD1oBowCd4O31VSo/N0OQe+89/yQBjbC/Tp4me xnUdCYFP1CmMmhllzawAXAp7kEkFolwnVeQAfgNfKIFvTfkPgd62UUreCamzHbLJ6JMB Ub0A== 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:mime-version:content-transfer-encoding; bh=S5nm/HnRYDWu83U/A39/x3nQbTiJYvldGEMh84Ram18=; b=tlImiSH1YLhYgxmSWvuOM94Mp/rNX/S5daIQrqJACCto3rJUAh8jMbCsHYbD0Oe1gN 4jGX8pgcBDIcVEZkZl3SA3bblvjy1wQ1UHVeUbGk1qkQdn7tzBp+TLx+Cpr754N4Gk+q qGFNFHHqv1oaRN+BTbHVYtLNv/Z+OWJgN4WIRU6zAoGVJSfL3H73j6x4auqpWDT9sHK4 M65pDc5i3jItwskt1n0t8Wzpc8aPVUsPVQCgjirxaE2eb20CCwFRf+2RJXOUuELzy6dj eIVNvcsY96l6Zc1rv1JopL5MEAwrCwfEiAmopQ+MsO6OIfOWzyCQY/vw7KtfgEN0GIbu 3ZNg== X-Gm-Message-State: AA+aEWYdmsZdRNbcDR8MYq+NasqpmSY8/mwhHSTTNSMYFXi4rpAD82lU SeUdv0ikGdgnl2HuujCIMHv3Rc3qQww= X-Google-Smtp-Source: AFSGD/Vnp2BwIxKWWqHMyYRoXjpn9rvJRJQ9RIXsNhMEiR2A7dIps4FsPIuFcTtJfkhGQM8/pl2dvA== X-Received: by 2002:ac8:28d2:: with SMTP id j18mr24490249qtj.191.1544039237968; Wed, 05 Dec 2018 11:47:17 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Date: Wed, 5 Dec 2018 17:46:59 -0200 Message-Id: <20181205194701.17836-2-danielhb413@gmail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181205194701.17836-1-danielhb413@gmail.com> References: <20181205194701.17836-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::841 Subject: [Qemu-devel] [PATCH v11 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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, only the ACPI machines via acpi_pm1_cnt_init and xen_hvm_init have 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_suppo= rt' is made during its init, as it is now being done inside acpi_pm1_cnt_init and xen_hvm_init. This allows for any other machine type to declare wake-up support regardless of ACPI state or wakeup_notifiers subscription, making e= asier for newer implementations that might have their own mechanisms in the futur= e. 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 Acked-by: Eduardo Habkost Reviewed-by: Markus Armbruster --- hw/acpi/core.c | 6 ++++++ hw/i386/xen/xen-hvm.c | 5 +++++ include/sysemu/sysemu.h | 1 + qapi/misc.json | 24 ++++++++++++++++++++++++ vl.c | 19 +++++++++++++++++++ 5 files changed, 55 insertions(+) diff --git a/hw/acpi/core.c b/hw/acpi/core.c index aafdc61648..52e18d7810 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -617,6 +617,12 @@ void acpi_pm1_cnt_init(ACPIREGS *ar, MemoryRegion *par= ent, ar->pm1.cnt.s4_val =3D s4_val; ar->wakeup.notify =3D acpi_notify_wakeup; qemu_register_wakeup_notifier(&ar->wakeup); + + /* + * Register wake-up support in QMP query-current-machine API + */ + 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/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 935a3676c8..2143d33b18 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -1405,6 +1405,11 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion= **ram_memory) state->wakeup.notify =3D xen_wakeup_notifier; qemu_register_wakeup_notifier(&state->wakeup); =20 + /* + * Register wake-up support in QMP query-current-machine API + */ + qemu_register_wakeup_support(); + rc =3D xen_map_ioreq_server(state); if (rc < 0) { goto err; 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 6c1c5c0a37..deb982ed38 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -2008,6 +2008,30 @@ ## { 'command': 'query-machines', 'returns': ['MachineInfo'] } =20 +## +# @CurrentMachineParams: +# +# Information describing the running machine parameters. +# +# @wakeup-suspend-support: true if the machine supports wake up from +# suspend +# +# Since: 4.0 +## +{ 'struct': 'CurrentMachineParams', + 'data': { 'wakeup-suspend-support': 'bool'} } + +## +# @query-current-machine: +# +# Return information on the current virtual machine. +# +# Returns: CurrentMachineParams +# +# Since: 4.0 +## +{ 'command': 'query-current-machine', 'returns': 'CurrentMachineParams' } + ## # @CpuDefinitionInfo: # diff --git a/vl.c b/vl.c index a5ae5f23d2..8f5b3ef4e9 100644 --- a/vl.c +++ b/vl.c @@ -192,6 +192,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; =20 int icount_align_option; =20 @@ -1780,6 +1781,24 @@ void qemu_register_wakeup_notifier(Notifier *notifie= r) notifier_list_add(&wakeup_notifiers, notifier); } =20 +void qemu_register_wakeup_support(void) +{ + wakeup_suspend_enabled =3D true; +} + +static bool qemu_wakeup_suspend_enabled(void) +{ + return wakeup_suspend_enabled; +} + +CurrentMachineParams *qmp_query_current_machine(Error **errp) +{ + CurrentMachineParams *params =3D g_malloc0(sizeof(*params)); + params->wakeup_suspend_support =3D qemu_wakeup_suspend_enabled(); + + return params; +} + void qemu_system_killed(int signal, pid_t pid) { shutdown_signal =3D signal; --=20 2.19.2 From nobody Thu Apr 25 01:27:07 2024 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 1544039484057975.2097238312448; Wed, 5 Dec 2018 11:51:24 -0800 (PST) Received: from localhost ([::1]:36467 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUdCd-0006Pn-5q for importer@patchew.org; Wed, 05 Dec 2018 14:51:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUd8t-000257-0c for qemu-devel@nongnu.org; Wed, 05 Dec 2018 14:47:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gUd8q-0008Ia-Vm for qemu-devel@nongnu.org; Wed, 05 Dec 2018 14:47:30 -0500 Received: from mail-qk1-x742.google.com ([2607:f8b0:4864:20::742]:43723) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gUd8q-0008DG-Of for qemu-devel@nongnu.org; Wed, 05 Dec 2018 14:47:28 -0500 Received: by mail-qk1-x742.google.com with SMTP id r71so12601697qkr.10 for ; Wed, 05 Dec 2018 11:47:21 -0800 (PST) Received: from localhost.localdomain ([2804:431:f700:5b3d:a6d3:486e:8166:3fca]) by smtp.gmail.com with ESMTPSA id q72sm12446248qki.24.2018.12.05.11.47.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Dec 2018 11:47:20 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=rH647j70gDId6fAK8kjEbEY5mr5GDdJcVB18MHmW+kY=; b=XaN8+mg/gJ9vjnykgm+8MDQSZQJGFspMVUoCj0tsxGzAG8rXRfeR2EuvHzlXVVM5ly EWivcc8B/kp5MbSZqzAOkSi7PTyimlj91jCtf9XWOeNjMnPbQ37vINgsEKtu07VxJMQ0 ICMwNMuylnFMsq4Q+Tv/7DISPH+LMXRypRgfhPA8bIZVfNn9HE7QROAMXUif9efByEJx nhkIT/XkQbnOdelMfYkLGRT3oBJJVqWQa+aJTbchrbzSXznRIWAgQQ3FxYWd5u5z7Yls XeXpwTouEiaSLBwniydHwdt6WS4qiFEnH6hAQDUhcq0f+KEB3c/XHPwQBKat6z8f9mBy 4zXQ== 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:mime-version:content-transfer-encoding; bh=rH647j70gDId6fAK8kjEbEY5mr5GDdJcVB18MHmW+kY=; b=srVqGpqi0SuQLEiDMuJoLGNwg7Rr32P6daGDJEIrXcDmYJcnSktWwwwLVfLchuHjEi KA7Lu33evyUmHhEzTz09ygKIBI6Gvg9xoLw13cFwPRNFH+3XlVv498g3aLz0DhjUcbOJ W1+tPvYmqlFJ8U/CLFQ2rzor+9Y5XY6p+e14xAckTSWtLG7B7kqo8scI6brSDn1S0UEq gh939cQB9mHlZsQwxVcXEyFfZ7oYCgS3yVXN0dwpqeSfsMX7UYXhmnbMu1STpcpxabYK APbJHb2PFwrZUeBy7as5hN10AT2mDNsUvJHC2eszOmYDMhfENs+3fXm/9RyTpNU63Pg2 eV4A== X-Gm-Message-State: AA+aEWa4ZvDRBDI5+yqH/lyN50zGZ9LE1M0t0Tl7G6SWlv26VDLF5Kpr jZK9gY3vh3PAgBWPBbwBc8btKtEZOGA= X-Google-Smtp-Source: AFSGD/UgYeMaEn/3VIl1xxcqEKzVotVk7SojLHu6RGb/0P/y6S+JVA0as3csL9RZXA7WKXPkptITDA== X-Received: by 2002:a37:ea0a:: with SMTP id t10mr23089222qkj.273.1544039240812; Wed, 05 Dec 2018 11:47:20 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Date: Wed, 5 Dec 2018 17:47:00 -0200 Message-Id: <20181205194701.17836-3-danielhb413@gmail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181205194701.17836-1-danielhb413@gmail.com> References: <20181205194701.17836-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::742 Subject: [Qemu-devel] [PATCH v11 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 Acked-by: Eduardo Habkost Reviewed-by: Markus Armbruster --- qga/qapi-schema.json | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json index c6725b3ec8..a4ff5b8fc9 100644 --- a/qga/qapi-schema.json +++ b/qga/qapi-schema.json @@ -567,9 +567,11 @@ # 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 should check QMP command query-current-machine returns +# wakeup-suspend-support: true before issuing this command. Failure in +# doing so can result in a suspended guest that QEMU will not be able to +# awaken, forcing the user to power cycle the guest to bring it back. # # This command does NOT return a response on success. There are two options # to check for success: @@ -594,9 +596,11 @@ # # 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 should check QMP command query-current-machine returns +# wakeup-suspend-support: true before issuing this command. Failure in +# doing so can result in a suspended guest that QEMU will not be able to +# awaken, forcing the user to power cycle the guest to bring it back. # # This command does NOT return a response on success. There are two options # to check for success: --=20 2.19.2 From nobody Thu Apr 25 01:27:07 2024 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 1544039355632716.0994585034707; Wed, 5 Dec 2018 11:49:15 -0800 (PST) Received: from localhost ([::1]:36452 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUdAY-0004mp-EZ for importer@patchew.org; Wed, 05 Dec 2018 14:49:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60664) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUd8x-00027f-0S for qemu-devel@nongnu.org; Wed, 05 Dec 2018 14:47:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gUd8u-0008K8-SU for qemu-devel@nongnu.org; Wed, 05 Dec 2018 14:47:34 -0500 Received: from mail-qk1-x744.google.com ([2607:f8b0:4864:20::744]:46074) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gUd8s-0008F3-TV for qemu-devel@nongnu.org; Wed, 05 Dec 2018 14:47:32 -0500 Received: by mail-qk1-x744.google.com with SMTP id y78so12604313qka.12 for ; Wed, 05 Dec 2018 11:47:25 -0800 (PST) Received: from localhost.localdomain ([2804:431:f700:5b3d:a6d3:486e:8166:3fca]) by smtp.gmail.com with ESMTPSA id q72sm12446248qki.24.2018.12.05.11.47.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Dec 2018 11:47:23 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=Lidxpp7UAT4DFWX2WXJIFP5VdK4vrM1Kd1gJ0PRITII=; b=vIBw2S55sEoNLt42x1dgyugAlVqGdq6vBIEl8PHkChiRbb92BByxDZiTOFJ0tds3iA tMs8ZEx8fx7HN1zO8gjqhlWMHHou/H3mjxvVi4B5W5+pQXAiJCDEN37yQElP1jgxMj6K /dkVQNKkV/Uw3uMwuqkL2kzFhzq7xYZAmt80QOCmIOm8jkLsT93eIA5uUi304HWDepsf I1LkSRI+5KtT+HJYXdJVKQM6s/ugCaKd71fnYvHzHlEO7usvgW3833J1TrUj4y5eb3Uc s6Sfy96zy8/Py4l7oxzqQqAiII1nUEOhRaZvdWnbgrHBwe4RnraAceAZiUKO/4JLeNqj 6UAQ== 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:mime-version:content-transfer-encoding; bh=Lidxpp7UAT4DFWX2WXJIFP5VdK4vrM1Kd1gJ0PRITII=; b=kTHww7Mt7raA6fCzLpkzdOu9QzB2eCxollyU5lWKcsKXmiHrxcPszK6CVBUeawWgJg GkjuAR0PWFcWPmVIgsI5zn/9vELZzENqMpx199uE5yqJlkJg34h0ll3QK+k+kAzL/5/g M0WiF3b68Gtaizacv87wxsPXcaka/XtFSz+DSjKNqVVvipAnD3R2uZh2IhwphwAhJuxf t1y0FHReV48x1QbKDhy2Fds1A5ZwAq0gPLhtWi+mDwFEkJSzqirdclJGEOTsND/ca6gi EA67V3nybSQZS/ePk71MPjivoJe8AWvcsXfFWkDB2jk9oTZGd66nWidrUd55gAMeQzWl LJJA== X-Gm-Message-State: AA+aEWbnj21q8maaDWWwnGquZ754cORB7FW/jkTachp1p5yFVGegv7+A 1orNRN1A2NhTQ7JE4nx21L/xdLB6wFw= X-Google-Smtp-Source: AFSGD/UFibJlptfkH3sOJ62KddsyRWEHr9xz4stvnTD4Tancrz3hrRMmxc2udj1piZezBOH+XynkVg== X-Received: by 2002:a37:cf9b:: with SMTP id v27mr23146108qkl.160.1544039244400; Wed, 05 Dec 2018 11:47:24 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Date: Wed, 5 Dec 2018 17:47:01 -0200 Message-Id: <20181205194701.17836-4-danielhb413@gmail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181205194701.17836-1-danielhb413@gmail.com> References: <20181205194701.17836-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::744 Subject: [Qemu-devel] [PATCH v11 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 is capable of waking up from suspend, and if it is suspended. 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 Acked-by: Eduardo Habkost Reviewed-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin --- hmp.c | 5 ++++- hw/acpi/core.c | 3 ++- hw/char/serial.c | 2 +- hw/input/ps2.c | 6 +++--- hw/timer/mc146818rtc.c | 2 +- include/sysemu/sysemu.h | 3 ++- migration/migration.c | 4 ++-- qapi/misc.json | 8 +++++++- qmp.c | 8 +++++++- vl.c | 6 ++++-- 10 files changed, 33 insertions(+), 14 deletions(-) diff --git a/hmp.c b/hmp.c index 7828f93a39..0f5d943413 100644 --- a/hmp.c +++ b/hmp.c @@ -1220,7 +1220,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/hw/acpi/core.c b/hw/acpi/core.c index 52e18d7810..d6f0709691 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -514,7 +514,8 @@ static uint32_t acpi_pm_tmr_get(ACPIREGS *ar) static void acpi_pm_tmr_timer(void *opaque) { ACPIREGS *ar =3D opaque; - qemu_system_wakeup_request(QEMU_WAKEUP_REASON_PMTIMER); + + qemu_system_wakeup_request(QEMU_WAKEUP_REASON_PMTIMER, NULL); ar->tmr.update_sci(ar); } =20 diff --git a/hw/char/serial.c b/hw/char/serial.c index 02463e3388..7c42a2abfc 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -611,7 +611,7 @@ static void serial_receive1(void *opaque, const uint8_t= *buf, int size) SerialState *s =3D opaque; =20 if (s->wakeup) { - qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); + qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL); } if(s->fcr & UART_FCR_FE) { int i; diff --git a/hw/input/ps2.c b/hw/input/ps2.c index eb33ee9b6f..d3161f1e7c 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -255,7 +255,7 @@ static void ps2_put_keycode(void *opaque, int keycode) PS2KbdState *s =3D opaque; =20 trace_ps2_put_keycode(opaque, keycode); - qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); + qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL); =20 if (s->translate) { if (keycode =3D=3D 0xf0) { @@ -285,7 +285,7 @@ static void ps2_keyboard_event(DeviceState *dev, QemuCo= nsole *src, return; } =20 - qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); + qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL); assert(evt->type =3D=3D INPUT_EVENT_KIND_KEY); qcode =3D qemu_input_key_value_to_qcode(key->key); =20 @@ -748,7 +748,7 @@ static void ps2_mouse_sync(DeviceState *dev) } =20 if (s->mouse_buttons) { - qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); + qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL); } if (!(s->mouse_status & MOUSE_STATUS_REMOTE)) { /* if not remote, send event. Multiple events are sent if diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index e4e4de8b8a..69483152c3 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -455,7 +455,7 @@ static void rtc_update_timer(void *opaque) if (qemu_clock_get_ns(rtc_clock) >=3D s->next_alarm_time) { irqs |=3D REG_C_AF; if (s->cmos_data[RTC_REG_B] & REG_B_AIE) { - qemu_system_wakeup_request(QEMU_WAKEUP_REASON_RTC); + qemu_system_wakeup_request(QEMU_WAKEUP_REASON_RTC, NULL); } } =20 diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 0446adacc6..162c4b16d9 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -74,7 +74,8 @@ 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); -void qemu_system_wakeup_request(WakeupReason reason); +bool qemu_wakeup_suspend_enabled(void); +void qemu_system_wakeup_request(WakeupReason reason, Error **errp); void qemu_system_wakeup_enable(WakeupReason reason, bool enabled); void qemu_register_wakeup_notifier(Notifier *notifier); void qemu_register_wakeup_support(void); diff --git a/migration/migration.c b/migration/migration.c index 49ffb9997a..ffc4d9e556 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2408,7 +2408,7 @@ static int postcopy_start(MigrationState *ms) qemu_mutex_lock_iothread(); trace_postcopy_start_set_run(); =20 - qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); + qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL); global_state_store(); ret =3D vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); if (ret < 0) { @@ -2612,7 +2612,7 @@ static void migration_completion(MigrationState *s) if (s->state =3D=3D MIGRATION_STATUS_ACTIVE) { qemu_mutex_lock_iothread(); s->downtime_start =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME); - qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); + qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL); s->vm_was_running =3D runstate_is_running(); ret =3D global_state_store(); =20 diff --git a/qapi/misc.json b/qapi/misc.json index deb982ed38..03df2c37cf 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -1235,12 +1235,18 @@ ## # @system_wakeup: # -# Wakeup guest from suspend. Does nothing in case the guest isn't suspend= ed. +# Wake up guest from suspend. If the guest has wake-up from suspend +# support enabled (wakeup-suspend-support flag from +# query-current-machine), wake-up guest from suspend if the guest is +# in SUSPENDED state. Return an error otherwise. # # Since: 1.1 # # Returns: nothing. # +# Note: prior to 4.0, this command does nothing in case the guest +# isn't suspended. +# # Example: # # -> { "execute": "system_wakeup" } diff --git a/qmp.c b/qmp.c index e7c0a2fd60..f557d1617d 100644 --- a/qmp.c +++ b/qmp.c @@ -183,7 +183,13 @@ void qmp_cont(Error **errp) =20 void qmp_system_wakeup(Error **errp) { - qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); + if (!qemu_wakeup_suspend_enabled()) { + error_setg(errp, + "wake-up from suspend is not supported by this guest"); + return; + } + + qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, errp); } =20 ObjectPropertyInfoList *qmp_qom_list(const char *path, Error **errp) diff --git a/vl.c b/vl.c index 8f5b3ef4e9..5b51bbc47c 100644 --- a/vl.c +++ b/vl.c @@ -1752,11 +1752,13 @@ void qemu_register_suspend_notifier(Notifier *notif= ier) notifier_list_add(&suspend_notifiers, notifier); } =20 -void qemu_system_wakeup_request(WakeupReason reason) +void qemu_system_wakeup_request(WakeupReason reason, Error **errp) { trace_system_wakeup_request(reason); =20 if (!runstate_check(RUN_STATE_SUSPENDED)) { + error_setg(errp, + "Unable to wake up: guest is not in suspended state"); return; } if (!(wakeup_reason_mask & (1 << reason))) { @@ -1786,7 +1788,7 @@ void qemu_register_wakeup_support(void) wakeup_suspend_enabled =3D true; } =20 -static bool qemu_wakeup_suspend_enabled(void) +bool qemu_wakeup_suspend_enabled(void) { return wakeup_suspend_enabled; } --=20 2.19.2