gwj / at91sam9263 · Commits

Commit 4fc5d0717682386fa7b28fff031f840fb7c8f489

Authored by aurel32
1 parent 00f82b8a

Fix a regression introduced by my previous commit, ram_size is now 

unsigned.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4266 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
hw/boards.h
  View file @4fc5d07
@@ -15,7 +15,7 @@ typedef struct QEMUMachine { @@ -15,7 +15,7 @@ typedef struct QEMUMachine {
15 const char *desc; 15 const char *desc;
16 QEMUMachineInitFunc *init; 16 QEMUMachineInitFunc *init;
17 #define RAMSIZE_FIXED (1 << 0) 17 #define RAMSIZE_FIXED (1 << 0)
18 - size_t ram_require; 18 + ram_addr_t ram_require;
19 struct QEMUMachine *next; 19 struct QEMUMachine *next;
20 } QEMUMachine; 20 } QEMUMachine;
21 21
@@ -8277,7 +8277,7 @@ int main(int argc, char **argv) @@ -8277,7 +8277,7 @@ int main(int argc, char **argv)
8277 machine = first_machine; 8277 machine = first_machine;
8278 cpu_model = NULL; 8278 cpu_model = NULL;
8279 initrd_filename = NULL; 8279 initrd_filename = NULL;
8280 - ram_size = -1; 8280 + ram_size = 0;
8281 vga_ram_size = VGA_RAM_SIZE; 8281 vga_ram_size = VGA_RAM_SIZE;
8282 #ifdef CONFIG_GDBSTUB 8282 #ifdef CONFIG_GDBSTUB
8283 use_gdbstub = 0; 8283 use_gdbstub = 0;
@@ -9000,7 +9000,7 @@ int main(int argc, char **argv) @@ -9000,7 +9000,7 @@ int main(int argc, char **argv)
9000 } else 9000 } else
9001 ram_size = phys_ram_size; 9001 ram_size = phys_ram_size;
9002 } else { 9002 } else {
9003 - if (ram_size < 0) 9003 + if (ram_size == 0)
9004 ram_size = DEFAULT_RAM_SIZE * 1024 * 1024; 9004 ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
9005 9005
9006 phys_ram_size += ram_size; 9006 phys_ram_size += ram_size;