From nobody Fri Nov 14 21:03:16 2025 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1761830062; cv=none; d=zohomail.com; s=zohoarc; b=dxTc73VET2P+iWEVgRlWhQ+CL26ZexI0vNinvmuc4xSOE9rCpYpXxoeWvVx05rcQz3iCsYnBgMYG5oRF1He5UKLB0zk8Hyel2vCQt5PsmH9JCbZQoaHYSqHF6ft5C6ki//VuetyywrXyD8pKqrqdb40cWKWHDcxzRWyhm3FfA9w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761830062; h=Content-Transfer-Encoding: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:Cc; bh=6pqIhG9Aw6HT2bjo4OsCCjTQyamNWt9kCS/4hog+/9I=; b=F/H5BbN/S5oSylWwprABiPgo3SDIYX6FbBzL0lDwR7oaPzqqx2kZHIzuNwwg9wAzEAX0keZ8+NDgdHDi6zHMVQJTy/E8T43i895jH8TDonejkkpm7J5DpuNJsIUoRyYtvGVL8JLgsLX+k0+YSuQa58clpNND2XAYkYy145rcVrY= 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 1761830062077990.7741205065616; Thu, 30 Oct 2025 06:14:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vESSx-0002rU-Vq; Thu, 30 Oct 2025 09:13:24 -0400 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 1vESSv-0002qx-AU for qemu-devel@nongnu.org; Thu, 30 Oct 2025 09:13:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vESSl-00042g-2C for qemu-devel@nongnu.org; Thu, 30 Oct 2025 09:13:21 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-311-ncG15Z-LO1-ONL3YQhbJew-1; Thu, 30 Oct 2025 09:12:49 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 800381956054; Thu, 30 Oct 2025 13:12:48 +0000 (UTC) Received: from srv1.redhat.com (unknown [10.44.32.177]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0AEE719560A2; Thu, 30 Oct 2025 13:12:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761829973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6pqIhG9Aw6HT2bjo4OsCCjTQyamNWt9kCS/4hog+/9I=; b=KA72ipPwVMXPwUOd649HESjE6rkTOyRvT8aFvXK4MU4hh7ahZI5p1DJTpl/Cg/f7p74Ken D/ZIhhc4thcqq4wRlXWZy3TmHbKwjOno4H1W93kABFkFYxgmD/Y/Wlu8ynSyIN0rhpjZdd mjWCmOmM04NGEfkQpyB1ah9yu695swQ= X-MC-Unique: ncG15Z-LO1-ONL3YQhbJew-1 X-Mimecast-MFC-AGG-ID: ncG15Z-LO1-ONL3YQhbJew_1761829968 From: Kostiantyn Kostiuk To: qemu-devel@nongnu.org, Peter Maydell , Stefan Hajnoczi Subject: [PULL 3/3] qga: Support guest shutdown of BusyBox-based systems Date: Thu, 30 Oct 2025 15:12:37 +0200 Message-ID: <20251030131237.181588-4-kkostiuk@redhat.com> In-Reply-To: <20251030131237.181588-1-kkostiuk@redhat.com> References: <20251030131237.181588-1-kkostiuk@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=170.10.129.124; envelope-from=kkostiuk@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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 @redhat.com) X-ZM-MESSAGEID: 1761830063954154100 Content-Type: text/plain; charset="utf-8" From: Rodrigo Dias Correa On POSIX systems, the QEMU Guest Agent uses /sbin/shutdown to implement the command guest-shutdown. Systems based on BusyBox, such as Alpine Linux, don't have /sbin/shutdown. They have instead three separate commands: poweroff, reboot, and halt. Change the QEMU Guest Agent to, depending on the mode argument, use /sbin/{poweroff,halt,reboot} when they exist, falling back to /sbin/shutdown when they don't. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2589 Signed-off-by: Rodrigo Dias Correa Reviewed-by: Kostiantyn Kostiuk Link: https://lore.kernel.org/qemu-devel/20250926214015.120338-1-r@drigo.nl Signed-off-by: Kostiantyn Kostiuk --- qga/commands-posix.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 5070f27d75..c7059857e4 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -213,9 +213,20 @@ out: return retcode; } =20 +static bool file_exists(const char *path) +{ + struct stat st; + return stat(path, &st) =3D=3D 0 && (S_ISREG(st.st_mode) || S_ISLNK(st.= st_mode)); +} + +#define POWEROFF_CMD_PATH "/sbin/poweroff" +#define HALT_CMD_PATH "/sbin/halt" +#define REBOOT_CMD_PATH "/sbin/reboot" + void qmp_guest_shutdown(const char *mode, Error **errp) { const char *shutdown_flag; + const char *shutdown_cmd =3D NULL; Error *local_err =3D NULL; =20 #ifdef CONFIG_SOLARIS @@ -234,10 +245,19 @@ void qmp_guest_shutdown(const char *mode, Error **err= p) =20 slog("guest-shutdown called, mode: %s", mode); if (!mode || strcmp(mode, "powerdown") =3D=3D 0) { + if (file_exists(POWEROFF_CMD_PATH)) { + shutdown_cmd =3D POWEROFF_CMD_PATH; + } shutdown_flag =3D powerdown_flag; } else if (strcmp(mode, "halt") =3D=3D 0) { + if (file_exists(HALT_CMD_PATH)) { + shutdown_cmd =3D HALT_CMD_PATH; + } shutdown_flag =3D halt_flag; } else if (strcmp(mode, "reboot") =3D=3D 0) { + if (file_exists(REBOOT_CMD_PATH)) { + shutdown_cmd =3D REBOOT_CMD_PATH; + } shutdown_flag =3D reboot_flag; } else { error_setg(errp, @@ -255,6 +275,15 @@ void qmp_guest_shutdown(const char *mode, Error **errp) #endif "hypervisor initiated shutdown", (char *) NULL}; =20 + /* + * If the specific command exists (poweroff, halt or reboot), use it i= nstead + * of /sbin/shutdown. + */ + if (shutdown_cmd !=3D NULL) { + argv[0] =3D shutdown_cmd; + argv[1] =3D NULL; + } + ga_run_command(argv, NULL, "shutdown", &local_err); if (local_err) { error_propagate(errp, local_err); --=20 2.51.1.dirty