proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-14 10:31:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
unsigned.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4266 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aurel32 2008-04-27 21:39:40 +00:00
parent 00f82b8a31
commit 4fc5d07176
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/boards.h
View File

@ -15,7 +15,7 @@ typedef struct QEMUMachine {
const char *desc; const char *desc;
QEMUMachineInitFunc *init; QEMUMachineInitFunc *init;
#define RAMSIZE_FIXED (1 << 0) #define RAMSIZE_FIXED (1 << 0)
size_t ram_require; ram_addr_t ram_require;
struct QEMUMachine *next; struct QEMUMachine *next;
} QEMUMachine; } QEMUMachine;

4
vl.c
View File

@ -8277,7 +8277,7 @@ int main(int argc, char **argv)
machine = first_machine; machine = first_machine;
cpu_model = NULL; cpu_model = NULL;
initrd_filename = NULL; initrd_filename = NULL;
ram_size = -1; ram_size = 0;
vga_ram_size = VGA_RAM_SIZE; vga_ram_size = VGA_RAM_SIZE;
#ifdef CONFIG_GDBSTUB #ifdef CONFIG_GDBSTUB
use_gdbstub = 0; use_gdbstub = 0;
@ -9000,7 +9000,7 @@ int main(int argc, char **argv)
} else } else
ram_size = phys_ram_size; ram_size = phys_ram_size;
} else { } else {
if (ram_size < 0) if (ram_size == 0)
ram_size = DEFAULT_RAM_SIZE * 1024 * 1024; ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
phys_ram_size += ram_size; phys_ram_size += ram_size;