commit dcc5cd33d27ab5612e0212b5399ad6ac0bc4886e
author Avi Kivity <avi@redhat.com> Thu Dec 08 16:12:18 2011 +0200
committer Avi Kivity <avi@redhat.com> Tue Dec 20 14:14:07 2011 +0200
tree f8335020266b70a44e75165142f674f6efb9e230
parent 75c9d6c2f88f5713345b545beec10f0444ebd551

loader: remove calls to cpu_get_physical_page_desc()

cpu_get_physical_page_desc() is tied into the memory core's
innards, replace it with uses of the API.

Signed-off-by: Avi Kivity <avi@redhat.com>

hw/loader.c

diff --git a/hw/loader.c b/hw/loader.c
index 9bbcddd..446b628 100644
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -49,6 +49,8 @@
 #include "uboot_image.h"
 #include "loader.h"
 #include "fw_cfg.h"
+#include "memory.h"
+#include "exec-memory.h"
 
 #include <zlib.h>
 
@@ -674,7 +676,7 @@
 int rom_load_all(void)
 {
     target_phys_addr_t addr = 0;
-    int memtype;
+    MemoryRegionSection section;
     Rom *rom;
 
     QTAILQ_FOREACH(rom, &roms, next) {
@@ -690,9 +692,8 @@
         }
         addr  = rom->addr;
         addr += rom->romsize;
-        memtype = cpu_get_physical_page_desc(rom->addr) & (3 << IO_MEM_SHIFT);
-        if (memtype == IO_MEM_ROM)
-            rom->isrom = 1;
+        section = memory_region_find(get_system_memory(), rom->addr, 1);
+        rom->isrom = section.size && memory_region_is_rom(section.mr);
     }
     qemu_register_reset(rom_reset, NULL);
     roms_loaded = 1;