Message ID | 1456771254-17511-13-git-send-email-armbru@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Mon, Feb 29, 2016 at 7:40 PM, Markus Armbruster <armbru@redhat.com> wrote: > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > hw/misc/ivshmem.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c > index b087dc3..7119a07 100644 > --- a/hw/misc/ivshmem.c > +++ b/hw/misc/ivshmem.c > @@ -267,11 +267,6 @@ static int ivshmem_can_receive(void * opaque) > return sizeof(int64_t); > } > > -static void ivshmem_event(void *opaque, int event) > -{ > - IVSHMEM_DPRINTF("ivshmem_event %d\n", event); > -} > - > static void ivshmem_vector_notify(void *opaque) > { > MSIVector *entry = opaque; > @@ -719,7 +714,7 @@ static void ivshmem_check_version(void *opaque, const uint8_t * buf, int size) > > IVSHMEM_DPRINTF("version check ok, switch to real chardev handler\n"); > qemu_chr_add_handlers(s->server_chr, ivshmem_can_receive, ivshmem_read, > - ivshmem_event, s); > + NULL, s); > } > > /* Select the MSI-X vectors used by device. > @@ -941,7 +936,7 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error **errp) > pci_register_bar(dev, 2, attr, &s->bar); > > qemu_chr_add_handlers(s->server_chr, ivshmem_can_receive, > - ivshmem_check_version, ivshmem_event, s); > + ivshmem_check_version, NULL, s); > } else { > /* just map the file immediately, we're not using a server */ > int fd; > -- > 2.4.3 > >
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index b087dc3..7119a07 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -267,11 +267,6 @@ static int ivshmem_can_receive(void * opaque) return sizeof(int64_t); } -static void ivshmem_event(void *opaque, int event) -{ - IVSHMEM_DPRINTF("ivshmem_event %d\n", event); -} - static void ivshmem_vector_notify(void *opaque) { MSIVector *entry = opaque; @@ -719,7 +714,7 @@ static void ivshmem_check_version(void *opaque, const uint8_t * buf, int size) IVSHMEM_DPRINTF("version check ok, switch to real chardev handler\n"); qemu_chr_add_handlers(s->server_chr, ivshmem_can_receive, ivshmem_read, - ivshmem_event, s); + NULL, s); } /* Select the MSI-X vectors used by device. @@ -941,7 +936,7 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error **errp) pci_register_bar(dev, 2, attr, &s->bar); qemu_chr_add_handlers(s->server_chr, ivshmem_can_receive, - ivshmem_check_version, ivshmem_event, s); + ivshmem_check_version, NULL, s); } else { /* just map the file immediately, we're not using a server */ int fd;
Signed-off-by: Markus Armbruster <armbru@redhat.com> --- hw/misc/ivshmem.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)