Commit 43f187a5 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

hxtool: emit Texinfo headings as @subsection 



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: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 2f75bd73

qemu-options-wrapper.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

qemu-options.hx

+19 −12
Original line number Diff line number Diff line
@@ -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

@end table

ETEXI

DEFHEADING()

DEFHEADING(Generic object creation)

STEXI

@table @option

ETEXI



DEF("object", HAS_ARG, QEMU_OPTION_object,

    "-object TYPENAME[,PROP1=VALUE1,...]\n"

scripts/hxtool

+9 −2
Original line number Diff line number Diff line
@@ -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"