From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39318) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcDOh-0006qS-1Z for qemu-devel@nongnu.org; Wed, 16 Sep 2015 10:09:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZcDOd-0003mf-07 for qemu-devel@nongnu.org; Wed, 16 Sep 2015 10:09:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33821) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcDOc-0003mL-PE for qemu-devel@nongnu.org; Wed, 16 Sep 2015 10:09:14 -0400 Date: Wed, 16 Sep 2015 17:08:50 +0300 From: "Michael S. Tsirkin" Message-ID: <20150916170731-mutt-send-email-mst@redhat.com> References: <1438864852-4939-1-git-send-email-marcandre.lureau@redhat.com> <1438864852-4939-9-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1438864852-4939-9-git-send-email-marcandre.lureau@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3 08/16] vhost-user: send log shm fd along with log_base List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcandre.lureau@redhat.com Cc: haifeng.lin@huawei.com, thibaut.collet@6wind.com, jasowang@redhat.com, qemu-devel@nongnu.org, pbonzini@redhat.com On Thu, Aug 06, 2015 at 02:40:44PM +0200, marcandre.lureau@redhat.com wro= te: > From: Marc-Andr=E9 Lureau >=20 > Send the shm for the dirty pages logging if the backend support supports > VHOST_USER_PROTOCOL_F_LOG_SHMFD. >=20 > Signed-off-by: Marc-Andr=E9 Lureau > --- > hw/virtio/vhost-user.c | 16 ++++++++++++++-- > hw/virtio/vhost.c | 5 +++-- > 2 files changed, 17 insertions(+), 4 deletions(-) >=20 > diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c > index 21ecbcd..b2f46a9 100644 > --- a/hw/virtio/vhost-user.c > +++ b/hw/virtio/vhost-user.c > @@ -26,7 +26,9 @@ > #define VHOST_MEMORY_MAX_NREGIONS 8 > =20 > #define VHOST_USER_F_PROTOCOL_FEATURES 30 > -#define VHOST_USER_PROTOCOL_FEATURE_MASK 0x0ULL > + > +#define VHOST_USER_PROTOCOL_FEATURE_MASK 0x1ULL > +#define VHOST_USER_PROTOCOL_F_LOG_SHMFD 0 > =20 > typedef enum VhostUserRequest { > VHOST_USER_NONE =3D 0, > @@ -215,8 +217,18 @@ static int vhost_user_call(struct vhost_dev *dev, > need_reply =3D 1; > break; > =20 > + case VHOST_USER_SET_LOG_BASE: { > + struct vhost_log *log =3D va_arg(ap, struct vhost_log *); > + > + if (__virtio_has_feature(dev->protocol_features, > + VHOST_USER_PROTOCOL_F_LOG_SHMFD) && > + log->fd !=3D -1) { > + fds[fd_num++] =3D log->fd; > + } > + } > + /* fall through */ > + Don't add {} like that please. Just move declarations to the top level. > case VHOST_USER_SET_FEATURES: > - case VHOST_USER_SET_LOG_BASE: > msg.u64 =3D *((__u64 *) arg); > msg.size =3D sizeof(m.u64); > break; > diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c > index 057d548..ed8b1a5 100644 > --- a/hw/virtio/vhost.c > +++ b/hw/virtio/vhost.c > @@ -359,7 +359,7 @@ static inline void vhost_dev_log_resize(struct vhos= t_dev* dev, uint64_t size) > =20 > /* inform backend of log switching, this must be done before > releasing the current log, to ensure no logging is lost */ > - r =3D dev->vhost_ops->vhost_call(dev, VHOST_SET_LOG_BASE, &log_bas= e); > + r =3D dev->vhost_ops->vhost_call(dev, VHOST_SET_LOG_BASE, &log_bas= e, log); > assert(r >=3D 0); > vhost_log_put(dev, true); > dev->log =3D log; > @@ -1167,7 +1167,8 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtI= ODevice *vdev) > hdev->log =3D vhost_log_get(hdev->log_size, share); > log_base =3D (uintptr_t)hdev->log->log; > r =3D hdev->vhost_ops->vhost_call(hdev, VHOST_SET_LOG_BASE, > - hdev->log_size ? &log_base : N= ULL); > + hdev->log_size ? &log_base : N= ULL, > + hdev->log); > if (r < 0) { > r =3D -errno; > goto fail_log; > --=20 > 2.4.3