From nobody Tue Nov 4 21:38:30 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