[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/23] loader: remove calls to cpu_get_physical_page
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 06/23] loader: remove calls to cpu_get_physical_page_desc() |
Date: |
Mon, 19 Dec 2011 16:13:27 +0200 |
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 <address@hidden>
---
hw/loader.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/loader.c b/hw/loader.c
index 9bbcddd..7af5411 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 @@ static void rom_reset(void *unused)
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 @@ int rom_load_all(void)
}
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.mr && memory_region_is_rom(section.mr);
}
qemu_register_reset(rom_reset, NULL);
roms_loaded = 1;
--
1.7.7.1
- [Qemu-devel] [PATCH 00/23] Remove cpu_get_physical_page_desc(), Avi Kivity, 2011/12/19
- [Qemu-devel] [PATCH 06/23] loader: remove calls to cpu_get_physical_page_desc(),
Avi Kivity <=
- [Qemu-devel] [PATCH 05/23] memory: add memory_region_is_rom(), Avi Kivity, 2011/12/19
- [Qemu-devel] [PATCH 09/23] memory: add API for observing updates to the physical memory map, Avi Kivity, 2011/12/19
- [Qemu-devel] [PATCH 04/23] framebuffer: drop use of cpu_get_physical_page_desc(), Avi Kivity, 2011/12/19
- [Qemu-devel] [PATCH 19/23] kvm: avoid cpu_get_physical_page_desc(), Avi Kivity, 2011/12/19
- [Qemu-devel] [PATCH 11/23] kvm: switch kvm slots to use host virtual address instead of ram_addr_t, Avi Kivity, 2011/12/19
- [Qemu-devel] [PATCH 16/23] memory: temporarily add memory_region_get_ram_addr(), Avi Kivity, 2011/12/19
- [Qemu-devel] [PATCH 03/23] memory: add memory_region_is_ram(), Avi Kivity, 2011/12/19
- [Qemu-devel] [PATCH 20/23] vhost: avoid cpu_get_physical_page_desc(), Avi Kivity, 2011/12/19