|
 |
cbdfe66 |
From ac48d782f3b91b2e9962ded5f8a55bd3929a82a5 Mon Sep 17 00:00:00 2001
|
|
|
cbdfe66 |
From: Michael S. Tsirkin <mst@redhat.com>
|
|
|
cbdfe66 |
Date: Wed, 24 Feb 2010 21:09:54 +0200
|
|
|
cbdfe66 |
Subject: [PATCH] vhost: used addr migration fix
|
|
|
cbdfe66 |
|
|
|
cbdfe66 |
Enable used buffer logging when migration starts.
|
|
|
cbdfe66 |
Fixed 'id XX is not a head' message after migration.
|
|
|
cbdfe66 |
|
|
|
cbdfe66 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
cbdfe66 |
---
|
|
|
cbdfe66 |
hw/vhost.c | 29 +++++++++++++++++++++++++++--
|
|
|
cbdfe66 |
1 files changed, 27 insertions(+), 2 deletions(-)
|
|
|
cbdfe66 |
|
|
|
cbdfe66 |
diff --git a/hw/vhost.c b/hw/vhost.c
|
|
|
cbdfe66 |
index 54386e1..48034ba 100644
|
|
|
cbdfe66 |
--- a/hw/vhost.c
|
|
|
cbdfe66 |
+++ b/hw/vhost.c
|
|
|
cbdfe66 |
@@ -325,7 +325,7 @@ static int vhost_virtqueue_set_addr(struct vhost_dev *dev,
|
|
|
cbdfe66 |
return 0;
|
|
|
cbdfe66 |
}
|
|
|
cbdfe66 |
|
|
|
cbdfe66 |
-static int vhost_dev_set_log(struct vhost_dev *dev, bool enable_log)
|
|
|
cbdfe66 |
+static int vhost_dev_set_features(struct vhost_dev *dev, bool enable_log)
|
|
|
cbdfe66 |
{
|
|
|
cbdfe66 |
uint64_t features = dev->acked_features;
|
|
|
cbdfe66 |
int r;
|
|
|
cbdfe66 |
@@ -336,6 +336,31 @@ static int vhost_dev_set_log(struct vhost_dev *dev, bool enable_log)
|
|
|
cbdfe66 |
return r < 0 ? -errno : 0;
|
|
|
cbdfe66 |
}
|
|
|
cbdfe66 |
|
|
|
cbdfe66 |
+static int vhost_dev_set_log(struct vhost_dev *dev, bool enable_log)
|
|
|
cbdfe66 |
+{
|
|
|
cbdfe66 |
+ int r, t, i;
|
|
|
cbdfe66 |
+ r = vhost_dev_set_features(dev, enable_log);
|
|
|
cbdfe66 |
+ if (r < 0)
|
|
|
cbdfe66 |
+ goto err_features;
|
|
|
cbdfe66 |
+ for (i = 0; i < dev->nvqs; ++i) {
|
|
|
cbdfe66 |
+ r = vhost_virtqueue_set_addr(dev, dev->vqs + i, i,
|
|
|
cbdfe66 |
+ enable_log);
|
|
|
cbdfe66 |
+ if (r < 0)
|
|
|
cbdfe66 |
+ goto err_vq;
|
|
|
cbdfe66 |
+ }
|
|
|
cbdfe66 |
+ return 0;
|
|
|
cbdfe66 |
+err_vq:
|
|
|
cbdfe66 |
+ for (; i >= 0; --i) {
|
|
|
cbdfe66 |
+ t = vhost_virtqueue_set_addr(dev, dev->vqs + i, i,
|
|
|
cbdfe66 |
+ dev->log_enabled);
|
|
|
cbdfe66 |
+ assert(t >= 0);
|
|
|
cbdfe66 |
+ }
|
|
|
cbdfe66 |
+ t = vhost_dev_set_features(dev, dev->log_enabled);
|
|
|
cbdfe66 |
+ assert(t >= 0);
|
|
|
cbdfe66 |
+err_features:
|
|
|
cbdfe66 |
+ return r;
|
|
|
cbdfe66 |
+}
|
|
|
cbdfe66 |
+
|
|
|
cbdfe66 |
static int vhost_client_migration_log(struct CPUPhysMemoryClient *client,
|
|
|
cbdfe66 |
int enable)
|
|
|
cbdfe66 |
{
|
|
|
cbdfe66 |
@@ -544,7 +569,7 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev)
|
|
|
cbdfe66 |
{
|
|
|
cbdfe66 |
int i, r;
|
|
|
cbdfe66 |
|
|
|
cbdfe66 |
- r = vhost_dev_set_log(hdev, hdev->log_enabled);
|
|
|
cbdfe66 |
+ r = vhost_dev_set_features(hdev, hdev->log_enabled);
|
|
|
cbdfe66 |
if (r < 0)
|
|
|
cbdfe66 |
goto fail;
|
|
|
cbdfe66 |
r = ioctl(hdev->control, VHOST_SET_MEM_TABLE, hdev->mem);
|
|
|
cbdfe66 |
--
|
|
|
cbdfe66 |
1.6.6.1
|
|
|
cbdfe66 |
|