diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index cb121e824e..85b0bc228c 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -538,6 +538,9 @@ static void qemuMonitorUpdateWatch(qemuMonitorPtr mon) VIR_EVENT_HANDLE_HANGUP | VIR_EVENT_HANDLE_ERROR; + if (!mon->watch) + return; + if (mon->lastError.code == VIR_ERR_OK) { events |= VIR_EVENT_HANDLE_READABLE; @@ -563,6 +566,11 @@ qemuMonitorIO(int watch, int fd, int events, void *opaque) { #if DEBUG_IO VIR_DEBUG("Monitor %p I/O on watch %d fd %d events %d", mon, watch, fd, events); #endif + if (mon->fd == -1 || mon->watch == 0) { + qemuMonitorUnlock(mon); + virObjectUnref(mon); + return; + } if (mon->fd != fd || mon->watch != watch) { if (events & (VIR_EVENT_HANDLE_HANGUP | VIR_EVENT_HANDLE_ERROR)) @@ -830,8 +838,10 @@ void qemuMonitorClose(qemuMonitorPtr mon) "mon=%p refs=%d", mon, mon->object.refs); if (mon->fd >= 0) { - if (mon->watch) + if (mon->watch) { virEventRemoveHandle(mon->watch); + mon->watch = 0; + } VIR_FORCE_CLOSE(mon->fd); }