From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=45505 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OHHN8-0003N8-6g for qemu-devel@nongnu.org; Wed, 26 May 2010 10:14:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OHHIz-00047H-O9 for qemu-devel@nongnu.org; Wed, 26 May 2010 10:10:00 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:38260) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OHHIz-00046k-Jt for qemu-devel@nongnu.org; Wed, 26 May 2010 10:09:57 -0400 Received: by mail-wy0-f173.google.com with SMTP id 28so1007524wyf.4 for ; Wed, 26 May 2010 07:09:57 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 26 May 2010 16:09:35 +0200 Message-Id: <1274882978-9875-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1274882978-9875-1-git-send-email-pbonzini@redhat.com> References: <1274882978-9875-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 5/8] add and use event_notifier_set_handler List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- event_notifier.c | 7 +++++++ event_notifier.h | 3 +++ hw/virtio-pci.c | 9 +++------ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/event_notifier.c b/event_notifier.c index 0f7b8da..066adb9 100644 --- a/event_notifier.c +++ b/event_notifier.c @@ -11,6 +11,7 @@ */ #include "event_notifier.h" +#include "qemu-char.h" #ifdef CONFIG_EVENTFD #include #endif @@ -38,6 +39,12 @@ int event_notifier_get_fd(EventNotifier *e) return e->fd; } +int event_notifier_set_handler(EventNotifier *e, + EventNotifierHandler *handler) +{ + return qemu_set_fd_handler(e->fd, (IOHandler *)handler, NULL, e); +} + int event_notifier_set(EventNotifier *e) { uint64_t value = 1; diff --git a/event_notifier.h b/event_notifier.h index 714d690..f6ec9ef 100644 --- a/event_notifier.h +++ b/event_notifier.h @@ -7,10 +7,13 @@ struct EventNotifier { int fd; }; +typedef void EventNotifierHandler(EventNotifier *); + int event_notifier_init(EventNotifier *, int active); void event_notifier_cleanup(EventNotifier *); int event_notifier_get_fd(EventNotifier *); int event_notifier_set(EventNotifier *); int event_notifier_test_and_clear(EventNotifier *); +int event_notifier_set_handler(EventNotifier *, EventNotifierHandler *); #endif diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 988c75c..a7ebc83 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -419,9 +419,8 @@ static unsigned virtio_pci_get_features(void *opaque) return proxy->host_features; } -static void virtio_pci_guest_notifier_read(void *opaque) +static void virtio_pci_guest_notifier_read(EventNotifier *n) { - EventNotifier *n = opaque; VirtQueue *vq = virtqueue_from_guest_notifier(n); if (event_notifier_test_and_clear(n)) { virtio_irq(vq); @@ -439,11 +438,9 @@ static int virtio_pci_set_guest_notifier(void *opaque, int n, bool assign) if (r < 0) { return r; } - qemu_set_fd_handler(event_notifier_get_fd(notifier), - virtio_pci_guest_notifier_read, NULL, notifier); + event_notifier_set_handler(notifier, virtio_pci_guest_notifier_read); } else { - qemu_set_fd_handler(event_notifier_get_fd(notifier), - NULL, NULL, NULL); + event_notifier_set_handler(notifier, NULL); event_notifier_cleanup(notifier); } -- 1.6.6.1