[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 21/35] hxtool: emit Texinfo headings as @subsection
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 21/35] hxtool: emit Texinfo headings as @subsection |
Date: |
Fri, 20 Jan 2017 14:31:25 +0100 |
Remove the colon, and add it in qemu-options-wrapper.h instead.
The introduction of @subsection also found a case where the table
was not closed and reopened around a heading, so fix it.
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
qemu-options-wrapper.h | 2 +-
qemu-options.hx | 31 +++++++++++++++++++------------
scripts/hxtool | 11 +++++++++--
3 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/qemu-options-wrapper.h b/qemu-options-wrapper.h
index 13bfea0..4d7aeb1 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 c534a2f..b62d2d7 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
@@ -468,7 +468,7 @@ STEXI
ETEXI
DEFHEADING()
-DEFHEADING(Block device options:)
+DEFHEADING(Block device options)
STEXI
@table @option
ETEXI
@@ -856,7 +856,7 @@ STEXI
ETEXI
DEFHEADING()
-DEFHEADING(USB options:)
+DEFHEADING(USB options)
STEXI
@table @option
ETEXI
@@ -920,7 +920,7 @@ STEXI
ETEXI
DEFHEADING()
-DEFHEADING(Display options:)
+DEFHEADING(Display options)
STEXI
@table @option
ETEXI
@@ -1449,7 +1449,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
@@ -1565,7 +1565,7 @@ STEXI
ETEXI
DEFHEADING()
-DEFHEADING(Network options:)
+DEFHEADING(Network options)
STEXI
@table @option
ETEXI
@@ -2146,7 +2146,7 @@ STEXI
ETEXI
DEFHEADING()
-DEFHEADING(Character device options:)
+DEFHEADING(Character device options)
STEXI
The general form of a character device option is:
@@ -2481,7 +2481,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,
@@ -2711,7 +2711,7 @@ STEXI
@end table
ETEXI
-DEFHEADING(Bluetooth(R) options:)
+DEFHEADING(Bluetooth(R) options)
STEXI
@table @option
ETEXI
@@ -2787,7 +2787,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"
@@ -2861,7 +2861,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
@@ -2917,7 +2917,7 @@ STEXI
ETEXI
DEFHEADING()
-DEFHEADING(Debug/Expert options:)
+DEFHEADING(Debug/Expert options)
STEXI
@table @option
ETEXI
@@ -3775,7 +3775,14 @@ Dump json-encoded vmstate information for current
machine type to file
in @var{file}
ETEXI
+STEXI
address@hidden table
+ETEXI
+DEFHEADING()
DEFHEADING(Generic object creation)
+STEXI
address@hidden @option
+ETEXI
DEF("object", HAS_ARG, QEMU_OPTION_object,
"-object TYPENAME[,PROP1=VALUE1,...]\n"
diff --git a/scripts/hxtool b/scripts/hxtool
index 04f7d7b..5468cd7 100644
--- a/scripts/hxtool
+++ b/scripts/hxtool
@@ -16,6 +16,13 @@ hxtoh()
done
}
+print_texi_heading()
+{
+ if test "$*" != ""; then
+ printf "@subsection %s\n" "$*"
+ fi
+}
+
hxtotexi()
{
flag=0
@@ -45,10 +52,10 @@ hxtotexi()
fi
;;
DEFHEADING*)
- printf '%s\n' "$(expr "$str" : "DEFHEADING(\(.*\))")"
+ print_texi_heading "$(expr "$str" : "DEFHEADING(\(.*\))")"
;;
ARCHHEADING*)
- printf '%s\n' "$(expr "$str" : "ARCHHEADING(\(.*\),.*)")"
+ print_texi_heading "$(expr "$str" : "ARCHHEADING(\(.*\),.*)")"
;;
*)
test $flag -eq 1 && printf '%s\n' "$str"
--
2.9.3
- [Qemu-devel] [PULL 10/35] stubs: group stubs for user-mode emulation, (continued)
- [Qemu-devel] [PULL 10/35] stubs: group stubs for user-mode emulation, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 14/35] build: remove --enable-colo/--disable-colo, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 13/35] event_notifier: cleanups around event_notifier_set_handler, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 11/35] stubs: group all monitor_fdset_* functions in a single file, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 16/35] acpi: filter based on CONFIG_ACPI_X86 rather than TARGET, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 15/35] stubs: remove stubs/kvm.c, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 18/35] scsi-block: fix direction of BYTCHK test for VERIFY commands, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 17/35] pc: fix crash in rtc_set_memory() if initial cpu is marked as hotplugged, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 19/35] serial: fix memory leak in serial exit, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 20/35] qemu-thread: fix qemu_thread_set_name() race in qemu_thread_create(), Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 21/35] hxtool: emit Texinfo headings as @subsection,
Paolo Bonzini <=
- [Qemu-devel] [PULL 25/35] exec: Add missing rcu_read_unlock, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 22/35] x86: ioapic: add traces for ioapic, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 24/35] x86: ioapic: fix fail migration when irqchip=split, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 23/35] x86: ioapic: dump version for "info ioapic", Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 26/35] char: fix ctrl-a b not working, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 27/35] ramblock-notifier: new, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 28/35] KVM: PPC: eliminate unnecessary duplicate constants, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 29/35] kvm: move cpu synchronization code, Paolo Bonzini, 2017/01/20