commit 6bf9fd43cfc10022670d1135711d6952d98bcb02
author Avi Kivity <avi@redhat.com> Mon Sep 26 14:52:26 2011 +0300
committer Avi Kivity <avi@redhat.com> Tue Oct 11 15:57:07 2011 +0200
tree 77f495b976f71e42980e5f16995e7a0db7f86437
parent ebf47c24b01857d8b49a892b853bdd13b8e3eb5e

Introduce PortioList

Add a type and methods for manipulating a list of disjoint I/O ports,
used in some older hardware devices.

Based on original patch by Richard Henderson.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>

memory.c

diff --git a/memory.c b/memory.c
index f46e626..27abd3e 100644
--- a/memory.c
+++ b/memory.c
@@ -403,12 +403,12 @@
 
         *data = ((uint64_t)1 << (width * 8)) - 1;
         if (mrp) {
-            *data = mrp->read(mr->opaque, offset);
+            *data = mrp->read(mr->opaque, offset + mr->offset);
         }
         return;
     }
     *data = 0;
-    access_with_adjusted_size(offset, data, width,
+    access_with_adjusted_size(offset + mr->offset, data, width,
                               mr->ops->impl.min_access_size,
                               mr->ops->impl.max_access_size,
                               memory_region_read_accessor, mr);
@@ -425,11 +425,11 @@
         const MemoryRegionPortio *mrp = find_portio(mr, offset, width, true);
 
         if (mrp) {
-            mrp->write(mr->opaque, offset, data);
+            mrp->write(mr->opaque, offset + mr->offset, data);
         }
         return;
     }
-    access_with_adjusted_size(offset, &data, width,
+    access_with_adjusted_size(offset + mr->offset, &data, width,
                               mr->ops->impl.min_access_size,
                               mr->ops->impl.max_access_size,
                               memory_region_write_accessor, mr);