OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Revert "virtio: postpone the execution of event_notifier_cleanup function"

Browse Source 
This reverts commit 4fe6d78b2e as it is
reported to break cleanup and migration.

Cc: Gal Hammer <ghammer@redhat.com>
Cc: Sitong Liu <siliu@redhat.com>
Cc: Xiaoling Gao <xiagao@redhat.com>
Suggested-by: Greg Kurz <groug@kaod.org>
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Reported-by: Jose Ricardo Ziviani <joserz@linux.vnet.ibm.com>
Reported-by: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com>
This commit is contained in:
Michael S. Tsirkin 2018-01-24 19:09:13 +02:00
parent ce3a9eaff4
commit 1ef8185a06
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accel/kvm/kvm-all.c
View File

@ -812,10 +812,6 @@ static void kvm_mem_ioeventfd_del(MemoryListener *listener,
if (r < 0) { if (r < 0) {
abort(); abort();
} }
if (e->cleanup) {
e->cleanup(e);
}
} }
static void kvm_io_ioeventfd_add(MemoryListener *listener, static void kvm_io_ioeventfd_add(MemoryListener *listener,

19
hw/virtio/virtio-bus.c
View File

@ -256,15 +256,6 @@ bool virtio_bus_ioeventfd_enabled(VirtioBusState *bus)
return k->ioeventfd_assign && k->ioeventfd_enabled(proxy); return k->ioeventfd_assign && k->ioeventfd_enabled(proxy);
} }
static void virtio_bus_cleanup_event_notifier(EventNotifier *notifier)
{
/* Test and clear notifier after disabling event,
* in case poll callback didn't have time to run.
*/
virtio_queue_host_notifier_read(notifier);
event_notifier_cleanup(notifier);
}
/* /*
* This function switches ioeventfd on/off in the device. * This function switches ioeventfd on/off in the device.
* The caller must set or clear the handlers for the EventNotifier. * The caller must set or clear the handlers for the EventNotifier.
@ -292,13 +283,19 @@ int virtio_bus_set_host_notifier(VirtioBusState *bus, int n, bool assign)
r = k->ioeventfd_assign(proxy, notifier, n, true); r = k->ioeventfd_assign(proxy, notifier, n, true);
if (r < 0) { if (r < 0) {
error_report("%s: unable to assign ioeventfd: %d", __func__, r); error_report("%s: unable to assign ioeventfd: %d", __func__, r);
virtio_bus_cleanup_event_notifier(notifier); goto cleanup_event_notifier;
} }
return 0;
} else { } else {
notifier->cleanup = virtio_bus_cleanup_event_notifier;
k->ioeventfd_assign(proxy, notifier, n, false); k->ioeventfd_assign(proxy, notifier, n, false);
} }
cleanup_event_notifier:
/* Test and clear notifier after disabling event,
* in case poll callback didn't have time to run.
*/
virtio_queue_host_notifier_read(notifier);
event_notifier_cleanup(notifier);
return r; return r;
} }