diff options
| author | Peter Xu | 2018-06-08 05:55:08 +0200 |
|---|---|---|
| committer | Markus Armbruster | 2018-06-18 15:45:29 +0200 |
| commit | 095cb1bffc8e785471cf1acf98ae495cbf4599a6 (patch) | |
| tree | 4a387c565872ea3ff97c6f2f29b3d43def83f90c | |
| parent | monitor: more comments on lock-free elements (diff) | |
| download | qemu-095cb1bffc8e785471cf1acf98ae495cbf4599a6.tar.gz qemu-095cb1bffc8e785471cf1acf98ae495cbf4599a6.tar.xz qemu-095cb1bffc8e785471cf1acf98ae495cbf4599a6.zip | |
monitor: fix comment for monitor_lock
Fix typo in d622cb5879c. Meanwhile move these variables close to each
other. monitor_qapi_event_state can be declared static, add that.
Reported-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20180608035511.7439-5-peterx@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
| -rw-r--r-- | monitor.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -266,10 +266,11 @@ typedef struct QMPRequest QMPRequest; /* QMP checker flags */ #define QMP_ACCEPT_UNKNOWNS 1 -/* Protects mon_list, monitor_event_state. */ +/* Protects mon_list, monitor_qapi_event_state. */ static QemuMutex monitor_lock; - +static GHashTable *monitor_qapi_event_state; static QTAILQ_HEAD(mon_list, Monitor) mon_list; + static QLIST_HEAD(mon_fdsets, MonFdset) mon_fdsets; static int mon_refcount; @@ -571,8 +572,6 @@ static MonitorQAPIEventConf monitor_qapi_event_conf[QAPI_EVENT__MAX] = { [QAPI_EVENT_VSERPORT_CHANGE] = { 1000 * SCALE_MS }, }; -GHashTable *monitor_qapi_event_state; - /* * Emits the event to every monitor instance, @event is only used for trace * Called with monitor_lock held. |