From nobody Mon Feb 9 18:02:14 2026 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=treblig.org ARC-Seal: i=1; a=rsa-sha256; t=1764767772; cv=none; d=zohomail.com; s=zohoarc; b=EUgUoW7nYDkJH0ombmF3jsoFKNDeNDyIDjf+8CfPWWsY7THW2lbj6lYaippfyNy/d10eiAfNaSy58G0f5K50Kn1/UVMJ7ryZ0kIIku0lHdgqzK29elZ4y7fczdrgBvtoGbdNiAMMEQbOpxYz2gRiEvc8xgyp1ZdhHQ06XDzGEAI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764767772; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pBE9nwi6TppjSeUttbju5Apd99/M9N3r+cNvcFRlW5k=; b=Astd3npQbF3HZrb2rauEXUUgr6lcO1ymAbcNLxeoUTTfSd33qXtQOIBlRTLZerjopWqdnU1OWIfWD+p8zg5Iyuj3mV/vP6Gq6pUAsQES7okKLT7P5TL68xVNMH3mjBdTvVPb79VDbBCeHzsms+E+5ITusUA672EJ6ustjTQAMKM= 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 176476777195246.48373202524408; Wed, 3 Dec 2025 05:16:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vQmhb-0005zi-3j; Wed, 03 Dec 2025 08:15:27 -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 1vQmhZ-0005w8-G1; Wed, 03 Dec 2025 08:15:25 -0500 Received: from mx.treblig.org ([2a00:1098:5b::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vQmhX-0001MK-LX; Wed, 03 Dec 2025 08:15:25 -0500 Received: from localhost ([127.0.0.1] helo=dalek) by mx.treblig.org with esmtp (Exim 4.98.2) (envelope-from ) id 1vQmhS-00000007qGj-0KZf; Wed, 03 Dec 2025 13:15:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=pBE9nwi6TppjSeUttbju5Apd99/M9N3r+cNvcFRlW5k=; b=U4pETs9AkiJVVa7Q IQv7+PDpN3be4tM4AtZ9Xg2gpqL7X7PSxt/fqogVmAU/TJILQC/XVZ8PKAHQCkDhQtCXwAXS6LFJ5 1j2KA3ZteRkaoZ/HNU/VmmyJ7Ny7YYSGkgugIkHDN95X3GFkB8h6LHUPo/9s7pgCpk3yWD7hgPeY2 L2mmlYKc5DnYQWKmeK1FJrpmAy3Nhw4WoOTpsrkAk8WQP6+Y1Y1KSfkVJ+v+/97p9eHSyTgtGd7u4 MRRUGUtD/ACo6miEgzj+1C2YkRKc7DNv+ZLY68IlP9T52pQKK/iuGh+QOrk7hVsm/n0Fwvvr46N5a 9gCwVKlr8pmlKoHSyw==; From: dave@treblig.org To: qemu-trivial@nongnu.org, mjt@tls.msk.ru, laurent@vivier.eu, thuth@redhat.com, pbonzini@redhat.com Cc: jak@jak-linux.org, qemu-devel@nongnu.org, "Dr. David Alan Gilbert" Subject: [PATCH] qemu-options.hx: Document -M as -machine alias Date: Wed, 3 Dec 2025 13:15:11 +0000 Message-ID: <20251203131511.153460-1-dave@treblig.org> X-Mailer: git-send-email 2.52.0 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=2a00:1098:5b::1; envelope-from=dave@treblig.org; helo=mx.treblig.org 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=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 @treblig.org) X-ZM-MESSAGEID: 1764767777044019200 Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" -M is used heavily in documentation and scripts, but isn't actually documented anywhere. Document it as equivalent to -machine. Reported-by: Julian Andres Klode Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Thomas Huth --- qemu-options.hx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index fca2b7bc74..ec92723f10 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -44,6 +44,7 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ #endif " memory-backend=3D'backend-id' specifies explicitly pr= ovided backend for main RAM (default=3Dnone)\n" " cxl-fmw.0.targets.0=3Dfirsttarget,cxl-fmw.0.targets.1= =3Dsecondtarget,cxl-fmw.0.size=3Dsize[,cxl-fmw.0.interleave-granularity=3Dg= ranularity]\n" + " sgx-epc.0.memdev=3Dmemid,sgx-epc.0.node=3Dnumaid\n" " smp-cache.0.cache=3Dcachename,smp-cache.0.topology=3D= topologylevel\n", QEMU_ARCH_ALL) SRST @@ -179,6 +180,9 @@ SRST =20 -machine cxl-fmw.0.targets.0=3Dcxl.0,cxl-fmw.0.targets.1=3Dcxl= .1,cxl-fmw.0.size=3D128G,cxl-fmw.0.interleave-granularity=3D512 =20 + ``sgx-epc.0.memdev=3D@var{memid},sgx-epc.0.node=3D@var{numaid}`` + Define an SGX EPC section. + ``smp-cache.0.cache=3Dcachename,smp-cache.0.topology=3Dtopologylevel`` Define cache properties for SMP system. =20 @@ -208,12 +212,10 @@ SRST ERST =20 DEF("M", HAS_ARG, QEMU_OPTION_M, - " sgx-epc.0.memdev=3Dmemid,sgx-epc.0.node=3Dnumaid\n", - QEMU_ARCH_ALL) - + "-M as -machine\n", QEMU_ARCH_ALL) SRST -``sgx-epc.0.memdev=3D@var{memid},sgx-epc.0.node=3D@var{numaid}`` - Define an SGX EPC section. +``-M`` + as -machine. ERST =20 DEF("cpu", HAS_ARG, QEMU_OPTION_cpu, --=20 2.52.0