From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c4V5f-00027R-MD for qemu-devel@nongnu.org; Wed, 09 Nov 2016 10:47:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c4V5c-0005Lm-K5 for qemu-devel@nongnu.org; Wed, 09 Nov 2016 10:47:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58758) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c4V5c-0005LZ-Ca for qemu-devel@nongnu.org; Wed, 09 Nov 2016 10:47:04 -0500 Date: Wed, 9 Nov 2016 17:47:02 +0200 From: "Michael S. Tsirkin" Message-ID: <20161109174645-mutt-send-email-mst@kernel.org> References: <1478697498-29833-1-git-send-email-felipe@nutanix.com> <22f2ee5c-8dc4-c142-f0a9-130fde997c3f@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <22f2ee5c-8dc4-c142-f0a9-130fde997c3f@redhat.com> Subject: Re: [Qemu-devel] [PATCH] vhost: Use vbus var instead of VIRTIO_BUS() macro List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: Felipe Franciosi , Stefan Hajnoczi , "qemu-devel@nongnu.org" On Wed, Nov 09, 2016 at 02:22:42PM +0100, Paolo Bonzini wrote: > > > On 09/11/2016 14:18, Felipe Franciosi wrote: > > Recent changes on vhost_dev_enable/disable_notifiers() produced a > > VirtioBusState vbus variable which can be used instead of the > > VIRTIO_BUS() macro. This commit just makes the code a little bit cleaner > > and more consistent. > > > > Signed-off-by: Felipe Franciosi > > Michael, what do you think? Perhaps it's simplest to just squash the > two patches (v2 of "vhost: Update 'ioeventfd_started' with host > notifiers" and this one). > > Paolo I think I'll apply both but why bother squashing? > > --- > > hw/virtio/vhost.c | 14 ++++++-------- > > 1 file changed, 6 insertions(+), 8 deletions(-) > > > > diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c > > index 1290963..7d29dad 100644 > > --- a/hw/virtio/vhost.c > > +++ b/hw/virtio/vhost.c > > @@ -1198,20 +1198,18 @@ int vhost_dev_enable_notifiers(struct vhost_dev *hdev, VirtIODevice *vdev) > > > > virtio_device_stop_ioeventfd(vdev); > > for (i = 0; i < hdev->nvqs; ++i) { > > - r = virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), hdev->vq_index + i, > > - true); > > + r = virtio_bus_set_host_notifier(vbus, hdev->vq_index + i, true); > > if (r < 0) { > > error_report("vhost VQ %d notifier binding failed: %d", i, -r); > > goto fail_vq; > > } > > } > > - VIRTIO_BUS(qbus)->ioeventfd_started = true; > > + vbus->ioeventfd_started = true; > > > > return 0; > > fail_vq: > > while (--i >= 0) { > > - e = virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), hdev->vq_index + i, > > - false); > > + e = virtio_bus_set_host_notifier(vbus, hdev->vq_index + i, false); > > if (e < 0) { > > error_report("vhost VQ %d notifier cleanup error: %d", i, -r); > > } > > @@ -1230,17 +1228,17 @@ fail: > > void vhost_dev_disable_notifiers(struct vhost_dev *hdev, VirtIODevice *vdev) > > { > > BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev))); > > + VirtioBusState *vbus = VIRTIO_BUS(qbus); > > int i, r; > > > > for (i = 0; i < hdev->nvqs; ++i) { > > - r = virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), hdev->vq_index + i, > > - false); > > + r = virtio_bus_set_host_notifier(vbus, hdev->vq_index + i, false); > > if (r < 0) { > > error_report("vhost VQ %d notifier cleanup failed: %d", i, -r); > > } > > assert (r >= 0); > > } > > - VIRTIO_BUS(qbus)->ioeventfd_started = false; > > + vbus->ioeventfd_started = false; > > virtio_device_start_ioeventfd(vdev); > > } > > > >