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

diff --git a/hw/boards.h b/hw/boards.h
index 7fb2df50f429c1a2d030b02670fed38f7ce8aec2..659c5590c56045b82adbbfdc3f404570f5a24b38 100644 (file)
--- 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 2b6e459b22eeb24ef8c8a7bb6dae4dd8454a3787..c30a87faa760edeec57fe724fa623b10bbfc629f 100644 (file)
--- 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;