[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/38] vhost: add vhost_set_log_base op
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 16/38] vhost: add vhost_set_log_base op |
Date: |
Wed, 21 Oct 2015 13:27:24 +0300 |
From: Marc-André Lureau <address@hidden>
Split VHOST_SET_LOG_BASE call in a seperate function callback, so that
type safety works and more arguments can be added in the next patches.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Tested-by: Thibaut Collet <address@hidden>
---
include/hw/virtio/vhost-backend.h | 3 +++
hw/virtio/vhost-backend.c | 6 ++++++
hw/virtio/vhost-user.c | 16 +++++++++++++++-
hw/virtio/vhost.c | 6 +++---
4 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/include/hw/virtio/vhost-backend.h
b/include/hw/virtio/vhost-backend.h
index 7d4a8ad..c903573 100644
--- a/include/hw/virtio/vhost-backend.h
+++ b/include/hw/virtio/vhost-backend.h
@@ -28,6 +28,8 @@ typedef int (*vhost_backend_get_vq_index)(struct vhost_dev
*dev, int idx);
typedef int (*vhost_backend_set_vring_enable)(struct vhost_dev *dev, int
enable);
typedef int (*vhost_backend_memslots_limit)(struct vhost_dev *dev);
+typedef int (*vhost_set_log_base_op)(struct vhost_dev *dev, uint64_t base);
+
typedef struct VhostOps {
VhostBackendType backend_type;
vhost_call vhost_call;
@@ -36,6 +38,7 @@ typedef struct VhostOps {
vhost_backend_get_vq_index vhost_backend_get_vq_index;
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;
} VhostOps;
extern const VhostOps user_ops;
diff --git a/hw/virtio/vhost-backend.c b/hw/virtio/vhost-backend.c
index 910d8e0..5846c37 100644
--- a/hw/virtio/vhost-backend.c
+++ b/hw/virtio/vhost-backend.c
@@ -67,6 +67,11 @@ static int vhost_kernel_memslots_limit(struct vhost_dev *dev)
return limit;
}
+static int vhost_set_log_base(struct vhost_dev *dev, uint64_t base)
+{
+ return vhost_kernel_call(dev, VHOST_SET_LOG_BASE, &base);
+}
+
static const VhostOps kernel_ops = {
.backend_type = VHOST_BACKEND_TYPE_KERNEL,
.vhost_call = vhost_kernel_call,
@@ -74,6 +79,7 @@ static const VhostOps kernel_ops = {
.vhost_backend_cleanup = vhost_kernel_cleanup,
.vhost_backend_get_vq_index = vhost_kernel_get_vq_index,
.vhost_backend_memslots_limit = vhost_kernel_memslots_limit,
+ .vhost_set_log_base = vhost_set_log_base,
};
int vhost_set_backend_type(struct vhost_dev *dev, VhostBackendType
backend_type)
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 9585637..5d51289 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -242,7 +242,6 @@ static int vhost_user_call(struct vhost_dev *dev, unsigned
long int request,
break;
case VHOST_USER_SET_FEATURES:
- case VHOST_USER_SET_LOG_BASE:
case VHOST_USER_SET_PROTOCOL_FEATURES:
msg.u64 = *((__u64 *) arg);
msg.size = sizeof(m.u64);
@@ -367,6 +366,20 @@ static int vhost_user_call(struct vhost_dev *dev, unsigned
long int request,
return 0;
}
+static int vhost_set_log_base(struct vhost_dev *dev, uint64_t base)
+{
+ VhostUserMsg msg = {
+ .request = VHOST_USER_SET_LOG_BASE,
+ .flags = VHOST_USER_VERSION,
+ .u64 = base,
+ .size = sizeof(m.u64),
+ };
+
+ vhost_user_write(dev, &msg, NULL, 0);
+
+ return 0;
+}
+
static int vhost_user_init(struct vhost_dev *dev, void *opaque)
{
unsigned long long features;
@@ -453,4 +466,5 @@ const VhostOps user_ops = {
.vhost_backend_get_vq_index = vhost_user_get_vq_index,
.vhost_backend_set_vring_enable = vhost_user_set_vring_enable,
.vhost_backend_memslots_limit = vhost_user_memslots_limit,
+ .vhost_set_log_base = vhost_set_log_base,
};
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index f5ecaf0..f2b31b7 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -352,7 +352,7 @@ static inline void vhost_dev_log_resize(struct vhost_dev*
dev, uint64_t size)
/* inform backend of log switching, this must be done before
releasing the current log, to ensure no logging is lost */
- r = dev->vhost_ops->vhost_call(dev, VHOST_SET_LOG_BASE, &log_base);
+ r = dev->vhost_ops->vhost_set_log_base(dev, log_base);
assert(r >= 0);
vhost_log_put(dev, true);
dev->log = log;
@@ -1167,8 +1167,8 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice
*vdev)
hdev->log_size = vhost_get_log_size(hdev);
hdev->log = vhost_log_get(hdev->log_size);
log_base = (uintptr_t)hdev->log->log;
- r = hdev->vhost_ops->vhost_call(hdev, VHOST_SET_LOG_BASE,
- hdev->log_size ? &log_base : NULL);
+ r = hdev->vhost_ops->vhost_set_log_base(hdev,
+ hdev->log_size ? log_base : 0);
if (r < 0) {
r = -errno;
goto fail_log;
--
MST
- [Qemu-devel] [PULL 06/38] pc-dimm: add vhost slots limit check before commiting to hotplug, (continued)
- [Qemu-devel] [PULL 06/38] pc-dimm: add vhost slots limit check before commiting to hotplug, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 07/38] vhost: fail backend intialization early, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 05/38] vhost: add vhost_has_free_slot() interface, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 08/38] virtio: add some migration doc, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 09/38] configure: probe for memfd, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 11/38] build-sys: split util-obj- on multi-lines, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 12/38] util: add linux-only memfd fallback, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 13/38] util: add memfd helpers, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 14/38] util: add fallback for qemu_memfd_alloc(), Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 15/38] vhost: document log resizing, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 16/38] vhost: add vhost_set_log_base op,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 10/38] linux-headers: add unistd.h, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 17/38] vhost-user: add vhost_user_requires_shm_log(), Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 18/38] vhost: alloc shareable log, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 19/38] vhost-user: send log shm fd along with log_base, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 20/38] vhost-user: add a migration blocker, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 22/38] vhost-user: document migration log, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 21/38] vhost: use a function for each call, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 23/38] net: add trace_vhost_user_event, Michael S. Tsirkin, 2015/10/21