From patchwork Tue Jun 19 19:38:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 10475325 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 122FB60230 for ; Tue, 19 Jun 2018 19:46:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 01CD02883A for ; Tue, 19 Jun 2018 19:46:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E574328BDF; Tue, 19 Jun 2018 19:46:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7D3232883A for ; Tue, 19 Jun 2018 19:46:02 +0000 (UTC) Received: from localhost ([::1]:44676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVMZl-0007Yy-Qf for patchwork-qemu-devel@patchwork.kernel.org; Tue, 19 Jun 2018 15:46:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52941) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVMSl-0001uS-JL for qemu-devel@nongnu.org; Tue, 19 Jun 2018 15:38:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVMSk-0003Av-Fi for qemu-devel@nongnu.org; Tue, 19 Jun 2018 15:38:47 -0400 Received: from mail-qt0-x232.google.com ([2607:f8b0:400d:c0d::232]:40765) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVMSk-0003AQ-1X for qemu-devel@nongnu.org; Tue, 19 Jun 2018 15:38:46 -0400 Received: by mail-qt0-x232.google.com with SMTP id q6-v6so870753qtn.7 for ; Tue, 19 Jun 2018 12:38:45 -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=7aJT/qhW0T5kCKz8UV6is72ExOD0oHsMYGTMtFmBYCc=; b=qncKtw+ynV8ThrypFQVCdY6pXIe/DaG+zBiKALIXNasuUJIqszvWVoR0TModtADRSH hTRnOcylokkJ/CRrEAcgL5ouJrG8aw+LifGlN/uhb149Z/YC937y1Y3ao1Bxyv8zoW6k 9SNsnlnUXDe/WXhxTw0lSsJpcn1AwLR7Gl3VDqvmpTLOK38R2pPADFhdfiquSqP8j6tX l6Ns/pMICGCi4x0vRVo3NL8G1qBWKOVb2Nd/PWOXYnPI4a6CyoShXTY6JC5vhlwWVcXs 4qK/cpO8YYj2bhEaYycPuZyArptZRqXQYJkheM2nQQK8ayNIBAcIrLSrpzB5fBPD5YCy qrhw== 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=7aJT/qhW0T5kCKz8UV6is72ExOD0oHsMYGTMtFmBYCc=; b=LmCNBrrkDuf3yRtpKAdVA4aegHfNEEG6nImFURu5VBLtmUu/NsSbrlJr2XJhjhkMIu Os/DXrxmaES3K3sQ2erlyRnvVvDbL4w8O0vjIW7XKKw304sNglwutwjmJMuGbBBhleDx Bb6JW9J4tO5JHqI2+sOM76nuDNbqaFncjHxu1rl/+k8/I7G05fDnd0RvJALYsvPOWv5T YRwzUW6NNA1M1C/amj27Vw13zftuC+z0Ny5oxNkLb33e4lXlrALZu7m2Ac6wS2gCoQqM vfRbbL5raZNPoKp3wIcJcdekHGcOtOStR2cnYYQUpSnjcjn2aVBkdw6ekNgvY3bgS7WF 5MDA== X-Gm-Message-State: APt69E0eOmY64n295S8Xfm1t3sxrT5r1UN9fFvNhzA5T7ZNd1MqhyIdF iA7eOFcJGsOy/5JNf+PZzS+5fgE5L+c= X-Google-Smtp-Source: ADUXVKKNz5/pOyfYiKBBM5Ly3k8B1OChGn/lHCxhNqSQlkS9+QfUlu+Pgi4SKQ+ljDLQOtOqNJz9fg== X-Received: by 2002:ac8:855:: with SMTP id x21-v6mr16292844qth.42.1529437125383; Tue, 19 Jun 2018 12:38:45 -0700 (PDT) Received: from localhost.localdomain ([2804:431:f701:9a90:70ce:7c7a:343e:57]) by smtp.gmail.com with ESMTPSA id a62-v6sm419686qka.11.2018.06.19.12.38.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jun 2018 12:38:45 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Date: Tue, 19 Jun 2018 16:38:06 -0300 Message-Id: <20180619193806.17419-7-danielhb413@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180619193806.17419-1-danielhb413@gmail.com> References: <20180619193806.17419-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::232 Subject: [Qemu-devel] [PATCH v1 6/6] qga: removing bios_supports_mode 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: Daniel Henrique Barboza , armbru@redhat.com, mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP bios_support_mode verifies if the guest has support for a certain suspend mode but it doesn't inform back which suspend tool provides it. The caller, guest_suspend, executes all suspend strategies in order again. After adding systemd suspend support, bios_support_mode now will verify for support for systemd, then pmutils, then Linux sys state file. In a worst case scenario where both systemd and pmutils isn't supported but Linux sys state is: - bios_supports_mode will check for systemd, then pmutils, then Linux sys state. It will tell guest_suspend that there is support, but it will not tell who provides it; - guest_suspend will try to execute (and fail) systemd suspend, then pmutils suspend, to only then use the Linux sys suspend. The time spent executing systemd and pmutils suspend was wasted and could be avoided, but only bios_support_mode knew it but didn't inform it back. A quicker approach is to nuke bios_supports_mode and control whether we found support at all with a bool flag inside guest_suspend. guest_suspend will search for suspend support and execute it as soon as possible. If the a given suspend mechanism fails, continue to the next. If no suspend support is found, the "not supported" message is still being sent back to the user. Signed-off-by: Daniel Henrique Barboza --- qga/commands-posix.c | 54 +++++++++++++++----------------------------- 1 file changed, 18 insertions(+), 36 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 6a573de86d..79acc28ee7 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -1681,60 +1681,42 @@ static void linux_sys_state_suspend(SuspendMode mode, Error **errp) } -static void bios_supports_mode(SuspendMode mode, Error **errp) -{ - Error *local_err = NULL; - bool ret; - - ret = systemd_supports_mode(mode, &local_err); - if (ret) { - return; - } - if (local_err) { - error_propagate(errp, local_err); - return; - } - ret = pmutils_supports_mode(mode, &local_err); - if (ret) { - return; - } - if (local_err) { - error_propagate(errp, local_err); - return; - } - ret = linux_sys_state_supports_mode(mode, &local_err); - if (!ret) { - error_setg(errp, - "the requested suspend mode is not supported by the guest"); - } -} - static void guest_suspend(SuspendMode mode, Error **errp) { Error *local_err = NULL; + bool mode_supported = false; - bios_supports_mode(mode, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; + if (systemd_supports_mode(mode, &local_err)) { + mode_supported = true; + systemd_suspend(mode, &local_err); } - systemd_suspend(mode, &local_err); if (!local_err) { return; } local_err = NULL; - pmutils_suspend(mode, &local_err); + if (pmutils_supports_mode(mode, &local_err)) { + mode_supported = true; + pmutils_suspend(mode, &local_err); + } + if (!local_err) { return; } local_err = NULL; - linux_sys_state_suspend(mode, &local_err); - if (local_err) { + if (linux_sys_state_supports_mode(mode, &local_err)) { + mode_supported = true; + linux_sys_state_suspend(mode, &local_err); + } + + if (!mode_supported) { + error_setg(errp, + "the requested suspend mode is not supported by the guest"); + } else if (local_err) { error_propagate(errp, local_err); } }