qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH 1/2] memory: Fix old portio word accesses
@ 2011-09-18 12:44 Jan Kiszka
  2011-09-18 12:51 ` [Qemu-devel] [PATCH v2 " Jan Kiszka
  2011-09-18 14:44 ` [Qemu-devel] [PATCH " Richard Henderson
  0 siblings, 2 replies; 17+ messages in thread
From: Jan Kiszka @ 2011-09-18 12:44 UTC (permalink / raw)
  To: Avi Kivity; +Cc: qemu-devel, Richard Henderson

From: Jan Kiszka <jan.kiszka@siemens.com>

As we register old portio regions via ioport_register, we are also
responsible for providing the word access wrapper.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 memory.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/memory.c b/memory.c
index b3ee232..f712d95 100644
--- a/memory.c
+++ b/memory.c
@@ -397,6 +397,11 @@ static void memory_region_iorange_read(IORange *iorange,
         *data = ((uint64_t)1 << (width * 8)) - 1;
         if (mrp) {
             *data = mrp->read(mr->opaque, offset + mr->offset);
+        } else if (width == 2) {
+            mrp = find_portio(mr, offset, 1, false);
+            assert(mrp);
+            *data = mrp->read(mr->opaque, offset + mr->offset) |
+                    mrp->read(mr->opaque, offset + mr->offset + 1);
         }
         return;
     }
@@ -419,6 +424,11 @@ static void memory_region_iorange_write(IORange *iorange,
 
         if (mrp) {
             mrp->write(mr->opaque, offset + mr->offset, data);
+        } else if (width == 2) {
+            mrp = find_portio(mr, offset, 1, false);
+            assert(mrp);
+            mrp->write(mr->opaque, offset + mr->offset, data & 0xff);
+            mrp->write(mr->opaque, offset + mr->offset + 1, data >> 8);
         }
         return;
     }
-- 
1.7.3.4

^ permalink raw reply related	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2011-09-26 13:30 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-18 12:44 [Qemu-devel] [PATCH 1/2] memory: Fix old portio word accesses Jan Kiszka
2011-09-18 12:51 ` [Qemu-devel] [PATCH v2 " Jan Kiszka
2011-09-18 15:37   ` Avi Kivity
2011-09-18 15:43     ` Jan Kiszka
2011-09-18 15:45       ` Avi Kivity
2011-09-18 16:28         ` Jan Kiszka
2011-09-18 16:49           ` Avi Kivity
2011-09-18 19:07             ` Jan Kiszka
2011-09-19 12:19               ` Avi Kivity
2011-09-19 12:32                 ` Jan Kiszka
2011-09-19 12:42                   ` Avi Kivity
2011-09-19 12:55                     ` Jan Kiszka
2011-09-19 13:09                       ` Avi Kivity
2011-09-19 13:55                       ` Gerd Hoffmann
2011-09-19 13:58                         ` Avi Kivity
2011-09-26 13:30   ` Avi Kivity
2011-09-18 14:44 ` [Qemu-devel] [PATCH " Richard Henderson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).