From nobody Sat Feb 7 11:19:49 2026 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 1537297238182251.300102812349; Tue, 18 Sep 2018 12:00:38 -0700 (PDT) Received: from localhost ([::1]:42170 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g2LEf-0005Pk-86 for importer@patchew.org; Tue, 18 Sep 2018 15:00:33 -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) 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) 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) 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 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 | 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) =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 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 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 e7c0a2fd60..44e619d1be 100644 --- a/qmp.c +++ b/qmp.c @@ -183,6 +183,16 @@ void qmp_cont(Error **errp) =20 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); } =20 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 =3D true; } =20 -static bool qemu_wakeup_suspend_enabled(void) +bool qemu_wakeup_suspend_enabled(void) { return wakeup_suspend_enabled; } --=20 2.17.1