From 4fc5d0717682386fa7b28fff031f840fb7c8f489 Mon Sep 17 00:00:00 2001 From: aurel32 Date: Sun, 27 Apr 2008 21:39:40 +0000 Subject: [PATCH] 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 --- hw/boards.h | 2 +- vl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/boards.h b/hw/boards.h index 7fb2df50f..659c5590c 100644 --- a/hw/boards.h +++ b/hw/boards.h @@ -15,7 +15,7 @@ typedef struct QEMUMachine { const char *desc; QEMUMachineInitFunc *init; #define RAMSIZE_FIXED (1 << 0) - size_t ram_require; + ram_addr_t ram_require; struct QEMUMachine *next; } QEMUMachine; diff --git a/vl.c b/vl.c index 2b6e459b2..c30a87faa 100644 --- a/vl.c +++ b/vl.c @@ -8277,7 +8277,7 @@ int main(int argc, char **argv) machine = first_machine; cpu_model = NULL; initrd_filename = NULL; - ram_size = -1; + ram_size = 0; vga_ram_size = VGA_RAM_SIZE; #ifdef CONFIG_GDBSTUB use_gdbstub = 0; @@ -9000,7 +9000,7 @@ int main(int argc, char **argv) } else ram_size = phys_ram_size; } else { - if (ram_size < 0) + if (ram_size == 0) ram_size = DEFAULT_RAM_SIZE * 1024 * 1024; phys_ram_size += ram_size;