aboutsummaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2004-05-23 21:06:12 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2004-05-23 21:06:12 +0000
commit0ced6589701ec3716f7df86dbaf29db154a6a0d7 (patch)
treed41d563f71c13b81b02994ebd93e9e99430fd07f /vl.c
parentb415a4078d8ddae8338a8ba65206777331022a54 (diff)
downloadqemu-0ced6589701ec3716f7df86dbaf29db154a6a0d7.zip
qemu-0ced6589701ec3716f7df86dbaf29db154a6a0d7.tar.gz
qemu-0ced6589701ec3716f7df86dbaf29db154a6a0d7.tar.bz2
PowerPC merge
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@857 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/vl.c b/vl.c
index 13aa9df..85c6623 100644
--- a/vl.c
+++ b/vl.c
@@ -110,11 +110,12 @@ IOPortReadFunc *ioport_read_table[3][MAX_IOPORTS];
IOPortWriteFunc *ioport_write_table[3][MAX_IOPORTS];
BlockDriverState *bs_table[MAX_DISKS], *fd_table[MAX_FD];
int vga_ram_size;
+int bios_size;
static DisplayState display_state;
int nographic;
int64_t ticks_per_sec;
int boot_device = 'c';
-static int ram_size;
+int ram_size;
static char network_script[1024];
int pit_min_timer_count = 0;
int nb_nics;
@@ -2095,6 +2096,7 @@ 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;
pstrcpy(network_script, sizeof(network_script), DEFAULT_NETWORK_SCRIPT);
#ifdef CONFIG_GDBSTUB
use_gdbstub = 0;
@@ -2393,7 +2395,7 @@ int main(int argc, char **argv)
}
/* init the memory */
- phys_ram_size = ram_size + vga_ram_size;
+ phys_ram_size = ram_size + vga_ram_size + bios_size;
#ifdef CONFIG_SOFTMMU
#ifdef _BSD