From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZoqcJ-0005Ld-IA for qemu-devel@nongnu.org; Wed, 21 Oct 2015 06:27:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZoqcF-0006GS-Hn for qemu-devel@nongnu.org; Wed, 21 Oct 2015 06:27:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57821) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZoqcF-0006GN-7x for qemu-devel@nongnu.org; Wed, 21 Oct 2015 06:27:31 -0400 Date: Wed, 21 Oct 2015 13:27:27 +0300 From: "Michael S. Tsirkin" Message-ID: <1445423133-5119-18-git-send-email-mst@redhat.com> References: <1445423133-5119-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1445423133-5119-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 17/38] vhost-user: add vhost_user_requires_shm_log() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Thibaut Collet , =?us-ascii?B?PT9VVEYtOD9xP01hcmMtQW5kcj1DMz1BOT0yMEx1cmVhdT89?= From: Marc-Andr=E9 Lureau Check if the backend has VHOST_USER_PROTOCOL_F_LOG_SHMFD feature and require a shared log. Signed-off-by: Marc-Andr=E9 Lureau Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Tested-by: Thibaut Collet --- include/hw/virtio/vhost-backend.h | 4 ++++ hw/virtio/vhost-user.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-= backend.h index c903573..c33570a 100644 --- a/include/hw/virtio/vhost-backend.h +++ b/include/hw/virtio/vhost-backend.h @@ -11,6 +11,8 @@ #ifndef VHOST_BACKEND_H_ #define VHOST_BACKEND_H_ =20 +#include + typedef enum VhostBackendType { VHOST_BACKEND_TYPE_NONE =3D 0, VHOST_BACKEND_TYPE_KERNEL =3D 1, @@ -29,6 +31,7 @@ typedef int (*vhost_backend_set_vring_enable)(struct vh= ost_dev *dev, int enable) typedef int (*vhost_backend_memslots_limit)(struct vhost_dev *dev); =20 typedef int (*vhost_set_log_base_op)(struct vhost_dev *dev, uint64_t bas= e); +typedef bool (*vhost_requires_shm_log_op)(struct vhost_dev *dev); =20 typedef struct VhostOps { VhostBackendType backend_type; @@ -39,6 +42,7 @@ typedef struct VhostOps { vhost_backend_set_vring_enable vhost_backend_set_vring_enable; vhost_backend_memslots_limit vhost_backend_memslots_limit; vhost_set_log_base_op vhost_set_log_base; + vhost_requires_shm_log_op vhost_requires_shm_log; } VhostOps; =20 extern const VhostOps user_ops; diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 5d51289..e10ce87 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -25,9 +25,10 @@ =20 #define VHOST_MEMORY_MAX_NREGIONS 8 #define VHOST_USER_F_PROTOCOL_FEATURES 30 -#define VHOST_USER_PROTOCOL_FEATURE_MASK 0x1ULL =20 -#define VHOST_USER_PROTOCOL_F_MQ 0 +#define VHOST_USER_PROTOCOL_FEATURE_MASK 0x3ULL +#define VHOST_USER_PROTOCOL_F_MQ 0 +#define VHOST_USER_PROTOCOL_F_LOG_SHMFD 1 =20 typedef enum VhostUserRequest { VHOST_USER_NONE =3D 0, @@ -458,6 +459,14 @@ static int vhost_user_memslots_limit(struct vhost_de= v *dev) return VHOST_MEMORY_MAX_NREGIONS; } =20 +static bool vhost_user_requires_shm_log(struct vhost_dev *dev) +{ + assert(dev->vhost_ops->backend_type =3D=3D VHOST_BACKEND_TYPE_USER); + + return virtio_has_feature(dev->protocol_features, + VHOST_USER_PROTOCOL_F_LOG_SHMFD); +} + const VhostOps user_ops =3D { .backend_type =3D VHOST_BACKEND_TYPE_USER, .vhost_call =3D vhost_user_call, @@ -467,4 +476,5 @@ const VhostOps user_ops =3D { .vhost_backend_set_vring_enable =3D vhost_user_set_vring_enable, .vhost_backend_memslots_limit =3D vhost_user_memslots_limit, .vhost_set_log_base =3D vhost_set_log_base, + .vhost_requires_shm_log =3D vhost_user_requires_shm_log, }; --=20 MST