From: Michael S. Tsirkin <mst@redhat.com>
Date: Wed, 16 Mar 2011 10:09:09 +0000 (+0200)
Subject: vhost: fix dirty page handling
X-Git-Tag: v0.14.1~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fc5c4a7a63d80af7f4862e4965dd4ffcaedbf69a;p=users%2Fdwmw2%2Fqemu.git

vhost: fix dirty page handling

vhost was passing a physical address to cpu_physical_memory_set_dirty,
which is wrong: we need to translate to ram address first.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

Note: this lead to crashes during migration, so the patch
is needed on the stable branch too.
---

diff --git a/hw/vhost.c b/hw/vhost.c
index 38cc3b365b..6c194f0f81 100644
--- a/hw/vhost.c
+++ b/hw/vhost.c
@@ -47,8 +47,10 @@ static void vhost_dev_sync_region(struct vhost_dev *dev,
         log = __sync_fetch_and_and(from, 0);
         while ((bit = sizeof(log) > sizeof(int) ?
                 ffsll(log) : ffs(log))) {
+            ram_addr_t ram_addr;
             bit -= 1;
-            cpu_physical_memory_set_dirty(addr + bit * VHOST_LOG_PAGE);
+            ram_addr = cpu_get_physical_page_desc(addr + bit * VHOST_LOG_PAGE);
+            cpu_physical_memory_set_dirty(ram_addr);
             log &= ~(0x1ull << bit);
         }
         addr += VHOST_LOG_CHUNK;