From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55287) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VoDXi-0001oO-Hf for qemu-devel@nongnu.org; Wed, 04 Dec 2013 09:35:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VoDXX-0002oE-U9 for qemu-devel@nongnu.org; Wed, 04 Dec 2013 09:35:10 -0500 Received: from e8.ny.us.ibm.com ([32.97.182.138]:44262) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VoDXX-0002nt-PQ for qemu-devel@nongnu.org; Wed, 04 Dec 2013 09:34:59 -0500 Received: from /spool/local by e8.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 4 Dec 2013 09:34:59 -0500 From: Michael Roth Date: Wed, 4 Dec 2013 08:34:20 -0600 Message-Id: <1386167679-13021-14-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1386167679-13021-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1386167679-13021-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 13/32] monitor: eliminate monitor_event_state_lock List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org From: Paolo Bonzini 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 Signed-off-by: Luiz Capitulino (cherry picked from commit c20b7fa4b2fedd979bcb0cc974bb5d08a10e3448) Signed-off-by: Michael Roth --- monitor.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/monitor.c b/monitor.c index 5dc0aa9..99bfcd9 100644 --- a/monitor.c +++ b/monitor.c @@ -508,7 +508,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 @@ -540,7 +539,6 @@ monitor_protocol_event_queue(MonitorEvent event, int64_t now = qemu_get_clock_ns(rt_clock); assert(event < QEVENT_MAX); - qemu_mutex_lock(&monitor_event_state_lock); evstate = &(monitor_event_state[event]); trace_monitor_protocol_event_queue(event, data, @@ -573,7 +571,6 @@ monitor_protocol_event_queue(MonitorEvent event, evstate->last = now; } } - qemu_mutex_unlock(&monitor_event_state_lock); } @@ -586,7 +583,6 @@ static void monitor_protocol_event_handler(void *opaque) MonitorEventState *evstate = opaque; int64_t now = qemu_get_clock_ns(rt_clock); - qemu_mutex_lock(&monitor_event_state_lock); trace_monitor_protocol_event_handler(evstate->event, evstate->data, @@ -598,7 +594,6 @@ static void monitor_protocol_event_handler(void *opaque) evstate->data = NULL; } evstate->last = now; - qemu_mutex_unlock(&monitor_event_state_lock); } @@ -635,7 +630,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); -- 1.7.9.5