Commit 98609cd8 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Anthony Liguori
Browse files

ivshmem: fix memory_region_del_eventfd assertion failure

We do not register ioeventfds unless the IVSHMEM_IOEVENTFD feature
is set.  The same feature must be checked before releasing the eventfds.
Regression introduced by commit 563027cc

 (ivshmem: use EventNotifier and
memory API, 2012-07-05).
Reported-by: default avatarCam Macdonnell <cam@cs.ualberta.ca>
Tested-by: default avatarCam Macdonnell <cam@cs.ualberta.ca>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent da5a44e8
......@@ -366,6 +366,10 @@ static void close_guest_eventfds(IVShmemState *s, int posn)
{
int i, guest_curr_max;
if (!ivshmem_has_feature(s, IVSHMEM_IOEVENTFD)) {
return;
}
guest_curr_max = s->peers[posn].nb_eventfds;
memory_region_transaction_begin();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment