david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qemu-options: Remove stray colons from output of --help

Browse Source 
Commit 43f187a broke --help: it put colons into blank lines.  It
removed the colon from DEFHEADING(TITLE:) and added it back in the
macro expansion of DEFHEADING(TITLE), so hxtool can emit "@subsection
TITLE" more easily.  Trouble is it's added back even for the blank
lines made with DEFHEADING().

Put the colons back where they were before commit 43f187a, and strip
them in hxtool instead.

Cc: Paolo Bonzini <pbonzini@redhat.com>
CC: qemu-stable@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20171002140307.5292-2-armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Markus Armbruster 2017-10-02 16:03:00 +02:00
parent af352675ef
commit de6b4f908c
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qemu-options-wrapper.h
View File

@ -14,7 +14,7 @@
#define ARCHHEADING(text, arch_mask) \ #define ARCHHEADING(text, arch_mask) \
if ((arch_mask) & arch_type) \ if ((arch_mask) & arch_type) \
puts(stringify(text) ":"); puts(stringify(text));
#define DEFHEADING(text) ARCHHEADING(text, QEMU_ARCH_ALL) #define DEFHEADING(text) ARCHHEADING(text, QEMU_ARCH_ALL)

27
qemu-options.hx
View File

@ -6,7 +6,7 @@ HXCOMM construct option structures, enums and help message for specified
HXCOMM architectures. HXCOMM architectures.
HXCOMM HXCOMM can be used for comments, discarded from both texi and C HXCOMM HXCOMM can be used for comments, discarded from both texi and C
DEFHEADING(Standard options) DEFHEADING(Standard options:)
STEXI STEXI
@table @option @table @option
ETEXI ETEXI
@ -584,7 +584,7 @@ STEXI
ETEXI ETEXI
DEFHEADING() DEFHEADING()
DEFHEADING(Block device options) DEFHEADING(Block device options:)
STEXI STEXI
@table @option @table @option
ETEXI ETEXI
@ -1187,7 +1187,7 @@ STEXI
ETEXI ETEXI
DEFHEADING() DEFHEADING()
DEFHEADING(USB options) DEFHEADING(USB options:)
STEXI STEXI
@table @option @table @option
ETEXI ETEXI
@ -1252,7 +1252,7 @@ STEXI
ETEXI ETEXI
DEFHEADING() DEFHEADING()
DEFHEADING(Display options) DEFHEADING(Display options:)
STEXI STEXI
@table @option @table @option
ETEXI ETEXI
@ -1789,7 +1789,7 @@ STEXI
ETEXI ETEXI
ARCHHEADING(, QEMU_ARCH_I386) ARCHHEADING(, QEMU_ARCH_I386)
ARCHHEADING(i386 target only, QEMU_ARCH_I386) ARCHHEADING(i386 target only:, QEMU_ARCH_I386)
STEXI STEXI
@table @option @table @option
ETEXI ETEXI
@ -1905,7 +1905,7 @@ STEXI
ETEXI ETEXI
DEFHEADING() DEFHEADING()
DEFHEADING(Network options) DEFHEADING(Network options:)
STEXI STEXI
@table @option @table @option
ETEXI ETEXI
@ -2486,7 +2486,7 @@ STEXI
ETEXI ETEXI
DEFHEADING() DEFHEADING()
DEFHEADING(Character device options) DEFHEADING(Character device options:)
STEXI STEXI
The general form of a character device option is: The general form of a character device option is:
@ -2819,7 +2819,7 @@ STEXI
ETEXI ETEXI
DEFHEADING() DEFHEADING()
DEFHEADING(Device URL Syntax) DEFHEADING(Device URL Syntax:)
STEXI STEXI
In addition to using normal file images for the emulated storage devices, In addition to using normal file images for the emulated storage devices,
@ -3049,7 +3049,7 @@ STEXI
@end table @end table
ETEXI ETEXI
DEFHEADING(Bluetooth(R) options) DEFHEADING(Bluetooth(R) options:)
STEXI STEXI
@table @option @table @option
ETEXI ETEXI
@ -3125,7 +3125,7 @@ ETEXI
DEFHEADING() DEFHEADING()
#ifdef CONFIG_TPM #ifdef CONFIG_TPM
DEFHEADING(TPM device options) DEFHEADING(TPM device options:)
DEF("tpmdev", HAS_ARG, QEMU_OPTION_tpmdev, \ DEF("tpmdev", HAS_ARG, QEMU_OPTION_tpmdev, \
"-tpmdev passthrough,id=id[,path=path][,cancel-path=path]\n" "-tpmdev passthrough,id=id[,path=path][,cancel-path=path]\n"
@ -3215,7 +3215,7 @@ DEFHEADING()
#endif #endif
DEFHEADING(Linux/Multiboot boot specific) DEFHEADING(Linux/Multiboot boot specific:)
STEXI STEXI
When using these options, you can use a given Linux or Multiboot When using these options, you can use a given Linux or Multiboot
@ -3271,7 +3271,7 @@ STEXI
ETEXI ETEXI
DEFHEADING() DEFHEADING()
DEFHEADING(Debug/Expert options) DEFHEADING(Debug/Expert options:)
STEXI STEXI
@table @option @table @option
ETEXI ETEXI
@ -4178,7 +4178,8 @@ STEXI
@end table @end table
ETEXI ETEXI
DEFHEADING() DEFHEADING()
DEFHEADING(Generic object creation)
DEFHEADING(Generic object creation:)
STEXI STEXI
@table @option @table @option
ETEXI ETEXI

3
scripts/hxtool
View File

@ -19,7 +19,8 @@ hxtoh()
print_texi_heading() print_texi_heading()
{ {
if test "$*" != ""; then if test "$*" != ""; then
printf "@subsection %s\n" "$*" title="$*"
printf "@subsection %s\n" "${title%:}"
fi fi
} }