mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

event-notifier: Add "is_external" parameter

Browse Source 
All callers pass "false" keeping the old semantics. The windows
implementation doesn't distinguish the flag yet. On posix, it is passed
down to the underlying aio context.

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Fam Zheng 2016-04-22 21:53:53 +08:00 committed by Kevin Wolf
parent bcd82a968f
commit 54e18d35e4
7 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/usb/ccid-card-emulated.c
View File

@ -407,7 +407,7 @@ static int init_event_notifier(EmulatedState *card)
DPRINTF(card, 2, "event notifier creation failed\n"); DPRINTF(card, 2, "event notifier creation failed\n");
return -1; return -1;
} }
event_notifier_set_handler(&card->notifier, card_event_handler); event_notifier_set_handler(&card->notifier, false, card_event_handler);
return 0; return 0;
} }

8
hw/virtio/virtio.c
View File

@ -1775,10 +1775,10 @@ void virtio_queue_set_guest_notifier_fd_handler(VirtQueue *vq, bool assign,
bool with_irqfd) bool with_irqfd)
{ {
if (assign && !with_irqfd) { if (assign && !with_irqfd) {
event_notifier_set_handler(&vq->guest_notifier, event_notifier_set_handler(&vq->guest_notifier, false,
virtio_queue_guest_notifier_read); virtio_queue_guest_notifier_read);
} else { } else {
event_notifier_set_handler(&vq->guest_notifier, NULL); event_notifier_set_handler(&vq->guest_notifier, false, NULL);
} }
if (!assign) { if (!assign) {
/* Test and clear notifier before closing it, /* Test and clear notifier before closing it,
@ -1829,10 +1829,10 @@ void virtio_queue_set_host_notifier_fd_handler(VirtQueue *vq, bool assign,
bool set_handler) bool set_handler)
{ {
if (assign && set_handler) { if (assign && set_handler) {
event_notifier_set_handler(&vq->host_notifier, event_notifier_set_handler(&vq->host_notifier, false,
virtio_queue_host_notifier_read); virtio_queue_host_notifier_read);
} else { } else {
event_notifier_set_handler(&vq->host_notifier, NULL); event_notifier_set_handler(&vq->host_notifier, false, NULL);
} }
if (!assign) { if (!assign) {
/* Test and clear notifier before after disabling event, /* Test and clear notifier before after disabling event,

4
include/qemu/event_notifier.h
View File

@ -34,7 +34,9 @@ int event_notifier_init(EventNotifier *, int active);
void event_notifier_cleanup(EventNotifier *); void event_notifier_cleanup(EventNotifier *);
int event_notifier_set(EventNotifier *); int event_notifier_set(EventNotifier *);
int event_notifier_test_and_clear(EventNotifier *); int event_notifier_test_and_clear(EventNotifier *);
int event_notifier_set_handler(EventNotifier *, EventNotifierHandler *); int event_notifier_set_handler(EventNotifier *,
bool is_external,
EventNotifierHandler *);
#ifdef CONFIG_POSIX #ifdef CONFIG_POSIX
void event_notifier_init_fd(EventNotifier *, int fd); void event_notifier_init_fd(EventNotifier *, int fd);

10
stubs/set-fd-handler.c
View File

@ -9,3 +9,13 @@ void qemu_set_fd_handler(int fd,
{ {
abort(); abort();
} }
void aio_set_fd_handler(AioContext *ctx,
int fd,
bool is_external,
IOHandler *io_read,
IOHandler *io_write,
void *opaque)
{
abort();
}

6
target-i386/hyperv.c
View File

@ -88,7 +88,7 @@ HvSintRoute *kvm_hv_sint_route_create(uint32_t vcpu_id, uint32_t sint,
goto err_sint_set_notifier; goto err_sint_set_notifier;
} }
event_notifier_set_handler(&sint_route->sint_ack_notifier, event_notifier_set_handler(&sint_route->sint_ack_notifier, false,
kvm_hv_sint_ack_handler); kvm_hv_sint_ack_handler);
gsi = kvm_irqchip_add_hv_sint_route(kvm_state, vcpu_id, sint); gsi = kvm_irqchip_add_hv_sint_route(kvm_state, vcpu_id, sint);
@ -112,7 +112,7 @@ HvSintRoute *kvm_hv_sint_route_create(uint32_t vcpu_id, uint32_t sint,
err_irqfd: err_irqfd:
kvm_irqchip_release_virq(kvm_state, gsi); kvm_irqchip_release_virq(kvm_state, gsi);
err_gsi: err_gsi:
event_notifier_set_handler(&sint_route->sint_ack_notifier, NULL); event_notifier_set_handler(&sint_route->sint_ack_notifier, false, NULL);
event_notifier_cleanup(&sint_route->sint_ack_notifier); event_notifier_cleanup(&sint_route->sint_ack_notifier);
err_sint_set_notifier: err_sint_set_notifier:
event_notifier_cleanup(&sint_route->sint_set_notifier); event_notifier_cleanup(&sint_route->sint_set_notifier);
@ -128,7 +128,7 @@ void kvm_hv_sint_route_destroy(HvSintRoute *sint_route)
&sint_route->sint_set_notifier, &sint_route->sint_set_notifier,
sint_route->gsi); sint_route->gsi);
kvm_irqchip_release_virq(kvm_state, sint_route->gsi); kvm_irqchip_release_virq(kvm_state, sint_route->gsi);
event_notifier_set_handler(&sint_route->sint_ack_notifier, NULL); event_notifier_set_handler(&sint_route->sint_ack_notifier, false, NULL);
event_notifier_cleanup(&sint_route->sint_ack_notifier); event_notifier_cleanup(&sint_route->sint_ack_notifier);
event_notifier_cleanup(&sint_route->sint_set_notifier); event_notifier_cleanup(&sint_route->sint_set_notifier);
g_free(sint_route); g_free(sint_route);

4
util/event_notifier-posix.c
View File

@ -91,9 +91,11 @@ int event_notifier_get_fd(const EventNotifier *e)
} }
int event_notifier_set_handler(EventNotifier *e, int event_notifier_set_handler(EventNotifier *e,
bool is_external,
EventNotifierHandler *handler) EventNotifierHandler *handler)
{ {
qemu_set_fd_handler(e->rfd, (IOHandler *)handler, NULL, e); aio_set_fd_handler(iohandler_get_aio_context(), e->rfd, is_external,
(IOHandler *)handler, NULL, e);
return 0; return 0;
} }

1
util/event_notifier-win32.c
View File

@ -33,6 +33,7 @@ HANDLE event_notifier_get_handle(EventNotifier *e)
} }
int event_notifier_set_handler(EventNotifier *e, int event_notifier_set_handler(EventNotifier *e,
bool is_external,
EventNotifierHandler *handler) EventNotifierHandler *handler)
{ {
if (handler) { if (handler) {