| Message ID | 1358191213-404-3-git-send-email-mdroth@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On Mon, Jan 14, 2013 at 01:20:13PM -0600, Michael Roth wrote: > virtio_pci_set_guest_notifiers() now takes an additional argument to > specify the number of virtqueues to assign a guest notifier for. This > causes a build breakage for CONFIG_VIRTIO_BLK_DATA_PLANE builds: > > /home/mdroth/w/qemu2.git/hw/dataplane/virtio-blk.c: In function > ‘virtio_blk_data_plane_start’: > /home/mdroth/w/qemu2.git/hw/dataplane/virtio-blk.c:451:47: error: too > few arguments to function ‘s->vdev->binding->set_guest_notifiers’ > /home/mdroth/w/qemu2.git/hw/dataplane/virtio-blk.c: In function > ‘virtio_blk_data_plane_stop’: > /home/mdroth/w/qemu2.git/hw/dataplane/virtio-blk.c:511:5: error: too few > arguments to function ‘s->vdev->binding->set_guest_notifiers’ > make[1]: *** [hw/dataplane/virtio-blk.o] Error 1 > make[1]: *** Waiting for unfinished jobs.... > make: *** [subdir-x86_64-softmmu] Error 2 > > Fix this by passing 1 as the number of virtqueues to assign notifiers > for. > > Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> > --- > hw/dataplane/virtio-blk.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Thanks for the fix, Mike! Stefan
diff --git a/hw/dataplane/virtio-blk.c b/hw/dataplane/virtio-blk.c index 1f7346e..4b26faa 100644 --- a/hw/dataplane/virtio-blk.c +++ b/hw/dataplane/virtio-blk.c @@ -447,7 +447,7 @@ void virtio_blk_data_plane_start(VirtIOBlockDataPlane *s) event_poll_init(&s->event_poll); /* Set up guest notifier (irq) */ - if (s->vdev->binding->set_guest_notifiers(s->vdev->binding_opaque, + if (s->vdev->binding->set_guest_notifiers(s->vdev->binding_opaque, 1, true) != 0) { fprintf(stderr, "virtio-blk failed to set guest notifier, " "ensure -enable-kvm is set\n"); @@ -508,7 +508,7 @@ void virtio_blk_data_plane_stop(VirtIOBlockDataPlane *s) event_poll_cleanup(&s->event_poll); /* Clean up guest notifier (irq) */ - s->vdev->binding->set_guest_notifiers(s->vdev->binding_opaque, false); + s->vdev->binding->set_guest_notifiers(s->vdev->binding_opaque, 1, false); vring_teardown(&s->vring); }
virtio_pci_set_guest_notifiers() now takes an additional argument to specify the number of virtqueues to assign a guest notifier for. This causes a build breakage for CONFIG_VIRTIO_BLK_DATA_PLANE builds: /home/mdroth/w/qemu2.git/hw/dataplane/virtio-blk.c: In function ‘virtio_blk_data_plane_start’: /home/mdroth/w/qemu2.git/hw/dataplane/virtio-blk.c:451:47: error: too few arguments to function ‘s->vdev->binding->set_guest_notifiers’ /home/mdroth/w/qemu2.git/hw/dataplane/virtio-blk.c: In function ‘virtio_blk_data_plane_stop’: /home/mdroth/w/qemu2.git/hw/dataplane/virtio-blk.c:511:5: error: too few arguments to function ‘s->vdev->binding->set_guest_notifiers’ make[1]: *** [hw/dataplane/virtio-blk.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [subdir-x86_64-softmmu] Error 2 Fix this by passing 1 as the number of virtqueues to assign notifiers for. Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> --- hw/dataplane/virtio-blk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)