diff options
| author | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-02-08 23:09:59 +0000 |
|---|---|---|
| committer | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-02-08 23:09:59 +0000 |
| commit | 970ac5a3082428dca91171f270dcd95d6f4b2636 (patch) | |
| tree | b6f937c67e82ba42fdbb71c58111848086fbf8e0 /vl.c | |
| parent | e9a1ab19d196aa50619fd8b77157bd11a5a8aa01 (diff) | |
| download | qemu-970ac5a3082428dca91171f270dcd95d6f4b2636.zip qemu-970ac5a3082428dca91171f270dcd95d6f4b2636.tar.gz qemu-970ac5a3082428dca91171f270dcd95d6f4b2636.tar.bz2 | |
use ram allocation functions
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2405 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 13 |
1 files changed, 1 insertions, 12 deletions
@@ -125,7 +125,6 @@ BlockDriverState *bs_table[MAX_DISKS + 1], *fd_table[MAX_FD]; /* point to the block driver where the snapshots are managed */ BlockDriverState *bs_snapshots; int vga_ram_size; -int bios_size; static DisplayState display_state; int nographic; const char* keyboard_layout = NULL; @@ -6564,7 +6563,6 @@ int main(int argc, char **argv) hd_filename[i] = NULL; ram_size = DEFAULT_RAM_SIZE * 1024 * 1024; vga_ram_size = VGA_RAM_SIZE; - bios_size = BIOS_SIZE; #ifdef CONFIG_GDBSTUB use_gdbstub = 0; gdbstub_port = DEFAULT_GDBSTUB_PORT; @@ -7078,16 +7076,7 @@ int main(int argc, char **argv) #endif /* init the memory */ - phys_ram_size = ram_size + vga_ram_size + bios_size; - - for (i = 0; i < nb_option_roms; i++) { - int ret = get_image_size(option_rom[i]); - if (ret == -1) { - fprintf(stderr, "Could not load option rom '%s'\n", option_rom[i]); - exit(1); - } - phys_ram_size += ret; - } + phys_ram_size = ram_size + vga_ram_size + MAX_BIOS_SIZE; phys_ram_base = qemu_vmalloc(phys_ram_size); if (!phys_ram_base) { |