From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Xu <peterx@redhat.com>
Subject: [Qemu-devel] [PULL 4/7] monitor: fix comment for monitor_lock
Date: Mon, 18 Jun 2018 16:08:51 +0200 [thread overview]
Message-ID: <20180618140854.17824-5-armbru@redhat.com> (raw)
In-Reply-To: <20180618140854.17824-1-armbru@redhat.com>
From: Peter Xu <peterx@redhat.com>
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>
---
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
next prev parent reply other threads:[~2018-06-18 14:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-18 14:08 [Qemu-devel] [PULL 0/7] monitor: Thread safety improvements Markus Armbruster
2018-06-18 14:08 ` [Qemu-devel] [PULL 1/7] monitor: rename out_lock to mon_lock Markus Armbruster
2018-06-18 14:08 ` [Qemu-devel] [PULL 2/7] monitor: protect mon->fds with mon_lock Markus Armbruster
2018-06-18 14:08 ` [Qemu-devel] [PULL 3/7] monitor: more comments on lock-free elements Markus Armbruster
2018-06-18 14:08 ` Markus Armbruster [this message]
2018-06-18 14:08 ` [Qemu-devel] [PULL 5/7] monitor: remove event_clock_type Markus Armbruster
2018-06-18 14:08 ` [Qemu-devel] [PULL 6/7] monitor: move init global earlier Markus Armbruster
2018-09-05 15:05 ` Wolfgang Bumiller
2018-09-06 3:38 ` Peter Xu
2018-06-18 14:08 ` [Qemu-devel] [PULL 7/7] monitor: add lock to protect mon_fdsets Markus Armbruster
2018-06-19 15:04 ` [Qemu-devel] [PULL 0/7] monitor: Thread safety improvements Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180618140854.17824-5-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).