ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cpu-common: Have a ram_addr_t of uint64 with Xen. 

In Xen case, memory can be bigger than the host memory. that mean a
32bits host (and QEMU) should be able to handle a RAM address of 64bits.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Anthony PERARD 2011-07-20 08:17:42 +00:00 committed by Alexander Graf
parent 59d21e537b
commit f15fbc4bd1
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cpu-common.h
View File

@ -27,7 +27,15 @@ enum device_endian {
}; };
/* address in the RAM (different from a physical address) */ /* address in the RAM (different from a physical address) */
#if defined(CONFIG_XEN_BACKEND) && TARGET_PHYS_ADDR_BITS == 64
typedef uint64_t ram_addr_t;
# define RAM_ADDR_MAX UINT64_MAX
# define RAM_ADDR_FMT "%" PRIx64
#else
typedef unsigned long ram_addr_t; typedef unsigned long ram_addr_t;
# define RAM_ADDR_MAX ULONG_MAX
# define RAM_ADDR_FMT "%lx"
#endif
/* memory API */ /* memory API */

9
exec.c
View File

@ -2863,13 +2863,13 @@ static void *file_ram_alloc(RAMBlock *block,
static ram_addr_t find_ram_offset(ram_addr_t size) static ram_addr_t find_ram_offset(ram_addr_t size)
{ {
RAMBlock *block, *next_block; RAMBlock *block, *next_block;
ram_addr_t offset = 0, mingap = ULONG_MAX; ram_addr_t offset = 0, mingap = RAM_ADDR_MAX;
if (QLIST_EMPTY(&ram_list.blocks)) if (QLIST_EMPTY(&ram_list.blocks))
return 0; return 0;
QLIST_FOREACH(block, &ram_list.blocks, next) { QLIST_FOREACH(block, &ram_list.blocks, next) {
ram_addr_t end, next = ULONG_MAX; ram_addr_t end, next = RAM_ADDR_MAX;
end = block->offset + block->length; end = block->offset + block->length;
@ -3081,7 +3081,8 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length)
#endif #endif
} }
if (area != vaddr) { if (area != vaddr) {
fprintf(stderr, "Could not remap addr: %lx@%lx\n", fprintf(stderr, "Could not remap addr: "
RAM_ADDR_FMT "@" RAM_ADDR_FMT "\n",
length, addr); length, addr);
exit(1); exit(1);
} }
@ -4052,7 +4053,7 @@ void *cpu_physical_memory_map(target_phys_addr_t addr,
target_phys_addr_t page; target_phys_addr_t page;
unsigned long pd; unsigned long pd;
PhysPageDesc *p; PhysPageDesc *p;
ram_addr_t raddr = ULONG_MAX; ram_addr_t raddr = RAM_ADDR_MAX;
ram_addr_t rlen; ram_addr_t rlen;
void *ret; void *ret;

2
xen-all.c
View File

@ -184,7 +184,7 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size)
} }
if (xc_domain_populate_physmap_exact(xen_xc, xen_domid, nr_pfn, 0, 0, pfn_list)) { if (xc_domain_populate_physmap_exact(xen_xc, xen_domid, nr_pfn, 0, 0, pfn_list)) {
hw_error("xen: failed to populate ram at %lx", ram_addr); hw_error("xen: failed to populate ram at " RAM_ADDR_FMT, ram_addr);
} }
qemu_free(pfn_list); qemu_free(pfn_list);