From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tupel-0003B5-6I for qemu-devel@nongnu.org; Mon, 14 Jan 2013 14:25:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tupeg-0007nS-0f for qemu-devel@nongnu.org; Mon, 14 Jan 2013 14:25:15 -0500 Received: from mail-ie0-f177.google.com ([209.85.223.177]:37729) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tupef-0007nN-TF for qemu-devel@nongnu.org; Mon, 14 Jan 2013 14:25:09 -0500 Received: by mail-ie0-f177.google.com with SMTP id k13so5671313iea.36 for ; Mon, 14 Jan 2013 11:25:09 -0800 (PST) Sender: fluxion From: Michael Roth Date: Mon, 14 Jan 2013 13:20:13 -0600 Message-Id: <1358191213-404-3-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1358191213-404-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1358191213-404-1-git-send-email-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 2/2] dataplane: fix build breakage on set_guest_notifiers() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, stefanha@redhat.com, mst@redhat.com 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 --- hw/dataplane/virtio-blk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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); } -- 1.7.9.5