From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Fri, 15 Feb 2008 17:13:41 +0000 (+0000)
Subject: Make phys_ram_size a target_phys_addr_t
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a01f70e3ede040957aa88a77d6a340da43977078;p=qemu-xen-3.4-testing.git

Make phys_ram_size a target_phys_addr_t
---

diff --git a/cpu-all.h b/cpu-all.h
index 2a2b1970..9a03bc4f 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -807,7 +807,7 @@ int cpu_inl(CPUState *env, int addr);
 
 /* memory API */
 
-extern int phys_ram_size;
+extern target_phys_addr_t phys_ram_size;
 extern int phys_ram_fd;
 extern uint8_t *phys_ram_base;
 extern uint8_t *phys_ram_dirty;
@@ -835,7 +835,7 @@ void cpu_register_physical_memory(target_phys_addr_t start_addr,
                                   unsigned long size,
                                   unsigned long phys_offset);
 uint32_t cpu_get_physical_page_desc(target_phys_addr_t addr);
-ram_addr_t qemu_ram_alloc(unsigned int size);
+ram_addr_t qemu_ram_alloc(ram_addr_t size);
 void qemu_ram_free(ram_addr_t addr);
 int cpu_register_io_memory(int io_index,
                            CPUReadMemoryFunc **mem_read,
diff --git a/exec.c b/exec.c
index b74d9092..6cab752d 100644
--- a/exec.c
+++ b/exec.c
@@ -87,7 +87,7 @@ spinlock_t tb_lock = SPIN_LOCK_UNLOCKED;
 uint8_t code_gen_buffer[CODE_GEN_BUFFER_SIZE] __attribute__((aligned (32)));
 uint8_t *code_gen_ptr;
 
-int phys_ram_size;
+target_phys_addr_t phys_ram_size;
 int phys_ram_fd;
 uint8_t *phys_ram_base;
 uint8_t *phys_ram_dirty;
@@ -2086,12 +2086,12 @@ uint32_t cpu_get_physical_page_desc(target_phys_addr_t addr)
 }
 
 /* XXX: better than nothing */
-ram_addr_t qemu_ram_alloc(unsigned int size)
+ram_addr_t qemu_ram_alloc(ram_addr_t size)
 {
     ram_addr_t addr;
     if ((phys_ram_alloc_offset + size) >= phys_ram_size) {
-        fprintf(stderr, "Not enough memory (requested_size = %u, max memory = %d)\n",
-                size, phys_ram_size);
+        fprintf(stderr, "Not enough memory (requested_size = %u, max memory = %llu)\n",
+                size, (unsigned long long)phys_ram_size);
         abort();
     }
     addr = phys_ram_alloc_offset;