summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--qemu-options-wrapper.h2
-rw-r--r--qemu-options.hx27
-rw-r--r--scripts/hxtool3
3 files changed, 17 insertions, 15 deletions
diff --git a/qemu-options-wrapper.h b/qemu-options-wrapper.h
index 4d7aeb1352..13bfea0294 100644
--- a/qemu-options-wrapper.h
+++ b/qemu-options-wrapper.h
@@ -14,7 +14,7 @@
#define ARCHHEADING(text, arch_mask) \
if ((arch_mask) & arch_type) \
- puts(stringify(text) ":");
+ puts(stringify(text));
#define DEFHEADING(text) ARCHHEADING(text, QEMU_ARCH_ALL)
diff --git a/qemu-options.hx b/qemu-options.hx
index 32d9378172..9090f10257 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -6,7 +6,7 @@ HXCOMM construct option structures, enums and help message for specified
HXCOMM architectures.
HXCOMM HXCOMM can be used for comments, discarded from both texi and C
-DEFHEADING(Standard options)
+DEFHEADING(Standard options:)
STEXI
@table @option
ETEXI
@@ -584,7 +584,7 @@ STEXI
ETEXI
DEFHEADING()
-DEFHEADING(Block device options)
+DEFHEADING(Block device options:)
STEXI
@table @option
ETEXI
@@ -1187,7 +1187,7 @@ STEXI
ETEXI
DEFHEADING()
-DEFHEADING(USB options)
+DEFHEADING(USB options:)
STEXI
@table @option
ETEXI
@@ -1252,7 +1252,7 @@ STEXI
ETEXI
DEFHEADING()
-DEFHEADING(Display options)
+DEFHEADING(Display options:)
STEXI
@table @option
ETEXI
@@ -1789,7 +1789,7 @@ STEXI
ETEXI
ARCHHEADING(, QEMU_ARCH_I386)
-ARCHHEADING(i386 target only, QEMU_ARCH_I386)
+ARCHHEADING(i386 target only:, QEMU_ARCH_I386)
STEXI
@table @option
ETEXI
@@ -1905,7 +1905,7 @@ STEXI
ETEXI
DEFHEADING()
-DEFHEADING(Network options)
+DEFHEADING(Network options:)
STEXI
@table @option
ETEXI
@@ -2486,7 +2486,7 @@ STEXI
ETEXI
DEFHEADING()
-DEFHEADING(Character device options)
+DEFHEADING(Character device options:)
STEXI
The general form of a character device option is:
@@ -2819,7 +2819,7 @@ STEXI
ETEXI
DEFHEADING()
-DEFHEADING(Device URL Syntax)
+DEFHEADING(Device URL Syntax:)
STEXI
In addition to using normal file images for the emulated storage devices,
@@ -3049,7 +3049,7 @@ STEXI
@end table
ETEXI
-DEFHEADING(Bluetooth(R) options)
+DEFHEADING(Bluetooth(R) options:)
STEXI
@table @option
ETEXI
@@ -3125,7 +3125,7 @@ ETEXI
DEFHEADING()
#ifdef CONFIG_TPM
-DEFHEADING(TPM device options)
+DEFHEADING(TPM device options:)
DEF("tpmdev", HAS_ARG, QEMU_OPTION_tpmdev, \
"-tpmdev passthrough,id=id[,path=path][,cancel-path=path]\n"
@@ -3215,7 +3215,7 @@ DEFHEADING()
#endif
-DEFHEADING(Linux/Multiboot boot specific)
+DEFHEADING(Linux/Multiboot boot specific:)
STEXI
When using these options, you can use a given Linux or Multiboot
@@ -3271,7 +3271,7 @@ STEXI
ETEXI
DEFHEADING()
-DEFHEADING(Debug/Expert options)
+DEFHEADING(Debug/Expert options:)
STEXI
@table @option
ETEXI
@@ -4178,7 +4178,8 @@ STEXI
@end table
ETEXI
DEFHEADING()
-DEFHEADING(Generic object creation)
+
+DEFHEADING(Generic object creation:)
STEXI
@table @option
ETEXI
diff --git a/scripts/hxtool b/scripts/hxtool
index 1e2c97c5e6..7d7c4289e3 100644
--- a/scripts/hxtool
+++ b/scripts/hxtool
@@ -19,7 +19,8 @@ hxtoh()
print_texi_heading()
{
if test "$*" != ""; then
- printf "@subsection %s\n" "$*"
+ title="$*"
+ printf "@subsection %s\n" "${title%:}"
fi
}