From nobody Tue Feb 10 19:15:46 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 1529576940817681.9636252464072; Thu, 21 Jun 2018 03:29:00 -0700 (PDT) Received: from localhost ([::1]:54349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVwpo-0007hr-4e for importer@patchew.org; Thu, 21 Jun 2018 06:29:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVwjP-0002s4-D0 for qemu-devel@nongnu.org; Thu, 21 Jun 2018 06:22:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVwjO-0001gf-Dv for qemu-devel@nongnu.org; Thu, 21 Jun 2018 06:22:23 -0400 Received: from mail-qt0-x236.google.com ([2607:f8b0:400d:c0d::236]:34308) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVwjO-0001gW-8e for qemu-devel@nongnu.org; Thu, 21 Jun 2018 06:22:22 -0400 Received: by mail-qt0-x236.google.com with SMTP id d3-v6so2336071qto.1 for ; Thu, 21 Jun 2018 03:22:22 -0700 (PDT) Received: from localhost.localdomain ([2804:431:f701:8296:fe0b:2550:5aa8:2171]) by smtp.gmail.com with ESMTPSA id d42-v6sm2256974qtd.88.2018.06.21.03.22.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Jun 2018 03:22:21 -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=BaZRrnMaoP5l+tWnqXXXFhah5KMxuV+Oc2C7jud3tFU=; b=AHJLJYkgASYj3nVIhfGznUoSLRn70kZR9pcgKQGpS2LN16dr+qWgi7aZeJlIs0qi4g 9PzTXy8xXG36fTYoGJfei+2BoR8sPdzApjZuHV+fyj96I8f43MgBtzUFW7/UFTer1K24 v/0mEhGmo/c3r+tbURmKmySkwo9GOhCWPLwbcm8Uepiovp7VYjxGtV//3UAatOkT7wAc Tz8atzHynHOUkCUwduJHlKUNbpcHlsHOEOFgpBT8irMYMG5sbMwCF9GqnP1y78o1eRrG 7N97CPnSjNsxehBzLyGTQcmHThzNMAcGyLdAfxDnP0cnrawKzduhOGLy180aFi3tqEma J8Jg== 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=BaZRrnMaoP5l+tWnqXXXFhah5KMxuV+Oc2C7jud3tFU=; b=DIz+ankrMY1sTQiHn4lIBbfXcIxuVYDZ71TtFLKEPp70hRcDvfD/Qg/Oydrg9+zVLW UWwIrj5EiEvmGU4xF8C15tYSv5utyup0Yth9xiC28E4oDOxAS+nGtx7HMfaQje9OmqUR eE9BIDWdkCcPVGE8b1rwO/f3ALZVmVWyuW/EJhsNx2Xh0O0YcnoicIdRZ32IXF01BxiB so0hAYpwdWoHeyItTXzur85flTqfaMjTWAkhRG8Mss1vVP7e1Zkd9S9YawTGf/oulvsC Ne3M9DLYjQNyC5Ymy1fMGwvt1TAWonn0E4OOjoxkNacPWhC2qbS3qR5LxQR2noG5POlV wsqQ== X-Gm-Message-State: APt69E39WSnuXFOWr+Geq5hA2AO2lvp3ClE8MZcUoaySYG/offvp2Wla qLD/2U6tKn8Z4hlaOc9bBIjJ9vxFQWI= X-Google-Smtp-Source: ADUXVKKd1rywD95JW6Sw8g4TBAcoekYnZ238oTCUwoJ3AZbd5CKHkLL+jtIZvLsCDtdGJ9jahrknFA== X-Received: by 2002:ac8:720f:: with SMTP id a15-v6mr21586898qtp.243.1529576541394; Thu, 21 Jun 2018 03:22:21 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Date: Thu, 21 Jun 2018 07:21:53 -0300 Message-Id: <20180621102153.28443-7-danielhb413@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180621102153.28443-1-danielhb413@gmail.com> References: <20180621102153.28443-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::236 Subject: [Qemu-devel] [PATCH v2 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 , marcandre.lureau@gmail.com, mdroth@linux.vnet.ibm.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" 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 3546b74fed..d0d38cb7d9 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -1676,60 +1676,42 @@ static void linux_sys_state_suspend(SuspendMode mod= e, Error **errp) =20 } =20 -static void bios_supports_mode(SuspendMode mode, Error **errp) -{ - Error *local_err =3D NULL; - bool ret; - - ret =3D systemd_supports_mode(mode, &local_err); - if (ret) { - return; - } - if (local_err) { - error_propagate(errp, local_err); - return; - } - ret =3D pmutils_supports_mode(mode, &local_err); - if (ret) { - return; - } - if (local_err) { - error_propagate(errp, local_err); - return; - } - ret =3D linux_sys_state_supports_mode(mode, &local_err); - if (!ret) { - error_setg(errp, - "the requested suspend mode is not supported by the gue= st"); - } -} - static void guest_suspend(SuspendMode mode, Error **errp) { Error *local_err =3D NULL; + bool mode_supported =3D false; =20 - bios_supports_mode(mode, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; + if (systemd_supports_mode(mode, &local_err)) { + mode_supported =3D true; + systemd_suspend(mode, &local_err); } =20 - systemd_suspend(mode, &local_err); if (!local_err) { return; } =20 error_free(local_err); =20 - pmutils_suspend(mode, &local_err); + if (pmutils_supports_mode(mode, &local_err)) { + mode_supported =3D true; + pmutils_suspend(mode, &local_err); + } + if (!local_err) { return; } =20 error_free(local_err); =20 - linux_sys_state_suspend(mode, &local_err); - if (local_err) { + if (linux_sys_state_supports_mode(mode, &local_err)) { + mode_supported =3D true; + linux_sys_state_suspend(mode, &local_err); + } + + if (!mode_supported) { + error_setg(errp, + "the requested suspend mode is not supported by the gue= st"); + } else if (local_err) { error_propagate(errp, local_err); } } --=20 2.17.1