From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60596) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VWnT7-00057N-7O for qemu-devel@nongnu.org; Thu, 17 Oct 2013 09:18:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VWnT2-0005qu-IP for qemu-devel@nongnu.org; Thu, 17 Oct 2013 09:18:25 -0400 Date: Thu, 17 Oct 2013 08:45:42 -0400 From: Luiz Capitulino Message-ID: <20131017084542.148c5a80@redhat.com> In-Reply-To: <1381943828-7948-1-git-send-email-pbonzini@redhat.com> References: <1381943828-7948-1-git-send-email-pbonzini@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1.7] monitor: eliminate monitor_event_state_lock List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org, qemu-stable@nongnu.org On Wed, 16 Oct 2013 19:17:08 +0200 Paolo Bonzini wrote: > This lock does not protect anything that the BQL does not already > protect. Furthermore, with -nodefaults and no monitor, the mutex > is not initialized but monitor_protocol_event_queue is called > anyway, which causes a crash under mingw (and only works by luck. > under Linux or other POSIX OSes). > > Reported-by: Orx Goshen > Cc: Daniel Berrange > Cc: qemu-stable@nongnu.org > Signed-off-by: Paolo Bonzini Applied to the qmp branch, thanks. > --- > Maybe I'm missing something? I don't think so. > > monitor.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/monitor.c b/monitor.c > index 74f3f1b..0ae99dc 100644 > --- a/monitor.c > +++ b/monitor.c > @@ -511,7 +511,6 @@ static const char *monitor_event_names[] = { > QEMU_BUILD_BUG_ON(ARRAY_SIZE(monitor_event_names) != QEVENT_MAX) > > MonitorEventState monitor_event_state[QEVENT_MAX]; > -QemuMutex monitor_event_state_lock; > > /* > * Emits the event to every monitor instance > @@ -543,7 +542,6 @@ monitor_protocol_event_queue(MonitorEvent event, > int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME); > assert(event < QEVENT_MAX); > > - qemu_mutex_lock(&monitor_event_state_lock); > evstate = &(monitor_event_state[event]); > trace_monitor_protocol_event_queue(event, > data, > @@ -576,7 +574,6 @@ monitor_protocol_event_queue(MonitorEvent event, > evstate->last = now; > } > } > - qemu_mutex_unlock(&monitor_event_state_lock); > } > > > @@ -589,7 +586,6 @@ static void monitor_protocol_event_handler(void *opaque) > MonitorEventState *evstate = opaque; > int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME); > > - qemu_mutex_lock(&monitor_event_state_lock); > > trace_monitor_protocol_event_handler(evstate->event, > evstate->data, > @@ -601,7 +597,6 @@ static void monitor_protocol_event_handler(void *opaque) > evstate->data = NULL; > } > evstate->last = now; > - qemu_mutex_unlock(&monitor_event_state_lock); > } > > > @@ -638,7 +633,6 @@ monitor_protocol_event_throttle(MonitorEvent event, > * and initialize state */ > static void monitor_protocol_event_init(void) > { > - qemu_mutex_init(&monitor_event_state_lock); > /* Limit RTC & BALLOON events to 1 per second */ > monitor_protocol_event_throttle(QEVENT_RTC_CHANGE, 1000); > monitor_protocol_event_throttle(QEVENT_BALLOON_CHANGE, 1000);