[Qemu-commits] [qemu/qemu] f9516e: monitor/hmp: add support for flag argument with value

[Richard Henderson]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: f9516e380ec43707af14e712c09a586501baf33e
      
https://github.com/qemu/qemu/commit/f9516e380ec43707af14e712c09a586501baf33e
  Author: Stefan Reiter <s.reiter@proxmox.com>
  Date:   2021-10-28 (Thu, 28 Oct 2021)

  Changed paths:
    M monitor/hmp.c
    M monitor/monitor-internal.h

  Log Message:
  -----------
  monitor/hmp: add support for flag argument with value

Adds support for the "-xV" parameter type, where "-x" denotes a flag
name and the "V" suffix indicates that this flag is supposed to take an
arbitrary string parameter.

These parameters are always optional, the entry in the qdict will be
omitted if the flag is not given.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
Message-Id: <20211021100135.4146766-2-s.reiter@proxmox.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 9b8c77b167d9a5828d02302875906eb08a02baf0
      
https://github.com/qemu/qemu/commit/9b8c77b167d9a5828d02302875906eb08a02baf0
  Author: Stefan Reiter <s.reiter@proxmox.com>
  Date:   2021-10-28 (Thu, 28 Oct 2021)

  Changed paths:
    M monitor/hmp-cmds.c
    M monitor/qmp-cmds.c
    M qapi/ui.json

  Log Message:
  -----------
  qapi/monitor: refactor set/expire_password with enums

'protocol' and 'connected' are better suited as enums than as strings,
make use of that. No functional change intended.

Suggested-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
Message-Id: <20211021100135.4146766-3-s.reiter@proxmox.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: ddf513eaddc494e338a1db3da26050e798721267
      
https://github.com/qemu/qemu/commit/ddf513eaddc494e338a1db3da26050e798721267
  Author: Stefan Reiter <s.reiter@proxmox.com>
  Date:   2021-10-28 (Thu, 28 Oct 2021)

  Changed paths:
    M hmp-commands.hx
    M monitor/hmp-cmds.c
    M monitor/qmp-cmds.c
    M qapi/ui.json

  Log Message:
  -----------
  qapi/monitor: allow VNC display id in set/expire_password

It is possible to specify more than one VNC server on the command line,
either with an explicit ID or the auto-generated ones à la "default",
"vnc2", "vnc3", ...

It is not possible to change the password on one of these extra VNC
displays though. Fix this by adding a "display" parameter to the
"set_password" and "expire_password" QMP and HMP commands.

For HMP, the display is specified using the "-d" value flag.

For QMP, the schema is updated to explicitly express the supported
variants of the commands with protocol-discriminated unions.

Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
Message-Id: <20211021100135.4146766-4-s.reiter@proxmox.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 47c849357b57c1fbd3d3355c586c4784c6f4188e
      
https://github.com/qemu/qemu/commit/47c849357b57c1fbd3d3355c586c4784c6f4188e
  Author: Stefan Reiter <s.reiter@proxmox.com>
  Date:   2021-10-28 (Thu, 28 Oct 2021)

  Changed paths:
    M docs/about/deprecated.rst
    M monitor/qmp-cmds.c
    M qapi/ui.json

  Log Message:
  -----------
  qapi/monitor: only allow 'keep' SetPasswordAction for VNC and deprecate

VNC only supports 'keep' here, enforce this via a seperate
SetPasswordActionVnc enum and mark the option 'deprecated' (as it is
useless with only one value possible).

Also add a deprecation note to docs.

Suggested-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
Message-Id: <20211021100135.4146766-5-s.reiter@proxmox.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 15525d3bc1fa810633ca2ea1d2bb55fddd8fb69d
      
https://github.com/qemu/qemu/commit/15525d3bc1fa810633ca2ea1d2bb55fddd8fb69d
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2021-10-28 (Thu, 28 Oct 2021)

  Changed paths:
    M docs/about/deprecated.rst
    M hmp-commands.hx
    M monitor/hmp-cmds.c
    M monitor/hmp.c
    M monitor/monitor-internal.h
    M monitor/qmp-cmds.c
    M qapi/ui.json

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2021-10-28' 
into staging

Monitor patches patches for 2021-10-28

# gpg: Signature made Wed 27 Oct 2021 10:25:51 PM PDT
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]

* remotes/armbru/tags/pull-monitor-2021-10-28:
  qapi/monitor: only allow 'keep' SetPasswordAction for VNC and deprecate
  qapi/monitor: allow VNC display id in set/expire_password
  qapi/monitor: refactor set/expire_password with enums
  monitor/hmp: add support for flag argument with value

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Compare: https://github.com/qemu/qemu/compare/80e9c5ade49e...15525d3bc1fa