From nobody Tue Feb 10 03:39:55 2026 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1579634111; cv=none; d=zohomail.com; s=zohoarc; b=RlAqfzcrhux6vMWyQzYxiPaX1J8G7odOQzIX6+aPVkTerP4/JCNArM4twta5gOfTnozTTo+O4XKCsda4hc8VbSbpsReh8ilb0WXWLF4Z1w0hOzPdf60+UslDYKfHjaQgosP2Dad0pBF6hJWmyj6LpLHp3yXOKnzt4gsL24Av6IM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579634111; 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=uKabW15C4n2jmTQFgY3S92jryc7MUatzd/T/Wg9/UyQ=; b=DaDeG9r5DbgnK+fDakUlHgigdPLdXPUx5Fuc2gQMPCunwANXCc+RthbnSN2RZCXJjK+K2z5STcpODdyp3vLCkk/4/4a1jhcG3tNu1l6sQ1n1JRX6thRoVreyHEm5lVWw+9gcg9lQI9G4H7RLoIq324SP3Du8Mzsew8Tezkz+4BQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579634111664719.6987801954551; Tue, 21 Jan 2020 11:15:11 -0800 (PST) Received: from localhost ([::1]:59948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ityzW-0007p8-8j for importer@patchew.org; Tue, 21 Jan 2020 14:15:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59321) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ityvH-0002Uc-In for qemu-devel@nongnu.org; Tue, 21 Jan 2020 14:10:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ityvF-0004Sm-M4 for qemu-devel@nongnu.org; Tue, 21 Jan 2020 14:10:47 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:34534) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ityvF-0004SO-G7 for qemu-devel@nongnu.org; Tue, 21 Jan 2020 14:10:45 -0500 Received: by mail-wr1-x433.google.com with SMTP id t2so4597224wrr.1 for ; Tue, 21 Jan 2020 11:10:45 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id l3sm49533271wrt.29.2020.01.21.11.10.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jan 2020 11:10:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uKabW15C4n2jmTQFgY3S92jryc7MUatzd/T/Wg9/UyQ=; b=MvZ/dVW8wolEjhmjiouLjQjTrcZ3sEC25hTaao7qYEZfwtwjj9PSjWIGD3YFBBEEBW d7GE2o8XNLK8QokqxFOPjLQZqJCH6fQIvbTRcTuSWqQDpSXNpR9q3Q/vCpuy7jU+E2Zm A8djSlFV/xsq0sJCaTRfR7//KVK3Ziohm6Zy8MCRkD8RCe0ZFhyFC6FUyfIisbaPhMLU UWOh3wjmCUtbZtdbvR8/ok88OdMDsiGazUNGa3V8gR3t+7cPWn4an4cKLH3if2dpQrkM Ock+0JmH/tzI0Oq2Vsb8xuxTvNNyLNZZyNkDS0pY3zZnX3eS1S572b6FXKwtzkZFmq/A fg4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uKabW15C4n2jmTQFgY3S92jryc7MUatzd/T/Wg9/UyQ=; b=JSFK9HwzCwBX0ooFStnmjd/13itflmf4uaGy3889XPf0ZZworIMbutfdwthZ3QtMYB XendD7PDvlootnIIr2brtZVmmRwT8AlGt0HoV3xMM1Xa5yvMOifqNoHbECr+/fxqbhd3 p0mWPQEC0+KJtHU+XXW6I3cdM56ET8N2MW6sd8dpSgaE4KbpSLvZLn9QzownPxcywbKv xRURVHHaUrn4Xd+L6xY7D5rpmThMFGoTNfh41zatFma/kXET6MSlvMgQ+1ykC6UytvRy +NYcgMr3fyTmcF8Szs7K7HcfXu2gsJiVNwDBsgUoTgCPm+s8QVkF+xq75IDrJ99XiSif VEOg== X-Gm-Message-State: APjAAAUlVPvKIFudCAJV5GLayQK3BXz8mdOX4ld0jUFcxXibWFf6Z411 ySLXik2CrD12Z/DFTjQyl6wNgzzxbkP5FQ== X-Google-Smtp-Source: APXvYqxa+iJsilZPTd/ASZguUasNLd2FKdDxxuqG8+qI8HHk22yFpPIcT0WC04BWTDQ7WFVbYWZHZw== X-Received: by 2002:adf:e40f:: with SMTP id g15mr6607988wrm.223.1579633844192; Tue, 21 Jan 2020 11:10:44 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 5/5] qemu-img-cmds.hx: Remove texinfo document fragments Date: Tue, 21 Jan 2020 19:10:33 +0000 Message-Id: <20200121191033.28195-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200121191033.28195-1-peter.maydell@linaro.org> References: <20200121191033.28195-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::433 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, Markus Armbruster , Max Reitz , Stefan Hajnoczi , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Now the qemu-img documentation has been converted to rST, we can remove the texinfo document fragments from qemu-img-cmds.hx, as they are no longer used. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- qemu-img-cmds.hx | 56 +++--------------------------------------------- 1 file changed, 3 insertions(+), 53 deletions(-) diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx index 0c8b210b3c3..32e999d0965 100644 --- a/qemu-img-cmds.hx +++ b/qemu-img-cmds.hx @@ -1,143 +1,93 @@ HXCOMM Keep the list of subcommands sorted by name. HXCOMM Use DEFHEADING() to define headings in both help text and texi -HXCOMM Text between STEXI and ETEXI are copied to texi version and +HXCOMM Text between SRST and ERST are copied to rST version and HXCOMM discarded from C version HXCOMM DEF(command, callback, arg_string) is used to construct HXCOMM command structures and help message. -HXCOMM HXCOMM can be used for comments, discarded from both texi and C +HXCOMM HXCOMM can be used for comments, discarded from both rST and C =20 -HXCOMM When amending the TEXI sections, please remember to copy the usage +HXCOMM When amending the rST sections, please remember to copy the usage HXCOMM over to the per-command sections in qemu-img.texi. =20 -STEXI -@table @option -ETEXI - DEF("amend", img_amend, "amend [--object objectdef] [--image-opts] [-p] [-q] [-f fmt] [-t cach= e] -o options filename") -STEXI -@item amend [--object @var{objectdef}] [--image-opts] [-p] [-q] [-f @var{f= mt}] [-t @var{cache}] -o @var{options} @var{filename} -ETEXI SRST .. option:: amend [--object OBJECTDEF] [--image-opts] [-p] [-q] [-f FMT] [= -t CACHE] -o OPTIONS FILENAME ERST =20 DEF("bench", img_bench, "bench [-c count] [-d depth] [-f fmt] [--flush-interval=3Dflush_interv= al] [-n] [--no-drain] [-o offset] [--pattern=3Dpattern] [-q] [-s buffer_siz= e] [-S step_size] [-t cache] [-w] [-U] filename") -STEXI -@item bench [-c @var{count}] [-d @var{depth}] [-f @var{fmt}] [--flush-inte= rval=3D@var{flush_interval}] [-n] [--no-drain] [-o @var{offset}] [--pattern= =3D@var{pattern}] [-q] [-s @var{buffer_size}] [-S @var{step_size}] [-t @var= {cache}] [-w] [-U] @var{filename} -ETEXI SRST .. option:: bench [-c COUNT] [-d DEPTH] [-f FMT] [--flush-interval=3DFLUSH= _INTERVAL] [-n] [--no-drain] [-o OFFSET] [--pattern=3DPATTERN] [-q] [-s BUF= FER_SIZE] [-S STEP_SIZE] [-t CACHE] [-w] [-U] FILENAME ERST DEF("check", img_check, "check [--object objectdef] [--image-opts] [-q] [-f fmt] [--output=3Do= fmt] [-r [leaks | all]] [-T src_cache] [-U] filename") -STEXI -@item check [--object @var{objectdef}] [--image-opts] [-q] [-f @var{fmt}] = [--output=3D@var{ofmt}] [-r [leaks | all]] [-T @var{src_cache}] [-U] @var{f= ilename} -ETEXI SRST .. option:: check [--object OBJECTDEF] [--image-opts] [-q] [-f FMT] [--out= put=3DOFMT] [-r [leaks | all]] [-T SRC_CACHE] [-U] FILENAME ERST =20 DEF("commit", img_commit, "commit [--object objectdef] [--image-opts] [-q] [-f fmt] [-t cache] [= -b base] [-d] [-p] filename") -STEXI -@item commit [--object @var{objectdef}] [--image-opts] [-q] [-f @var{fmt}]= [-t @var{cache}] [-b @var{base}] [-d] [-p] @var{filename} -ETEXI SRST .. option:: commit [--object OBJECTDEF] [--image-opts] [-q] [-f FMT] [-t C= ACHE] [-b BASE] [-d] [-p] FILENAME ERST =20 DEF("compare", img_compare, "compare [--object objectdef] [--image-opts] [-f fmt] [-F fmt] [-T src= _cache] [-p] [-q] [-s] [-U] filename1 filename2") -STEXI -@item compare [--object @var{objectdef}] [--image-opts] [-f @var{fmt}] [-F= @var{fmt}] [-T @var{src_cache}] [-p] [-q] [-s] [-U] @var{filename1} @var{f= ilename2} -ETEXI SRST .. option:: compare [--object OBJECTDEF] [--image-opts] [-f FMT] [-F FMT] = [-T SRC_CACHE] [-p] [-q] [-s] [-U] FILENAME1 FILENAME2 ERST =20 DEF("convert", img_convert, "convert [--object objectdef] [--image-opts] [--target-image-opts] [-U= ] [-C] [-c] [-p] [-q] [-n] [-f fmt] [-t cache] [-T src_cache] [-O output_fm= t] [-B backing_file] [-o options] [-l snapshot_param] [-S sparse_size] [-m = num_coroutines] [-W] [--salvage] filename [filename2 [...]] output_filename= ") -STEXI -@item convert [--object @var{objectdef}] [--image-opts] [--target-image-op= ts] [-U] [-C] [-c] [-p] [-q] [-n] [-f @var{fmt}] [-t @var{cache}] [-T @var{= src_cache}] [-O @var{output_fmt}] [-B @var{backing_file}] [-o @var{options}= ] [-l @var{snapshot_param}] [-S @var{sparse_size}] [-m @var{num_coroutines}= ] [-W] [--salvage] @var{filename} [@var{filename2} [...]] @var{output_filen= ame} -ETEXI SRST .. option:: convert [--object OBJECTDEF] [--image-opts] [--target-image-op= ts] [-U] [-C] [-c] [-p] [-q] [-n] [-f FMT] [-t CACHE] [-T SRC_CACHE] [-O OU= TPUT_FMT] [-B BACKING_FILE] [-o OPTIONS] [-l SNAPSHOT_PARAM] [-S SPARSE_SIZ= E] [-m NUM_COROUTINES] [-W] [--salvage] FILENAME [FILENAME2 [...]] OUTPUT_F= ILENAME ERST =20 DEF("create", img_create, "create [--object objectdef] [-q] [-f fmt] [-b backing_file] [-F backi= ng_fmt] [-u] [-o options] filename [size]") -STEXI -@item create [--object @var{objectdef}] [-q] [-f @var{fmt}] [-b @var{backi= ng_file}] [-F @var{backing_fmt}] [-u] [-o @var{options}] @var{filename} [@v= ar{size}] -ETEXI SRST .. option:: create [--object OBJECTDEF] [-q] [-f FMT] [-b BACKING_FILE] [-= F BACKING_FMT] [-u] [-o OPTIONS] FILENAME [SIZE] ERST =20 DEF("dd", img_dd, "dd [--image-opts] [-U] [-f fmt] [-O output_fmt] [bs=3Dblock_size] [co= unt=3Dblocks] [skip=3Dblocks] if=3Dinput of=3Doutput") -STEXI -@item dd [--image-opts] [-U] [-f @var{fmt}] [-O @var{output_fmt}] [bs=3D@v= ar{block_size}] [count=3D@var{blocks}] [skip=3D@var{blocks}] if=3D@var{inpu= t} of=3D@var{output} -ETEXI SRST .. option:: dd [--image-opts] [-U] [-f FMT] [-O OUTPUT_FMT] [bs=3DBLOCK_SI= ZE] [count=3DBLOCKS] [skip=3DBLOCKS] if=3DINPUT of=3DOUTPUT ERST =20 DEF("info", img_info, "info [--object objectdef] [--image-opts] [-f fmt] [--output=3Dofmt] [= --backing-chain] [-U] filename") -STEXI -@item info [--object @var{objectdef}] [--image-opts] [-f @var{fmt}] [--out= put=3D@var{ofmt}] [--backing-chain] [-U] @var{filename} -ETEXI SRST .. option:: info [--object OBJECTDEF] [--image-opts] [-f FMT] [--output=3D= OFMT] [--backing-chain] [-U] FILENAME ERST =20 DEF("map", img_map, "map [--object objectdef] [--image-opts] [-f fmt] [--output=3Dofmt] [-= U] filename") -STEXI -@item map [--object @var{objectdef}] [--image-opts] [-f @var{fmt}] [--outp= ut=3D@var{ofmt}] [-U] @var{filename} -ETEXI SRST .. option:: map [--object OBJECTDEF] [--image-opts] [-f FMT] [--output=3DO= FMT] [-U] FILENAME ERST =20 DEF("measure", img_measure, "measure [--output=3Dofmt] [-O output_fmt] [-o options] [--size N | [--obj= ect objectdef] [--image-opts] [-f fmt] [-l snapshot_param] filename]") -STEXI -@item measure [--output=3D@var{ofmt}] [-O @var{output_fmt}] [-o @var{optio= ns}] [--size @var{N} | [--object @var{objectdef}] [--image-opts] [-f @var{f= mt}] [-l @var{snapshot_param}] @var{filename}] -ETEXI SRST .. option:: measure [--output=3DOFMT] [-O OUTPUT_FMT] [-o OPTIONS] [--size= N | [--object OBJECTDEF] [--image-opts] [-f FMT] [-l SNAPSHOT_PARAM] FILEN= AME] ERST =20 DEF("snapshot", img_snapshot, "snapshot [--object objectdef] [--image-opts] [-U] [-q] [-l | -a snaps= hot | -c snapshot | -d snapshot] filename") -STEXI -@item snapshot [--object @var{objectdef}] [--image-opts] [-U] [-q] [-l | -= a @var{snapshot} | -c @var{snapshot} | -d @var{snapshot}] @var{filename} -ETEXI SRST .. option:: snapshot [--object OBJECTDEF] [--image-opts] [-U] [-q] [-l | -= a SNAPSHOT | -c SNAPSHOT | -d SNAPSHOT] FILENAME ERST =20 DEF("rebase", img_rebase, "rebase [--object objectdef] [--image-opts] [-U] [-q] [-f fmt] [-t cac= he] [-T src_cache] [-p] [-u] -b backing_file [-F backing_fmt] filename") -STEXI -@item rebase [--object @var{objectdef}] [--image-opts] [-U] [-q] [-f @var{= fmt}] [-t @var{cache}] [-T @var{src_cache}] [-p] [-u] -b @var{backing_file}= [-F @var{backing_fmt}] @var{filename} -ETEXI SRST .. option:: rebase [--object OBJECTDEF] [--image-opts] [-U] [-q] [-f FMT] = [-t CACHE] [-T SRC_CACHE] [-p] [-u] -b BACKING_FILE [-F BACKING_FMT] FILENA= ME ERST =20 DEF("resize", img_resize, "resize [--object objectdef] [--image-opts] [-f fmt] [--preallocation= =3Dprealloc] [-q] [--shrink] filename [+ | -]size") -STEXI -@item resize [--object @var{objectdef}] [--image-opts] [-f @var{fmt}] [--p= reallocation=3D@var{prealloc}] [-q] [--shrink] @var{filename} [+ | -]@var{s= ize} -ETEXI SRST .. option:: resize [--object OBJECTDEF] [--image-opts] [-f FMT] [--preallo= cation=3DPREALLOC] [-q] [--shrink] FILENAME [+ | -]SIZE ERST - -STEXI -@end table -ETEXI --=20 2.20.1