mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
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
This commit is contained in:
parent
00f82b8a31
commit
4fc5d07176
|
@ -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;
|
||||
|
||||
|
|
4
vl.c
4
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;
|
||||
|
|
Loading…
Reference in a new issue