qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] de6b4f: qemu-options: Remove stray colons fro

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] de6b4f: qemu-options: Remove stray colons from output of -...
Date: Wed, 20 Dec 2017 07:24:50 -0800 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: de6b4f908c300c7e7e0dc057310f5cbdcf1aed78
      
https://github.com/qemu/qemu/commit/de6b4f908c300c7e7e0dc057310f5cbdcf1aed78
  Author: Markus Armbruster <address@hidden>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M qemu-options-wrapper.h
    M qemu-options.hx
    M scripts/hxtool

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

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 <address@hidden>
CC: address@hidden
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: 1e9a7379bfe2cf73c3d3361fece41ab19624c342
      
https://github.com/qemu/qemu/commit/1e9a7379bfe2cf73c3d3361fece41ab19624c342
  Author: Markus Armbruster <address@hidden>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  qemu-options: Fix markup of -netdev l2tpv3

The table of option parameters lacks @table and @end table.  The
parameters become items in the enclosing table of options.  Screwed up
when l2tpv3 was added in commit 3fb69aa.  Fix the obvious way.

Cc: Jason Wang <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: e896d0f9ca6efb52ee44fbe890af43f23145e367
      
https://github.com/qemu/qemu/commit/e896d0f9ca6efb52ee44fbe890af43f23145e367
  Author: Markus Armbruster <address@hidden>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M qemu-doc.texi
    M qemu-options.hx

  Log Message:
  -----------
  qemu-options qemu-doc: Move "Device URL Syntax" to qemu-doc

Commit 0f5314a (v1.0) added section "Device URL Syntax" to
qemu-options.hx.  It's enclosed in STEXI..ETEXI, thus affects only
qemu-options.texi, not --help.  It appears as a subsection under
section "Invocation".  Similarly, qemu.1 has it as a subsection under
"OPTIONS".

Commit f9dadc9 (v1.1.0) dropped new option -iscsi into the middle of
this section.  No effect on qemu-options.texi.  It appears in --help
run together with the "Bluetooth(R) options:" header.

Commit c70a01e (v1.5.0) gives it is own heading in --help by moving
commit 0f5314a's DEFHEADING(Device URL Syntax:) outside STEXI..ETEXI.
Trouble is the heading makes no sense for -iscsi.

Move all of the "Device URL Syntax" Texinfo to qemu-doc.texi.  Mark it
for inclusion in qemu.1 with '@c man begin NOTES'.  This turns it into
a separate section outside the list of options both in qemu-doc and in
qemu.1.

There's substantial overlap with the existing qemu-doc section "Disk
Images".  Mark with a TODO comment.

Output of --help will be fixed next.

Cc: Ronnie Sahlberg <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: Max Reitz <address@hidden>
Cc: address@hidden
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Ronnie Sahlberg <address@hidden>
[Unwanted @node dropped]


  Commit: 61d704870ab053c6405829b423b2d83f055a8488
      
https://github.com/qemu/qemu/commit/61d704870ab053c6405829b423b2d83f055a8488
  Author: Markus Armbruster <address@hidden>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  qemu-options: Move -iscsi under "Block device options"

-iscsi ended up under the "Device URL Syntax" heading by a sequence of
errors, as explained in the previous commit.  Move it under the "Block
device options" heading.  Nothing left under "Device URL Syntax";
drop the heading.

Cc: Ronnie Sahlberg <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: Max Reitz <address@hidden>
Cc: address@hidden
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Ronnie Sahlberg <address@hidden>


  Commit: 44743148460cc9fb5537ad268a8e0e9ddf58beb8
      
https://github.com/qemu/qemu/commit/44743148460cc9fb5537ad268a8e0e9ddf58beb8
  Author: Markus Armbruster <address@hidden>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  qemu-options: Add missing -iscsi Texinfo documentation

Cc: Ronnie Sahlberg <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: Max Reitz <address@hidden>
Cc: address@hidden
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Ronnie Sahlberg <address@hidden>


  Commit: 2252aaf08786de5a4df8350e5362a98646a3e481
      
https://github.com/qemu/qemu/commit/2252aaf08786de5a4df8350e5362a98646a3e481
  Author: Markus Armbruster <address@hidden>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  qemu-options: Polish section "TPM device options"

Cc: Stefan Berger <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: dddba0688af1a68bc7c61adc6c2290fbaa31c37d
      
https://github.com/qemu/qemu/commit/dddba0688af1a68bc7c61adc6c2290fbaa31c37d
  Author: Markus Armbruster <address@hidden>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  qemu-options: Polish section "Character device options"

Cc: Paolo Bonzini <address@hidden>
CC: Marc-André Lureau <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: 7ad9270ee21fdf0262a44ebf7e280c6a85022ced
      
https://github.com/qemu/qemu/commit/7ad9270ee21fdf0262a44ebf7e280c6a85022ced
  Author: Markus Armbruster <address@hidden>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  qemu-options: Belatedly document --watchdog-action inject-nmi

Missed in commit 795dc6e46d, v2.4.0.

Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: da78e382dddc499882120590ae0ac834881a96b8
      
https://github.com/qemu/qemu/commit/da78e382dddc499882120590ae0ac834881a96b8
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M util/qemu-option.c

  Log Message:
  -----------
  option: Remove shadowing opt decl from qemu_opt_print()

opt was declared as a separate local inside the last loop,
shadowing the local at the top of the function.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 3e05349de8bd6744d23a26beac9ed6fb2e286f80
      
https://github.com/qemu/qemu/commit/3e05349de8bd6744d23a26beac9ed6fb2e286f80
  Author: Markus Armbruster <address@hidden>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M include/qemu/option.h
    M util/qemu-option.c

  Log Message:
  -----------
  option: Drop unused get_param_value(), get_next_param_value()

Their last user went away in commit f51074cdc6, "pci-hotplug-old: Has
been dead for five major releases, bury", v2.3.0.  Remove them, as new
code should use QemuOpts or maybe keyval_parse() instead.

Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 200780a3a3ed067dfb2e0d2210b0ed09e748ba26
      
https://github.com/qemu/qemu/commit/200780a3a3ed067dfb2e0d2210b0ed09e748ba26
  Author: Peter Maydell <address@hidden>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M include/qemu/option.h
    M qemu-doc.texi
    M qemu-options-wrapper.h
    M qemu-options.hx
    M scripts/hxtool
    M util/qemu-option.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/armbru/tags/pull-cmdline-2017-12-18-v2' 
into staging

Command line patches for 2017-12-18

# gpg: Signature made Wed 20 Dec 2017 08:11:57 GMT
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <address@hidden>"
# gpg:                 aka "Markus Armbruster <address@hidden>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-cmdline-2017-12-18-v2:
  option: Drop unused get_param_value(), get_next_param_value()
  option: Remove shadowing opt decl from qemu_opt_print()
  qemu-options: Belatedly document --watchdog-action inject-nmi
  qemu-options: Polish section "Character device options"
  qemu-options: Polish section "TPM device options"
  qemu-options: Add missing -iscsi Texinfo documentation
  qemu-options: Move -iscsi under "Block device options"
  qemu-options qemu-doc: Move "Device URL Syntax" to qemu-doc
  qemu-options: Fix markup of -netdev l2tpv3
  qemu-options: Remove stray colons from output of --help

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/f1faf2d59c91...200780a3a3ed
reply via email to
[Prev in Thread] Current Thread [Next in Thread]