From 316f6c66e9026f7a95e2ebbf9253e5dd87aacc00 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Mon, 29 Nov 2010 10:19:07 +0200 Subject: [PATCH] --- yaml --- r: 225157 b: refs/heads/master c: 3bf9be40ff76b6df136f14a497167c116b2b3c53 h: refs/heads/master i: 225155: a1c5feb1bd13034712b95e31bb7967cc53d604f3 v: v3 --- [refs] | 2 +- trunk/drivers/vhost/vhost.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 245ce7d868bb..b6f38ddfce88 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a290aec88a9c4747353ea7aa9b2569bd61297c3c +refs/heads/master: 3bf9be40ff76b6df136f14a497167c116b2b3c53 diff --git a/trunk/drivers/vhost/vhost.c b/trunk/drivers/vhost/vhost.c index 916cdbc279e0..4c256d15c249 100644 --- a/trunk/drivers/vhost/vhost.c +++ b/trunk/drivers/vhost/vhost.c @@ -885,6 +885,7 @@ static int log_write(void __user *log_base, int r; if (!write_length) return 0; + write_length += write_address % VHOST_PAGE_SIZE; write_address /= VHOST_PAGE_SIZE; for (;;) { u64 base = (u64)(unsigned long)log_base; @@ -898,7 +899,7 @@ static int log_write(void __user *log_base, if (write_length <= VHOST_PAGE_SIZE) break; write_length -= VHOST_PAGE_SIZE; - write_address += VHOST_PAGE_SIZE; + write_address += 1; } return r; }