From nobody Tue May 7 01:14:46 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1541784953152867.4822028551287; Fri, 9 Nov 2018 09:35:53 -0800 (PST) Received: from localhost ([::1]:35317 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gLAh6-0003HD-2o for importer@patchew.org; Fri, 09 Nov 2018 12:35:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58442) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gLAfC-0002L1-Ql for qemu-devel@nongnu.org; Fri, 09 Nov 2018 12:33:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gLAf8-0007Lf-UZ for qemu-devel@nongnu.org; Fri, 09 Nov 2018 12:33:45 -0500 Received: from mail-qk1-x741.google.com ([2607:f8b0:4864:20::741]:37263) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gLAf7-0006o1-Li for qemu-devel@nongnu.org; Fri, 09 Nov 2018 12:33:42 -0500 Received: by mail-qk1-x741.google.com with SMTP id 131so2933525qkd.4 for ; Fri, 09 Nov 2018 09:33:26 -0800 (PST) Received: from localhost.localdomain ([2804:431:f700:ba45:a11b:1d87:ae84:ee6f]) by smtp.gmail.com with ESMTPSA id r142sm3942595qke.27.2018.11.09.09.33.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 09 Nov 2018 09:33:25 -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=96n9UuLLzX1aTobd1VZLX908OpkzFQlr/g0u2VjpCao=; b=tbLg7RG9dCS/rdrCPJequtZ/ahF79xKBRGz1aPPQrMEoeJeCidBgXpuQcRKFqDNXgT jnxF66NfDSiKYA0Jemeh4HRfMeNhjS5Urv/RMmARbSfQn9GaqwNFNEjT9e2xUvRUcTom S/OVTo+ocOxfbUc8XwkQh2rnS+cET3bpzldktOau6cfXrVDSzYxyS6AJZDnmyra0LY/1 2j4Pvht9ub+zAZ15Zzbgoi7gtX894s0wPJ4bTOw3THmotFHQ9bA5B5PLOUJa0makF5Mt 3vYRhPEJNUFMGl3Jk36kAHdNbRVOwci479+TmhQ/4ERJBTQNmzlkJ9UmjXix84V1+yGu pckg== 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=96n9UuLLzX1aTobd1VZLX908OpkzFQlr/g0u2VjpCao=; b=Mn/YCZ3ovjTZ/o5f5bDoLnsCjM7phbyK9amEEJk5cmBGZ3KOuI3L2UehpSbWssAQhO CdI8SktuXPela0BBblhV4ETLcThP82zVcKu9OlO9sedmQg0+JbgAVtBVf58gppsIqL9s EeteZU8KjyA9xlUCHPv+E8vKSOssGdoqKFM8fN07mMWsYHlgL2TJN3wSEogCkZ0O40UG 5rwPXvKMm5X+Djdle7ttiCk/uN4+DaeIho6T+8OcE9prGkEKoQKFOGK43xCAEGMmfK9w /3nDtkDcaEkleKMHdaaoXkYjxPUCGu6uwkmPhLa0hmIkVCPLmW/TONFSo80Yt/nIjZVE ayow== X-Gm-Message-State: AGRZ1gKZbdE/aiVKa/H3sa3Mw1f8aEHzzdFTx+8rb5soGsKJ8UYTw2j7 6XMQ+txeqMa/jtOvSnom39TbRPB3 X-Google-Smtp-Source: AJdET5fETvKvRjeo9LQXcOnsyxCm8DO0R5Blpk4aur01YnFueL9EoR4tP/tekcmt6cGOE2Cuzahvuw== X-Received: by 2002:a37:6a01:: with SMTP id f1-v6mr9126205qkc.8.1541784806168; Fri, 09 Nov 2018 09:33:26 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Date: Fri, 9 Nov 2018 15:33:07 -0200 Message-Id: <20181109173309.25212-2-danielhb413@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181109173309.25212-1-danielhb413@gmail.com> References: <20181109173309.25212-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::741 Subject: [Qemu-devel] [PATCH for-3.2 v10 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 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_suppo= rt' 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 | 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..9b86576e61 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: 3.2.0 +## +{ 'struct': 'CurrentMachineParams', + 'data': { 'wakeup-suspend-support': 'bool'} } + +## +# @query-current-machine: +# +# Return information on the current virtual machine. +# +# Returns: CurrentMachineParams +# +# Since: 3.2.0 +## +{ 'command': 'query-current-machine', 'returns': 'CurrentMachineParams' } + ## # @CpuDefinitionInfo: # diff --git a/vl.c b/vl.c index 55bab005b6..5813a8785f 100644 --- a/vl.c +++ b/vl.c @@ -191,6 +191,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 @@ -1782,6 +1783,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.1 From nobody Tue May 7 01:14:46 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1541784953613396.99454421500195; Fri, 9 Nov 2018 09:35:53 -0800 (PST) Received: from localhost ([::1]:35316 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gLAh4-0003GW-EW for importer@patchew.org; Fri, 09 Nov 2018 12:35:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58446) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gLAfD-0002L2-A9 for qemu-devel@nongnu.org; Fri, 09 Nov 2018 12:33:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gLAfB-0007Mh-8n for qemu-devel@nongnu.org; Fri, 09 Nov 2018 12:33:46 -0500 Received: from mail-qk1-x744.google.com ([2607:f8b0:4864:20::744]:45251) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gLAf9-00070M-A3 for qemu-devel@nongnu.org; Fri, 09 Nov 2018 12:33:43 -0500 Received: by mail-qk1-x744.google.com with SMTP id d135so2928471qkc.12 for ; Fri, 09 Nov 2018 09:33:29 -0800 (PST) Received: from localhost.localdomain ([2804:431:f700:ba45:a11b:1d87:ae84:ee6f]) by smtp.gmail.com with ESMTPSA id r142sm3942595qke.27.2018.11.09.09.33.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 09 Nov 2018 09:33:28 -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=qW42mv6xL4kl5nu3ZOvlhgGHmInL+OIZd5bFWIi5n74=; b=Tc8FC2dmmP61NA66dcOEgA0ss2sADHm0EnxSBXOfL2PTmUn7p7XeGJiQzTnNOKC6We 34zcIhTrz+x/XxvbyxCnqBtZ5ykkuNYMHHnIvyOPlglnTHZoTD2Qrvu8tijh2pqww8+D H8U84oMWvhJW/kATBDhru1gLOIlxRyHLORorGYyK6XXrFyDSuRj0oQSoJIu2SwR7gaMh Fuaf640iLzvcppOLA8NS4u4lleZWRNkDLHzziSPIiRsuuyHvOEzLLUajrn6XuFH9PK+H qDCnJqjS73L5MwnInn9xlVWdUljzmbao4cUTNhcEGr0DTzr3dG4iYEzQ2FiwvwMEhdHO WZBw== 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=qW42mv6xL4kl5nu3ZOvlhgGHmInL+OIZd5bFWIi5n74=; b=guM699T2DeHIxjt4IpOkfSK/hTT53GC5BYZLe/KewDRxFbw1HJ8+vCJ9XMQ7haljaa e06dAjBznqLegGyGwuYFNPXU21mqoozkd+Rt4Og1ZOklOUzJZZ/6FC8g8jeV9elP7uZJ l7oqS96eJ1SaD2qgcsuYM/pzhcXiDXs2/hTmRNNBxi1597yneN6H2t/rVoPFpP1apvaZ MGgqrO1C4xOsnEoNHgVJcVFAXuttDbJOG2i+iv7ea50PbRdf7z/aUScCeJO1/l9D4/zP MCioYTu2ic4DfX5LoJCw4tWeHYlYSrwD8d/GP461fi3H64JAupm1eoAsiXSN0i97gssV DVRw== X-Gm-Message-State: AGRZ1gIc3TzJj1v6y1rNbYuqmx8LD3Qeiz2CDqryDxznZkxsFyno1dni uHMhGKpVksjjwI/uGTohnPySRND2 X-Google-Smtp-Source: AJdET5cp7Q9DCE8UCiiW+64rSyYN6ODRJc1RD9FpZFj3BDPl9zs67euDmhut/FuGQHoNopMfRUkKdw== X-Received: by 2002:a05:6214:110e:: with SMTP id e14mr9705314qvs.10.1541784808476; Fri, 09 Nov 2018 09:33:28 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Date: Fri, 9 Nov 2018 15:33:08 -0200 Message-Id: <20181109173309.25212-3-danielhb413@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181109173309.25212-1-danielhb413@gmail.com> References: <20181109173309.25212-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 for-3.2 v10 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 --- 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..78a439263e 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 *must* 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 *must* 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.1 From nobody Tue May 7 01:14:46 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1541784953230855.0454538752073; Fri, 9 Nov 2018 09:35:53 -0800 (PST) Received: from localhost ([::1]:35318 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gLAh7-0003IT-CM for importer@patchew.org; Fri, 09 Nov 2018 12:35:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gLAfD-0002L3-A9 for qemu-devel@nongnu.org; Fri, 09 Nov 2018 12:33:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gLAf9-0007Ls-AD for qemu-devel@nongnu.org; Fri, 09 Nov 2018 12:33:46 -0500 Received: from mail-qk1-x744.google.com ([2607:f8b0:4864:20::744]:39691) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gLAf9-0007Ax-2S for qemu-devel@nongnu.org; Fri, 09 Nov 2018 12:33:43 -0500 Received: by mail-qk1-x744.google.com with SMTP id e4so2927691qkh.6 for ; Fri, 09 Nov 2018 09:33:31 -0800 (PST) Received: from localhost.localdomain ([2804:431:f700:ba45:a11b:1d87:ae84:ee6f]) by smtp.gmail.com with ESMTPSA id r142sm3942595qke.27.2018.11.09.09.33.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 09 Nov 2018 09:33:30 -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=FHEHPEPEfKJb8/jZKOhHFOWwEBtt0a4CNZVqYe75fzQ=; b=Ahob33StZYCmXB2g5K5C8a5rX1Pi2HyHEt0dU88K27U8jcTzeWGEZP49mmHX3S4iDH InNJuCYfyVuPucQzQ2W0ylv14AAYojpBWhNv1FhIwsEZxjyncwSuqZ1XSpghZfv2hF14 5M3zdng2GxPWuGJKZ80YUhsDmW907edU0U0CoSQSIsdDCu4diX1v3NxLqysIYhu9nJtC JX6grF1IM2DhoulfO2X5n6xNdpK5NNShK7HKXJgI4g9iEuzZKbNL1CVVrbrvCKuYGNK0 gpO0TmK0QUAbzuk/HTsXP7Nka0qIWTP1WDMu0C5VEfXfzntE7YyTaQJFE2/D5ZDUcrpa 7yTw== 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=FHEHPEPEfKJb8/jZKOhHFOWwEBtt0a4CNZVqYe75fzQ=; b=UbS50pXCLDHfg/EGBOjFHj02+HQ88QGGK+iYfOxVJiQVqc6gwJFi/i6YygdMms30IA Fyxe9Z4zt7xqO4mb04WA6fmNmLMo640tnyQLmHI6eD4HogTQeqKT6+U+A9pMMQUhWt0p rLkwB0wCr3tTEcxhuMb8pvpHRZbqvJrUJqO/K4DfW0ou4LCHT7OmnE9/gWquUswrTxh1 AnjBk4LTl/ATyi0UKUkTqrdD0N1ZgD9DaqULw/yE1SdPQyqi7sXwIyNPtUGJRfW5DR/x HX5AZYBYwDhPurVKchQ7QDywHbACCQZmfAXvBeFjK76xjqXKAKnc4i1TCsDDGZP+da+g N53w== X-Gm-Message-State: AGRZ1gLiQIIvN4tGTz0PjxvyYltapUU28bnWxaBCje8ewoL3V2PIcmYU Z1cJaBbIRlSuG1XX7vu1IrnVpw8A X-Google-Smtp-Source: AJdET5dX/AOgONidqGmrBId4Hb0Vy3nbZadvcv73aK4/+ruChux+pvUE7txp6BGPwiW+X/9XeeRunQ== X-Received: by 2002:a0c:b0db:: with SMTP id p27mr9802898qvc.73.1541784810801; Fri, 09 Nov 2018 09:33:30 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Date: Fri, 9 Nov 2018 15:33:09 -0200 Message-Id: <20181109173309.25212-4-danielhb413@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181109173309.25212-1-danielhb413@gmail.com> References: <20181109173309.25212-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 for-3.2 v10 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 --- hmp.c | 5 ++++- hw/acpi/core.c | 4 +++- hw/char/serial.c | 3 ++- hw/input/ps2.c | 9 ++++++--- hw/timer/mc146818rtc.c | 3 ++- include/sysemu/sysemu.h | 3 ++- migration/migration.c | 7 +++++-- qapi/misc.json | 8 +++++++- qmp.c | 13 ++++++++++++- vl.c | 6 ++++-- 10 files changed, 47 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..a7073dd435 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -514,7 +514,9 @@ 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); + Error *err =3D NULL; + + qemu_system_wakeup_request(QEMU_WAKEUP_REASON_PMTIMER, &err); ar->tmr.update_sci(ar); } =20 diff --git a/hw/char/serial.c b/hw/char/serial.c index 02463e3388..23c5d2870c 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -609,9 +609,10 @@ static int serial_can_receive1(void *opaque) static void serial_receive1(void *opaque, const uint8_t *buf, int size) { SerialState *s =3D opaque; + Error *err =3D NULL; =20 if (s->wakeup) { - qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); + qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, &err); } if(s->fcr & UART_FCR_FE) { int i; diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 6c43fc2912..fc742b0061 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -253,9 +253,10 @@ void ps2_queue_4(PS2State *s, int b1, int b2, int b3, = int b4) static void ps2_put_keycode(void *opaque, int keycode) { PS2KbdState *s =3D opaque; + Error *err =3D NULL; =20 trace_ps2_put_keycode(opaque, keycode); - qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); + qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, &err); =20 if (s->translate) { if (keycode =3D=3D 0xf0) { @@ -276,6 +277,7 @@ static void ps2_keyboard_event(DeviceState *dev, QemuCo= nsole *src, { PS2KbdState *s =3D (PS2KbdState *)dev; InputKeyEvent *key =3D evt->u.key.data; + Error *err =3D NULL; int qcode; uint16_t keycode =3D 0; int mod; @@ -285,7 +287,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, &err); assert(evt->type =3D=3D INPUT_EVENT_KIND_KEY); qcode =3D qemu_input_key_value_to_qcode(key->key); =20 @@ -741,6 +743,7 @@ static void ps2_mouse_event(DeviceState *dev, QemuConso= le *src, static void ps2_mouse_sync(DeviceState *dev) { PS2MouseState *s =3D (PS2MouseState *)dev; + Error *err =3D NULL; =20 /* do not sync while disabled to prevent stream corruption */ if (!(s->mouse_status & MOUSE_STATUS_ENABLED)) { @@ -748,7 +751,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, &err); } 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..e65962cdb4 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -443,6 +443,7 @@ static uint64_t get_next_alarm(RTCState *s) static void rtc_update_timer(void *opaque) { RTCState *s =3D opaque; + Error *err =3D NULL; int32_t irqs =3D REG_C_UF; int32_t new_irqs; =20 @@ -455,7 +456,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, &err); } } =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 b261c1e4ce..8e9b4af71c 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2390,6 +2390,8 @@ static int postcopy_start(MigrationState *ms) int64_t bandwidth =3D migrate_max_postcopy_bandwidth(); bool restart_block =3D false; int cur_state =3D MIGRATION_STATUS_ACTIVE; + Error *err =3D NULL; + if (!migrate_pause_before_switchover()) { migrate_set_state(&ms->state, MIGRATION_STATUS_ACTIVE, MIGRATION_STATUS_POSTCOPY_ACTIVE); @@ -2399,7 +2401,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, &err); global_state_store(); ret =3D vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); if (ret < 0) { @@ -2597,13 +2599,14 @@ static int migration_maybe_pause(MigrationState *s, */ static void migration_completion(MigrationState *s) { + Error *err =3D NULL; int ret; int current_active_state =3D s->state; =20 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, &err); 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 9b86576e61..471f6e680c 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. Returns an error otherwise. # # Since: 1.1 # # Returns: nothing. # +# Note: prior to 3.2, 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..2265aa48b9 100644 --- a/qmp.c +++ b/qmp.c @@ -183,7 +183,18 @@ void qmp_cont(Error **errp) =20 void qmp_system_wakeup(Error **errp) { - qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); + Error *local_err =3D NULL; + + 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, &local_err); + if (local_err) { + error_propagate(errp, local_err); + } } =20 ObjectPropertyInfoList *qmp_qom_list(const char *path, Error **errp) diff --git a/vl.c b/vl.c index 5813a8785f..b057796e48 100644 --- a/vl.c +++ b/vl.c @@ -1754,11 +1754,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))) { @@ -1788,7 +1790,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.1