From nobody Tue May 14 14:52:22 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1688370343; cv=none; d=zohomail.com; s=zohoarc; b=Buto9zTngqnZrk/ok3+rhNtsNjrDOK7R+h9g1C1A0bx98cH/ogPXaU9TLfW4KzdXNzerGYk7kMlx8GsC2vfyWWg6u1ASbRTY/AnHHpbg/S3wq8BeZoHFwsAt+45EwGB6fPxJOViguBokrB7f4rx7IArSBQBfcHslvlBlK7hTVtI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688370343; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=69HuQzXxz5q5aGyaXTLyF80U6CDPNHd63qj8QqsHUmk=; b=VRTG9foEF92bC4rlMo/Rl1FLq/PN4gNqCEVe5u3Ca/EZ5gReoTfXJv3kf/N7vv4myeI/LnTIpyT7yBpuMVVwykbd7QyvyVwoahhLG8XghZz9TwxcdneGwgWJ6UfKFXtFFweKqkAkY+aBEYhwTu2k517PYxQ1KvER79cEAQ4vzOo= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1688370343302161.03432830512213; Mon, 3 Jul 2023 00:45:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGEF0-0004G3-R2; Mon, 03 Jul 2023 03:44:58 -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 1qGEEy-0004FZ-UG for qemu-devel@nongnu.org; Mon, 03 Jul 2023 03:44:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGEEw-00076e-TI for qemu-devel@nongnu.org; Mon, 03 Jul 2023 03:44:56 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-318-rAlZHnnsPnO8j78HHg6_jg-1; Mon, 03 Jul 2023 03:44:52 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CEE5329AB3E1; Mon, 3 Jul 2023 07:44:51 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 832AE492B01; Mon, 3 Jul 2023 07:44:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688370293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=69HuQzXxz5q5aGyaXTLyF80U6CDPNHd63qj8QqsHUmk=; b=UK1y5E+tledMHYPqxwZmVBF+h+W9HRoX/N/+5oZT8m0Q5EB+fu0B+387LzFa3YrkdVdirs ngkXJRxp/ALn5wSrYMhAOLxFt0QyZNCgDh2wdPB0L25cv48OqVL3LE4j6kN2FPG3wFFtTK IJRN958QKybWP2YKw1UzlVjNiPFFXZE= X-MC-Unique: rAlZHnnsPnO8j78HHg6_jg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Cc: Claudio Imbrenda , Markus Armbruster , Michael Tokarev Subject: [PATCH v2] os-posix: Allow 'chroot' via '-run-with' and deprecate the old '-chroot' option Date: Mon, 3 Jul 2023 09:44:47 +0200 Message-Id: <20230703074447.17044-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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.133.124; envelope-from=thuth@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_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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 @redhat.com) X-ZM-MESSAGEID: 1688370344129100001 We recently introduced "-run-with" for options that influence the runtime behavior of QEMU. This option has the big advantage that it can group related options (so that it is easier for the users to spot them) and that the options become introspectable via QMP this way. So let's start moving more switches into this option group, starting with "-chroot" now. Reviewed-by: Claudio Imbrenda Reviewed-by: Michael Tokarev Reviewed-by: J=C3=A1n Tomko Signed-off-by: Thomas Huth --- v2: Renamed "register_teardown" to "register_runwith" (thanks Michael!) docs/about/deprecated.rst | 5 +++++ os-posix.c | 35 ++++++++++++++++++++++++++++++++++- util/async-teardown.c | 21 --------------------- qemu-options.hx | 18 +++++++++++++----- 4 files changed, 52 insertions(+), 27 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 0743459862..1cf53b86ce 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -116,6 +116,11 @@ Use "whpx" (on Windows) or "hvf" (on macOS) instead. =20 Use ``-run-with async-teardown=3Don`` instead. =20 +``-chroot`` (since 8.1) +''''''''''''''''''''''' + +Use ``-run-with chroot=3Ddir`` instead. + ``-singlestep`` (since 8.1) ''''''''''''''''''''''''''' =20 diff --git a/os-posix.c b/os-posix.c index 90ea71725f..cfcb96533c 100644 --- a/os-posix.c +++ b/os-posix.c @@ -38,6 +38,7 @@ #include "qemu/cutils.h" #include "qemu/config-file.h" #include "qemu/option.h" +#include "qemu/module.h" =20 #ifdef CONFIG_LINUX #include @@ -148,6 +149,7 @@ int os_parse_cmd_args(int index, const char *optarg) } break; case QEMU_OPTION_chroot: + warn_report("option is deprecated, use '-run-with chroot=3D...' in= stead"); chroot_dir =3D optarg; break; case QEMU_OPTION_daemonize: @@ -158,18 +160,25 @@ int os_parse_cmd_args(int index, const char *optarg) case QEMU_OPTION_asyncteardown: init_async_teardown(); break; +#endif case QEMU_OPTION_run_with: { + const char *str; QemuOpts *opts =3D qemu_opts_parse_noisily(qemu_find_opts("run-wit= h"), optarg, false); if (!opts) { exit(1); } +#if defined(CONFIG_LINUX) if (qemu_opt_get_bool(opts, "async-teardown", false)) { init_async_teardown(); } +#endif + str =3D qemu_opt_get(opts, "chroot"); + if (str) { + chroot_dir =3D str; + } break; } -#endif default: return -1; } @@ -348,3 +357,27 @@ int os_mlock(void) return -ENOSYS; #endif } + +static QemuOptsList qemu_run_with_opts =3D { + .name =3D "run-with", + .head =3D QTAILQ_HEAD_INITIALIZER(qemu_run_with_opts.head), + .desc =3D { +#if defined(CONFIG_LINUX) + { + .name =3D "async-teardown", + .type =3D QEMU_OPT_BOOL, + }, +#endif + { + .name =3D "chroot", + .type =3D QEMU_OPT_STRING, + }, + { /* end of list */ } + }, +}; + +static void register_runwith(void) +{ + qemu_add_opts(&qemu_run_with_opts); +} +opts_init(register_runwith); diff --git a/util/async-teardown.c b/util/async-teardown.c index 3ab19c8740..62cdeb0f20 100644 --- a/util/async-teardown.c +++ b/util/async-teardown.c @@ -12,9 +12,6 @@ */ =20 #include "qemu/osdep.h" -#include "qemu/config-file.h" -#include "qemu/option.h" -#include "qemu/module.h" #include #include #include @@ -147,21 +144,3 @@ void init_async_teardown(void) clone(async_teardown_fn, new_stack_for_clone(), CLONE_VM, NULL); sigprocmask(SIG_SETMASK, &old_signals, NULL); } - -static QemuOptsList qemu_run_with_opts =3D { - .name =3D "run-with", - .head =3D QTAILQ_HEAD_INITIALIZER(qemu_run_with_opts.head), - .desc =3D { - { - .name =3D "async-teardown", - .type =3D QEMU_OPT_BOOL, - }, - { /* end of list */ } - }, -}; - -static void register_teardown(void) -{ - qemu_add_opts(&qemu_run_with_opts); -} -opts_init(register_teardown); diff --git a/qemu-options.hx b/qemu-options.hx index b57489d7ca..f49d4c0e3c 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4670,11 +4670,12 @@ ERST =20 #ifndef _WIN32 DEF("chroot", HAS_ARG, QEMU_OPTION_chroot, \ - "-chroot dir chroot to dir just before starting the VM\n", + "-chroot dir chroot to dir just before starting the VM (deprecated= )\n", QEMU_ARCH_ALL) #endif SRST ``-chroot dir`` + Deprecated, use '-run-with chroot=3D...' instead. Immediately before starting guest execution, chroot to the specified directory. Especially useful in combination with -runas. ERST @@ -4861,13 +4862,16 @@ SRST This option is deprecated and should no longer be used. The new option ``-run-with async-teardown=3Don`` is a replacement. ERST +#endif +#ifdef CONFIG_POSIX DEF("run-with", HAS_ARG, QEMU_OPTION_run_with, - "-run-with async-teardown[=3Don|off]\n" - " misc QEMU process lifecycle options\n" - " async-teardown=3Don enables asynchronous teardown\n", + "-run-with [async-teardown=3Don|off][,chroot=3Ddir]\n" + " Set miscellaneous QEMU process lifecycle options:\n" + " async-teardown=3Don enables asynchronous teardown (Li= nux only)\n" + " chroot=3Ddir chroot to dir just before starting the V= M\n", QEMU_ARCH_ALL) SRST -``-run-with`` +``-run-with [async-teardown=3Don|off][,chroot=3Ddir]`` Set QEMU process lifecycle options. =20 ``async-teardown=3Don`` enables asynchronous teardown. A new process c= alled @@ -4880,6 +4884,10 @@ SRST performed correctly. This only works if the cleanup process is not forcefully killed with SIGKILL before the main QEMU process has terminated completely. + + ``chroot=3Ddir`` can be used for doing a chroot to the specified direc= tory + immediately before starting the guest execution. This is especially us= eful + in combination with -runas. ERST #endif =20 --=20 2.39.3