qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Xu <peterx@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Eric Blake" <eblake@redhat.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
	peterx@redhat.com
Subject: [Qemu-devel] [PATCH v10 4/7] monitor: fix comment for monitor_lock
Date: Fri,  8 Jun 2018 11:55:08 +0800	[thread overview]
Message-ID: <20180608035511.7439-5-peterx@redhat.com> (raw)
In-Reply-To: <20180608035511.7439-1-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>
---
 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

  parent reply	other threads:[~2018-06-08  3:55 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-08  3:55 [Qemu-devel] [PATCH v10 0/7] monitor: let Monitor be thread safe Peter Xu
2018-06-08  3:55 ` [Qemu-devel] [PATCH v10 1/7] monitor: rename out_lock to mon_lock Peter Xu
2018-06-08  3:55 ` [Qemu-devel] [PATCH v10 2/7] monitor: protect mon->fds with mon_lock Peter Xu
2018-06-08  3:55 ` [Qemu-devel] [PATCH v10 3/7] monitor: more comments on lock-free elements Peter Xu
2018-06-08  3:55 ` Peter Xu [this message]
2018-06-08  3:55 ` [Qemu-devel] [PATCH v10 5/7] monitor: remove event_clock_type Peter Xu
2018-06-08  5:38   ` Markus Armbruster
2018-06-08  6:24     ` Peter Xu
2018-06-08  7:09       ` Markus Armbruster
2018-06-11  2:42         ` Peter Xu
2018-06-08 13:31   ` Stefan Hajnoczi
2018-06-08  3:55 ` [Qemu-devel] [PATCH v10 6/7] monitor: move init global earlier Peter Xu
2018-06-08  3:55 ` [Qemu-devel] [PATCH v10 7/7] monitor: add lock to protect mon_fdsets Peter Xu

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=20180608035511.7439-5-peterx@redhat.com \
    --to=peterx@redhat.com \
    --cc=armbru@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=eblake@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /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).