From nobody Wed May 15 02:55:07 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=1693315863; cv=none; d=zohomail.com; s=zohoarc; b=MzX6J9G7U+zoPiIUggvaI6Ryfb8b0c0pBVQUmuB7GrudDcf3nhyCEW2q7qxKVh2QkjcO5ZzUl7WCi1p9zE3HbwF9zShAeRGg7aDyRb53HEy6kP50dYSaDNDWkqGg4Q9DMPl7wLev9IXDBoXddcYfxOrhvWw9AzlHvJdVJWSohrY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693315863; h=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=t+UNiG1pzhmqWKi+TqStlO9WP2hUb8T+M3xavbOGT2s=; b=i4MtaPxsapqYfZt/UHs8Lj5RjYSWqjh8fEhsUA3UAjjR+SkFYX63l2U5wPhqR0akqMtgBbgm9WDn5qWPc6weVx0F0xqopEY5x1Tam2OBjOErXZcuOrYz3mFEsr1jnxU7x3CiXrgT5lwKlLsLNN/sv8cEPr3rt1rJ/eh0gKWIVTI= 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 1693315863353701.9274609299417; Tue, 29 Aug 2023 06:31:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qaynQ-00068Q-Bz; Tue, 29 Aug 2023 09:30:16 -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 1qaynB-00062g-Jm for qemu-devel@nongnu.org; Tue, 29 Aug 2023 09:30:03 -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 1qayn8-0006Qs-RT for qemu-devel@nongnu.org; Tue, 29 Aug 2023 09:30:01 -0400 Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-348-SX8VOkePMu6wm1BhbfkDWQ-1; Tue, 29 Aug 2023 09:29:52 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8A7FC2815E20; Tue, 29 Aug 2023 13:29:52 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D56C40C6F4E; Tue, 29 Aug 2023 13:29:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693315796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=t+UNiG1pzhmqWKi+TqStlO9WP2hUb8T+M3xavbOGT2s=; b=DDfinJJH/EIRdmgI5Of+jWJZvQypqAtxCfBXKeDKeVueJIO2GieASlY9Ut5QGP1aZ925Iv N6wuRNqXNnHPipjoH2yoJtAl7D/CXNqn/xX3j95XbovPBfyV/WW/1ieUOb3xkpKwvJ+qDh /grtDyQCKt+fqUzCL3mVltMsheBrbDI= X-MC-Unique: SX8VOkePMu6wm1BhbfkDWQ-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, qemu-block@nongnu.org, Markus Armbruster , John Snow Subject: [PATCH] qemu-options.hx: Rephrase the descriptions of the -hd* and -cdrom options Date: Tue, 29 Aug 2023 15:29:48 +0200 Message-Id: <20230829132948.51053-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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.001, RCVD_IN_MSPIKE_WL=0.001, 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 @redhat.com) X-ZM-MESSAGEID: 1693315863834100001 Content-Type: text/plain; charset="utf-8" The current description says that these options will create a device on the IDE bus, which is only true on x86. So rephrase these sentences a little bit to speak of "default bus" instead. Signed-off-by: Thomas Huth Reviewed-by: Alex Benn=C3=A9e --- qemu-options.hx | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 29b98c3d4c..a7ce5f0f7a 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1209,10 +1209,10 @@ SRST ERST =20 DEF("hda", HAS_ARG, QEMU_OPTION_hda, - "-hda/-hdb file use 'file' as IDE hard disk 0/1 image\n", QEMU_ARCH_A= LL) + "-hda/-hdb file use 'file' as hard disk 0/1 image\n", QEMU_ARCH_ALL) DEF("hdb", HAS_ARG, QEMU_OPTION_hdb, "", QEMU_ARCH_ALL) DEF("hdc", HAS_ARG, QEMU_OPTION_hdc, - "-hdc/-hdd file use 'file' as IDE hard disk 2/3 image\n", QEMU_ARCH_A= LL) + "-hdc/-hdd file use 'file' as hard disk 2/3 image\n", QEMU_ARCH_ALL) DEF("hdd", HAS_ARG, QEMU_OPTION_hdd, "", QEMU_ARCH_ALL) SRST ``-hda file`` @@ -1222,18 +1222,22 @@ SRST ``-hdc file`` \=20 ``-hdd file`` - Use file as hard disk 0, 1, 2 or 3 image (see the :ref:`disk images` - chapter in the System Emulation Users Guide). + Use file as hard disk 0, 1, 2 or 3 image on the default bus of the + emulated machine (this is for example the IDE bus on most x86 machines, + but it can also be SCSI, virtio or something else on other target + architectures). See al the :ref:`disk images` chapter in the System + Emulation Users Guide. ERST =20 DEF("cdrom", HAS_ARG, QEMU_OPTION_cdrom, - "-cdrom file use 'file' as IDE cdrom image (cdrom is ide1 master)\= n", + "-cdrom file use 'file' as CD-ROM image\n", QEMU_ARCH_ALL) SRST ``-cdrom file`` - Use file as CD-ROM image (you cannot use ``-hdc`` and ``-cdrom`` at - the same time). You can use the host CD-ROM by using ``/dev/cdrom`` - as filename. + Use file as CD-ROM image on the default bus of the emulated machine + (which is IDE1 master on x86, so you cannot use ``-hdc`` and ``-cdrom`` + at the same time there). On systems that support it, you can use the + host CD-ROM by using ``/dev/cdrom`` as filename. ERST =20 DEF("blockdev", HAS_ARG, QEMU_OPTION_blockdev, --=20 2.39.3