From nobody Mon Feb 9 02:54:33 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1664557201; cv=none; d=zohomail.com; s=zohoarc; b=mi6zuobiqf/0jVKtPlIyBJSA06+z5QK7ZD6+mAOHw8TK0rNcStn5mEYJb5kGlCVdel2gMfmx1IZ4Wu2RAjP+O43h01GxuUESJ3hoWMjHiyre2xMlYUYvi0Wr+9WyDPbKx5eEWjAA82ZjlMB3cJSDvvPaRdatR1ev9FxnVhrLntw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664557201; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8qSo02TotYw46cBXRjZ8qmCKqDqS+X3AiZQSOMsYcYU=; b=OcS7/takyRO9ts+UDRL2d1mNx4T3uASaukJcW6GcAM0F7MeZcGwuysxu5G5UZ/A80YwhH5K2rnZMfABq0OCdbBsmRi0yG88daIisR6Xhwe9BEI5UsDGvVPfjceHceqBk7wUiQPwCrXSxovxFY3XWvBrVeomwpXvHxdLCdyDLSYw= 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 1664557201767583.3403728238682; Fri, 30 Sep 2022 10:00:01 -0700 (PDT) Received: from localhost ([::1]:51234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oeJMm-0006WH-NJ for importer@patchew.org; Fri, 30 Sep 2022 13:00:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeJFh-0006Jg-3u for qemu-devel@nongnu.org; Fri, 30 Sep 2022 12:52:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:28159) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeJFf-0006cH-9c for qemu-devel@nongnu.org; Fri, 30 Sep 2022 12:52:40 -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-411-m4ZEjpOqNsyytJhyO6wOzw-1; Fri, 30 Sep 2022 12:52:37 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EFF473C10228; Fri, 30 Sep 2022 16:52:36 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.39.192.112]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B67217582; Fri, 30 Sep 2022 16:52:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664556758; 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: in-reply-to:in-reply-to:references:references; bh=8qSo02TotYw46cBXRjZ8qmCKqDqS+X3AiZQSOMsYcYU=; b=K77d8USe9mu5XlImB6sVHCBrXUeJC/GeZfW6Cx9pWiq+qPbiNiIdC/kVLfrNcH6OtP382r RIvydOYm0ghi/wqpT15kh3grOzK70891l1p9OZBOGc9pMM6UFMu6sEMwi38iREelCjmB77 CX7nvszSdYlrZiJdDUy44LNSa5hSxYY= X-MC-Unique: m4ZEjpOqNsyytJhyO6wOzw-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com, qemu-devel@nongnu.org Subject: [PULL 03/18] qemu-img: Wean documentation and help output off '?' for help Date: Fri, 30 Sep 2022 18:52:07 +0200 Message-Id: <20220930165222.249716-4-kwolf@redhat.com> In-Reply-To: <20220930165222.249716-1-kwolf@redhat.com> References: <20220930165222.249716-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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 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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664557203964100001 Content-Type: text/plain; charset="utf-8" From: Markus Armbruster '?' for help is deprecated since commit c8057f951d "Support 'help' as a synonym for '?' in command line options", v1.2.0. We neglected to update output of qemu-img --help and the manual. Do that now. Signed-off-by: Markus Armbruster Message-Id: <20220908130842.641410-1-armbru@redhat.com> Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- docs/tools/qemu-img.rst | 2 +- qemu-img.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst index 85a6e05b35..15aeddc6d8 100644 --- a/docs/tools/qemu-img.rst +++ b/docs/tools/qemu-img.rst @@ -57,7 +57,7 @@ cases. See below for a description of the supported disk = formats. *OUTPUT_FMT* is the destination format. =20 *OPTIONS* is a comma separated list of format specific options in a -name=3Dvalue format. Use ``-o ?`` for an overview of the options supported +name=3Dvalue format. Use ``-o help`` for an overview of the options suppor= ted by the used format or see the format descriptions below for details. =20 *SNAPSHOT_PARAM* is param used for internal snapshot, format is diff --git a/qemu-img.c b/qemu-img.c index 7d4b33b3da..cab9776f42 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -164,8 +164,8 @@ void help(void) " 'output_filename' is the destination disk image filename\n" " 'output_fmt' is the destination format\n" " 'options' is a comma separated list of format specific optio= ns in a\n" - " name=3Dvalue format. Use -o ? for an overview of the optio= ns supported by the\n" - " used format\n" + " name=3Dvalue format. Use -o help for an overview of the op= tions supported by\n" + " the used format\n" " 'snapshot_param' is param used for internal snapshot, format= \n" " is 'snapshot.id=3D[ID],snapshot.name=3D[NAME]', or\n" " '[ID_OR_NAME]'\n" --=20 2.37.3