From: Peter Maydell Date: Thu, 4 Feb 2021 14:15:35 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-qmp-2021-02-04' into staging X-Git-Tag: v6.0.0-rc0~109 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1ba089f2255bfdb071be3ce6ac6c3069e8012179;p=users%2Fdwmw2%2Fqemu.git Merge remote-tracking branch 'remotes/armbru/tags/pull-qmp-2021-02-04' into staging QMP patches patches for 2021-02-04 # gpg: Signature made Thu 04 Feb 2021 12:21:47 GMT # gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653 # gpg: issuer "armbru@redhat.com" # gpg: Good signature from "Markus Armbruster " [full] # gpg: aka "Markus Armbruster " [full] # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * remotes/armbru/tags/pull-qmp-2021-02-04: qmp: Resume OOB-enabled monitor before processing the request qmp: Add more tracepoints qmp: Fix up comments after commit 9ce44e2ce2 docs/interop/qmp-spec: Document the request queue limit qobject: braces {} are necessary for all arms of this statement qobject: spaces required around that operators qobject: code indent should never use tabs qobject: open brace '{' following struct go on the same line monitor/qmp-cmds.c: Don't include ui/vnc.h Signed-off-by: Peter Maydell --- 1ba089f2255bfdb071be3ce6ac6c3069e8012179