From 5b97cb136496967e80e7c0e6634d14ee099485f9 Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Wed, 17 Feb 2010 19:11:33 +0200
Subject: [PATCH] --- yaml --- r: 184591 b: refs/heads/master c:
 86e9424d7252bae5ad1c17b4b8088193e6b27cbe h: refs/heads/master i:   184589:
 557a77816eaede9ae238d156b610998e50e318c7   184587:
 6a11aad8f8bfd7b4d7b3805ab40fb025dca464a3   184583:
 4e42d1937195f3197a47f6f89aa006785fbdbd02   184575:
 357d1eadd744ce24890babc1739f9dba8e27cf5a v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/vhost/vhost.c | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c2841ff308fb..66d8aa95b2b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 655ffee284dfcf9a24ac0343f3e5ee6db85b85c5
+refs/heads/master: 86e9424d7252bae5ad1c17b4b8088193e6b27cbe
diff --git a/trunk/drivers/vhost/vhost.c b/trunk/drivers/vhost/vhost.c
index 6eb15259f5ae..db21518f7e8d 100644
--- a/trunk/drivers/vhost/vhost.c
+++ b/trunk/drivers/vhost/vhost.c
@@ -1004,10 +1004,14 @@ int vhost_add_used(struct vhost_virtqueue *vq, unsigned int head, int len)
 	if (unlikely(vq->log_used)) {
 		/* Make sure data is seen before log. */
 		smp_wmb();
-		log_write(vq->log_base, vq->log_addr + sizeof *vq->used->ring *
-			  (vq->last_used_idx % vq->num),
-			  sizeof *vq->used->ring);
-		log_write(vq->log_base, vq->log_addr, sizeof *vq->used->ring);
+		/* Log used ring entry write. */
+		log_write(vq->log_base,
+			  vq->log_addr + ((void *)used - (void *)vq->used),
+			  sizeof *used);
+		/* Log used index update. */
+		log_write(vq->log_base,
+			  vq->log_addr + offsetof(struct vring_used, idx),
+			  sizeof vq->used->idx);
 		if (vq->log_ctx)
 			eventfd_signal(vq->log_ctx, 1);
 	}