[Qemu-devel] [4266] Fix a regression introduced by my previous commit, ram_size is now

[Aurelien Jarno]

Revision: 4266
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4266
Author:   aurel32
Date:     2008-04-27 21:39:40 +0000 (Sun, 27 Apr 2008)

Log Message:
-----------
Fix a regression introduced by my previous commit, ram_size is now
unsigned.

Modified Paths:
--------------
    trunk/hw/boards.h
    trunk/vl.c

Modified: trunk/hw/boards.h
===================================================================
--- trunk/hw/boards.h   2008-04-27 21:12:55 UTC (rev 4265)
+++ trunk/hw/boards.h   2008-04-27 21:39:40 UTC (rev 4266)
@@ -15,7 +15,7 @@
     const char *desc;
     QEMUMachineInitFunc *init;
 #define RAMSIZE_FIXED  (1 << 0)
-    size_t ram_require;
+    ram_addr_t ram_require;
     struct QEMUMachine *next;
 } QEMUMachine;
 

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c  2008-04-27 21:12:55 UTC (rev 4265)
+++ trunk/vl.c  2008-04-27 21:39:40 UTC (rev 4266)
@@ -8277,7 +8277,7 @@
     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 @@
         } 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;