diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/physmem.c | 5 | ||||
| -rw-r--r-- | system/runstate.c | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/system/physmem.c b/system/physmem.c index 342b7a8fd4..b7847db1a2 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -2229,8 +2229,9 @@ static void *qemu_ram_ptr_length(RAMBlock *block, ram_addr_t addr, * because we don't want to map the entire memory in QEMU. * In that case just map the requested area. */ - if (block->offset == 0) { - return xen_map_cache(block->mr, addr, len, lock, lock, + if (xen_mr_is_memory(block->mr)) { + return xen_map_cache(block->mr, block->offset + addr, + len, lock, lock, is_write); } diff --git a/system/runstate.c b/system/runstate.c index cb4905a40f..ec32e270cb 100644 --- a/system/runstate.c +++ b/system/runstate.c @@ -45,7 +45,6 @@ #include "qemu/job.h" #include "qemu/log.h" #include "qemu/module.h" -#include "qemu/plugin.h" #include "qemu/sockets.h" #include "qemu/timer.h" #include "qemu/thread.h" |