From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:48549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rcdyj-0002wT-Iq for qemu-devel@nongnu.org; Mon, 19 Dec 2011 09:14:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rcdyg-0001ti-4m for qemu-devel@nongnu.org; Mon, 19 Dec 2011 09:14:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:7897) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rcdyf-0001t6-Ta for qemu-devel@nongnu.org; Mon, 19 Dec 2011 09:14:06 -0500 From: Avi Kivity Date: Mon, 19 Dec 2011 16:13:27 +0200 Message-Id: <1324304024-11220-7-git-send-email-avi@redhat.com> In-Reply-To: <1324304024-11220-1-git-send-email-avi@redhat.com> References: <1324304024-11220-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH 06/23] loader: remove calls to cpu_get_physical_page_desc() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefano Stabellini , qemu-devel@nongnu.org, "Michael S. Tsirkin" Cc: xen-devel@lists.xensource.com, kvm@vger.kernel.org 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 --- 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 @@ -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