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

[Qemu-commits] [qemu/qemu] fb246f: monitor/qmp-cmds.c: Don't include ui/

From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] fb246f: monitor/qmp-cmds.c: Don't include ui/vnc.h
Date: Thu, 04 Feb 2021 06:16:12 -0800 
  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: fb246f05909c57341aec9a3ba42f1908b9cbfde6
      
https://github.com/qemu/qemu/commit/fb246f05909c57341aec9a3ba42f1908b9cbfde6
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-02-04 (Thu, 04 Feb 2021)

  Changed paths:
    M monitor/qmp-cmds.c

  Log Message:
  -----------
  monitor/qmp-cmds.c: Don't include ui/vnc.h

The qmp-cmds.c file currently includes ui/vnc.h, which (being located
in the ui/ directory rather than include) is really supposed to be
for use only by the ui subsystem.  In fact the function prototypes we
need (vnc_display_password(), etc) are all declared in
include/ui/console.h, so we can switch to including that instead.

(ui/vnc.h includes include/ui/console.h, so this change strictly
reduces the quantity of headers qmp-cmds.c pulls in.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20210104161200.15068-1-peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 5086c9973a1303cce4791f3c244256e579191410
      
https://github.com/qemu/qemu/commit/5086c9973a1303cce4791f3c244256e579191410
  Author: Zhang Han <zhanghan64@huawei.com>
  Date:   2021-02-04 (Thu, 04 Feb 2021)

  Changed paths:
    M qobject/json-parser.c
    M qobject/qjson.c

  Log Message:
  -----------
  qobject: open brace '{' following struct go on the same line

Put open brace '{' on the same line of struct.

Signed-off-by: Zhang Han <zhanghan64@huawei.com>
Message-Id: <20201228071129.24563-2-zhanghan64@huawei.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: be08fb1897145e5fc3d11e05c2896b259887d9aa
      
https://github.com/qemu/qemu/commit/be08fb1897145e5fc3d11e05c2896b259887d9aa
  Author: Zhang Han <zhanghan64@huawei.com>
  Date:   2021-02-04 (Thu, 04 Feb 2021)

  Changed paths:
    M qobject/qdict.c

  Log Message:
  -----------
  qobject: code indent should never use tabs

Transfer tabs to spaces.

Signed-off-by: Zhang Han <zhanghan64@huawei.com>
Message-Id: <20201228071129.24563-3-zhanghan64@huawei.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: f3d71c6e8d1ce6445c38e2247938903c1f661154
      
https://github.com/qemu/qemu/commit/f3d71c6e8d1ce6445c38e2247938903c1f661154
  Author: Zhang Han <zhanghan64@huawei.com>
  Date:   2021-02-04 (Thu, 04 Feb 2021)

  Changed paths:
    M qobject/qdict.c

  Log Message:
  -----------
  qobject: spaces required around that operators

Add spaces around operators.

Signed-off-by: Zhang Han <zhanghan64@huawei.com>
Message-Id: <20201228071129.24563-4-zhanghan64@huawei.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 1841f0112c4d8a0a561462eed25fc4357fe40afc
      
https://github.com/qemu/qemu/commit/1841f0112c4d8a0a561462eed25fc4357fe40afc
  Author: Zhang Han <zhanghan64@huawei.com>
  Date:   2021-02-04 (Thu, 04 Feb 2021)

  Changed paths:
    M qobject/qdict.c

  Log Message:
  -----------
  qobject: braces {} are necessary for all arms of this statement

Add braces {} for arms of if/for statement

Signed-off-by: Zhang Han <zhanghan64@huawei.com>
Message-Id: <20201228071129.24563-5-zhanghan64@huawei.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 781386afd2b809a8a63b65e9bfb645c4a8abdf50
      
https://github.com/qemu/qemu/commit/781386afd2b809a8a63b65e9bfb645c4a8abdf50
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-02-04 (Thu, 04 Feb 2021)

  Changed paths:
    M docs/interop/qmp-spec.txt

  Log Message:
  -----------
  docs/interop/qmp-spec: Document the request queue limit

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210127144734.2367693-1-armbru@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>


  Commit: 395a95080ad9ccf08b71fa4b7909455ba42f2202
      
https://github.com/qemu/qemu/commit/395a95080ad9ccf08b71fa4b7909455ba42f2202
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-02-04 (Thu, 04 Feb 2021)

  Changed paths:
    M monitor/qmp.c

  Log Message:
  -----------
  qmp: Fix up comments after commit 9ce44e2ce2

Commit 9ce44e2ce2 "qmp: Move dispatcher to a coroutine" replaced
monitor_qmp_bh_dispatcher() by monitor_qmp_dispatcher_co(), but
neglected to update comments.  Do that now.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210201161504.1976989-2-armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>


  Commit: f680405f45afab692bd8021a35d40d037366abf1
      
https://github.com/qemu/qemu/commit/f680405f45afab692bd8021a35d40d037366abf1
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-02-04 (Thu, 04 Feb 2021)

  Changed paths:
    M monitor/qmp.c
    M monitor/trace-events

  Log Message:
  -----------
  qmp: Add more tracepoints

Add tracepoints for in-band request enqueue and dequeue, processing of
queued in-band errors, and responses.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210201161504.1976989-3-armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 88daf0996cd0488e93e67bcb0af258f2c24f117a
      
https://github.com/qemu/qemu/commit/88daf0996cd0488e93e67bcb0af258f2c24f117a
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-02-04 (Thu, 04 Feb 2021)

  Changed paths:
    M monitor/qmp.c

  Log Message:
  -----------
  qmp: Resume OOB-enabled monitor before processing the request

monitor_qmp_dispatcher_co() needs to resume the monitor if
handle_qmp_command() suspended it.  Two cases:

1. OOB enabled: suspended if mon->qmp_requests has no more space

2. OOB disabled: suspended always

We resume only after we processed the request.  Which can take a long
time.

Resume the monitor right when the queue has space to keep the monitor
available for out-of-band commands even in this corner case.

Leave the "OOB disabled" case alone.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210201161504.1976989-4-armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
[Trailing whitespace tidied up]


  Commit: 1ba089f2255bfdb071be3ce6ac6c3069e8012179
      
https://github.com/qemu/qemu/commit/1ba089f2255bfdb071be3ce6ac6c3069e8012179
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-02-04 (Thu, 04 Feb 2021)

  Changed paths:
    M docs/interop/qmp-spec.txt
    M monitor/qmp-cmds.c
    M monitor/qmp.c
    M monitor/trace-events
    M qobject/json-parser.c
    M qobject/qdict.c
    M qobject/qjson.c

  Log Message:
  -----------
  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 <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [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 <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/db754f8ccaf2...1ba089f2255b
reply via email to
[Prev in Thread] Current Thread [Next in Thread]