[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/7] monitor: fix comment for monitor_lock
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 4/7] monitor: fix comment for monitor_lock |
Date: |
Mon, 18 Jun 2018 16:08:51 +0200 |
From: Peter Xu <address@hidden>
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 <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
monitor.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/monitor.c b/monitor.c
index 5c60bf08cc..fa9c35631f 100644
--- a/monitor.c
+++ b/monitor.c
@@ -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.
--
2.17.1
- [Qemu-devel] [PULL 0/7] monitor: Thread safety improvements, Markus Armbruster, 2018/06/18
- [Qemu-devel] [PULL 3/7] monitor: more comments on lock-free elements, Markus Armbruster, 2018/06/18
- [Qemu-devel] [PULL 1/7] monitor: rename out_lock to mon_lock, Markus Armbruster, 2018/06/18
- [Qemu-devel] [PULL 5/7] monitor: remove event_clock_type, Markus Armbruster, 2018/06/18
- [Qemu-devel] [PULL 7/7] monitor: add lock to protect mon_fdsets, Markus Armbruster, 2018/06/18
- [Qemu-devel] [PULL 4/7] monitor: fix comment for monitor_lock,
Markus Armbruster <=
- [Qemu-devel] [PULL 2/7] monitor: protect mon->fds with mon_lock, Markus Armbruster, 2018/06/18
- [Qemu-devel] [PULL 6/7] monitor: move init global earlier, Markus Armbruster, 2018/06/18
- Re: [Qemu-devel] [PULL 0/7] monitor: Thread safety improvements, Peter Maydell, 2018/06/19