From nobody Tue Nov 26 11:26:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1708967159; cv=none; d=zohomail.com; s=zohoarc; b=DxrFINaMY48B7wCaMv5zdIYh/SPeQbzXE0b8ukYwmLfntwtDwi8fQcuuekypqihv5siZRapNaEx770JSLnWPYB6IbLQHx6L8VmG1Bsp0ROs59GD1+yqPwuNsn0rRxBhjn4BbmbUlKYfuLVRRx6aaN3nYh3YnWzvTthR2aelEjoc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708967159; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=r5CvpnosciMvnPjJjGTldJRMDdV43tlw4uH7/lKch6E=; b=JgQ0PfwOdipEy59tITHz1c0hTiP+pZQvLwSI8JdnrQgsvYqoL1xVCAJKCc7kB4jEdFreDfEZhyAcNMJuLpVLGwW5NcAOQK3oux/HHUmFORXYTbH49fMDOvpu9xPRji7cr3PNUlAYYzfe1VL4OUu+rr1zAP3O5i554fS+j1TCMvk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1708967159650464.45515888557475; Mon, 26 Feb 2024 09:05:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1reeI0-0005ec-1S; Mon, 26 Feb 2024 11:57:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1reeHl-0005XZ-Ck for qemu-devel@nongnu.org; Mon, 26 Feb 2024 11:57:01 -0500 Received: from relay.virtuozzo.com ([130.117.225.111]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1reeHX-0007aL-LW for qemu-devel@nongnu.org; Mon, 26 Feb 2024 11:57:00 -0500 Received: from [130.117.225.1] (helo=dev005.ch-qa.vzint.dev) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1reeG3-001AD7-0t; Mon, 26 Feb 2024 17:56:34 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-Id:Date:Subject:From: Content-Type; bh=r5CvpnosciMvnPjJjGTldJRMDdV43tlw4uH7/lKch6E=; b=dtlyLU6FeP4B qx8qFI0H+B8T5/zLRuIcSt0qlRAoJwlJYYoBxHu3JBoY0X3B1Mccm8RDfKO7mp7gNwcX4h1NmrxB6 gf03183uaQDFbd5cPqhoKHyRErVtaEq0AGe1ztQhnp6Nti1YF/S/bj7BovzdUn+ffQ+3E18a4MXZw L8RrgwL2XF/gzRvXRMUPQZQ0vzH0llTL0sbu9v9JhbUtHRtuuTlml+lyLzrs51er908dSDCsDVghd S6MkXce1pa+0CewqIw5ZCMPgjkHkmhXFCU68mzr0LqNOLInvQZq0NJY3uDMtQpf45GnAa8L0mz2ha jxVEo8b6tRc1vZWSsBUkxA==; From: Andrey Drobyshev To: qemu-devel@nongnu.org Cc: michael.roth@amd.com, kkostiuk@redhat.com, marcandre.lureau@redhat.com, andrey.drobyshev@virtuozzo.com, den@virtuozzo.com Subject: [PATCH 6/7] qga/commands-posix: use ga_run_command helper when suspending via sysfs Date: Mon, 26 Feb 2024 18:56:41 +0200 Message-Id: <20240226165642.807350-7-andrey.drobyshev@virtuozzo.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240226165642.807350-1-andrey.drobyshev@virtuozzo.com> References: <20240226165642.807350-1-andrey.drobyshev@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=130.117.225.111; envelope-from=andrey.drobyshev@virtuozzo.com; helo=relay.virtuozzo.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1708967161392100003 Content-Type: text/plain; charset="utf-8" We replace the direct call to open() with a "sh -c 'echo ...'" call, so that it becomes an executable command. Signed-off-by: Andrey Drobyshev --- qga/commands-posix.c | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 6baaabc29e..599f59a323 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -1917,49 +1917,21 @@ static void linux_sys_state_suspend(SuspendMode mod= e, Error **errp) Error *local_err =3D NULL; const char *sysfile_strs[3] =3D {"disk", "mem", NULL}; const char *sysfile_str =3D sysfile_strs[mode]; - pid_t pid; - int status; =20 if (!sysfile_str) { error_setg(errp, "unknown guest suspend mode"); return; } =20 - pid =3D fork(); - if (!pid) { - /* child */ - int fd; - - setsid(); - reopen_fd_to_null(0); - reopen_fd_to_null(1); - reopen_fd_to_null(2); - - fd =3D open(LINUX_SYS_STATE_FILE, O_WRONLY); - if (fd < 0) { - _exit(EXIT_FAILURE); - } - - if (write(fd, sysfile_str, strlen(sysfile_str)) < 0) { - _exit(EXIT_FAILURE); - } - - _exit(EXIT_SUCCESS); - } else if (pid < 0) { - error_setg_errno(errp, errno, "failed to create child process"); - return; - } + g_autofree char *echo_cmd =3D g_strdup_printf( + "echo %s > " LINUX_SYS_STATE_FILE, sysfile_str); + const char *argv[] =3D {"sh", "-c", echo_cmd, NULL}; =20 - ga_wait_child(pid, &status, &local_err); + ga_run_command(argv, NULL, "suspend", &local_err); if (local_err) { error_propagate(errp, local_err); return; } - - if (WEXITSTATUS(status)) { - error_setg(errp, "child process has failed to suspend"); - } - } =20 static void guest_suspend(SuspendMode mode, Error **errp) --=20 2.39.3