proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-06-14 20:08:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

monitor: eliminate monitor_event_state_lock

Browse Source 
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 <orx.goshen@intel.com>
Cc: Daniel Berrange <berrange@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-10-16 19:17:08 +02:00 committed by Luiz Capitulino
parent fc8ead7467
commit c20b7fa4b2
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
monitor.c
View File

@ -511,7 +511,6 @@ static const char *monitor_event_names[] = {
QEMU_BUILD_BUG_ON(ARRAY_SIZE(monitor_event_names) != QEVENT_MAX) QEMU_BUILD_BUG_ON(ARRAY_SIZE(monitor_event_names) != QEVENT_MAX)
MonitorEventState monitor_event_state[QEVENT_MAX]; MonitorEventState monitor_event_state[QEVENT_MAX];
QemuMutex monitor_event_state_lock;
/* /*
* Emits the event to every monitor instance * 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); int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
assert(event < QEVENT_MAX); assert(event < QEVENT_MAX);
qemu_mutex_lock(&monitor_event_state_lock);
evstate = &(monitor_event_state[event]); evstate = &(monitor_event_state[event]);
trace_monitor_protocol_event_queue(event, trace_monitor_protocol_event_queue(event,
data, data,
@ -576,7 +574,6 @@ monitor_protocol_event_queue(MonitorEvent event,
evstate->last = now; 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; MonitorEventState *evstate = opaque;
int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME); int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
qemu_mutex_lock(&monitor_event_state_lock);
trace_monitor_protocol_event_handler(evstate->event, trace_monitor_protocol_event_handler(evstate->event,
evstate->data, evstate->data,
@ -601,7 +597,6 @@ static void monitor_protocol_event_handler(void *opaque)
evstate->data = NULL; evstate->data = NULL;
} }
evstate->last = now; evstate->last = now;
qemu_mutex_unlock(&monitor_event_state_lock);
} }
@ -638,7 +633,6 @@ monitor_protocol_event_throttle(MonitorEvent event,
* and initialize state */ * and initialize state */
static void monitor_protocol_event_init(void) static void monitor_protocol_event_init(void)
{ {
qemu_mutex_init(&monitor_event_state_lock);
/* Limit RTC & BALLOON events to 1 per second */ /* Limit RTC & BALLOON events to 1 per second */
monitor_protocol_event_throttle(QEVENT_RTC_CHANGE, 1000); monitor_protocol_event_throttle(QEVENT_RTC_CHANGE, 1000);
monitor_protocol_event_throttle(QEVENT_BALLOON_CHANGE, 1000); monitor_protocol_event_throttle(QEVENT_BALLOON_CHANGE, 1000);