[Xen-changelog] [xen-unstable] ioemu: ioemu portion of buffered-io fix.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1193934860 0
# Node ID 7cd040290f82e66f36685294cff8ca18f64079d9
# Parent  338f3c34e65605d9beb96176ef1a71c1262dbf14
ioemu: ioemu portion of buffered-io fix.
Signed-off-by: Robert Phillips <rphillips@xxxxxxxxxxxxxxx>
Signed-off-by: Ben Guthro <bguthro@xxxxxxxxxxxxxxx>
---
 tools/ioemu/target-i386-dm/helper2.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff -r 338f3c34e656 -r 7cd040290f82 tools/ioemu/target-i386-dm/helper2.c
--- a/tools/ioemu/target-i386-dm/helper2.c      Thu Nov 01 16:16:25 2007 +0000
+++ b/tools/ioemu/target-i386-dm/helper2.c      Thu Nov 01 16:34:20 2007 +0000
@@ -553,20 +553,17 @@ void __handle_buffered_iopage(CPUState *
                                       IOREQ_BUFFER_SLOT_NUM];
         req.size = 1UL << buf_req->size;
         req.count = 1;
+        req.addr = buf_req->addr;
         req.data = buf_req->data;
         req.state = STATE_IOREQ_READY;
         req.dir  = buf_req->dir;
         req.type = buf_req->type;
         qw = req.size == 8;
         if (qw) {
-            req.data |= ((uint64_t)buf_req->addr) << 16;
             buf_req = 
&buffered_io_page->buf_ioreq[(buffered_io_page->read_pointer+1) %
                                                IOREQ_BUFFER_SLOT_NUM];
             req.data |= ((uint64_t)buf_req->data) << 32;
-            req.data |= ((uint64_t)buf_req->addr) << 48;
-        }
-        else
-            req.addr = buf_req->addr;
+        }
 
         __handle_ioreq(env, &req);
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog