ia64/xen-unstable

changeset 16302:7cd040290f82

ioemu: ioemu portion of buffered-io fix.
Signed-off-by: Robert Phillips <rphillips@virtualiron.com>
Signed-off-by: Ben Guthro <bguthro@virtualiron.com>
author Keir Fraser <keir@xensource.com>
date Thu Nov 01 16:34:20 2007 +0000 (2007-11-01)
parents 338f3c34e656
children 2462265f09ae
files tools/ioemu/target-i386-dm/helper2.c
line diff
     1.1 --- a/tools/ioemu/target-i386-dm/helper2.c	Thu Nov 01 16:16:25 2007 +0000
     1.2 +++ b/tools/ioemu/target-i386-dm/helper2.c	Thu Nov 01 16:34:20 2007 +0000
     1.3 @@ -553,20 +553,17 @@ void __handle_buffered_iopage(CPUState *
     1.4  				       IOREQ_BUFFER_SLOT_NUM];
     1.5          req.size = 1UL << buf_req->size;
     1.6          req.count = 1;
     1.7 +        req.addr = buf_req->addr;
     1.8          req.data = buf_req->data;
     1.9          req.state = STATE_IOREQ_READY;
    1.10          req.dir  = buf_req->dir;
    1.11          req.type = buf_req->type;
    1.12          qw = req.size == 8;
    1.13          if (qw) {
    1.14 -            req.data |= ((uint64_t)buf_req->addr) << 16;
    1.15              buf_req = &buffered_io_page->buf_ioreq[(buffered_io_page->read_pointer+1) %
    1.16                                                 IOREQ_BUFFER_SLOT_NUM];
    1.17              req.data |= ((uint64_t)buf_req->data) << 32;
    1.18 -            req.data |= ((uint64_t)buf_req->addr) << 48;
    1.19          }
    1.20 -        else
    1.21 -            req.addr = buf_req->addr;
    1.22  
    1.23          __handle_ioreq(env, &req);
    1.24