diff options
author | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2004-07-08 21:17:50 +0000 |
---|---|---|
committer | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2004-07-08 21:17:50 +0000 |
commit | 1bfe856eb2c9920e4fb107b1b44037b07b4c118f (patch) | |
tree | 9aab7488e63fbf18c52c0a0aa0f71a34da2e14e1 /vl.c | |
parent | 7e71f16f9abc44423c2eef92addcc8cd49ccd37e (diff) | |
download | hqemu-1bfe856eb2c9920e4fb107b1b44037b07b4c118f.zip hqemu-1bfe856eb2c9920e4fb107b1b44037b07b4c118f.tar.gz |
Cirrus VGA is the default - 128 MB default memory - 800x600 default PPC resolution
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@989 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 21 |
1 files changed, 14 insertions, 7 deletions
@@ -99,7 +99,7 @@ extern void __sigaction(); #ifdef TARGET_PPC #define DEFAULT_RAM_SIZE 144 #else -#define DEFAULT_RAM_SIZE 32 +#define DEFAULT_RAM_SIZE 128 #endif /* in ms */ #define GUI_REFRESH_INTERVAL 30 @@ -133,9 +133,9 @@ int audio_enabled = 0; int pci_enabled = 1; int prep_enabled = 0; int rtc_utc = 1; -int cirrus_vga_enabled = 0; -int graphic_width = 640; -int graphic_height = 480; +int cirrus_vga_enabled = 1; +int graphic_width = 800; +int graphic_height = 600; int graphic_depth = 15; /***********************************************************/ @@ -960,14 +960,14 @@ int serial_open_device(void) int serial_open_device(void) { - char slave_name[1024]; - int master_fd, slave_fd; - if (serial_console == NULL && nographic) { /* use console for serial port */ return 0; } else { #if 0 + char slave_name[1024]; + int master_fd, slave_fd; + /* Not satisfying */ if (openpty(&master_fd, &slave_fd, slave_name, NULL, NULL) < 0) { fprintf(stderr, "warning: could not create pseudo terminal for serial port\n"); @@ -2115,6 +2115,8 @@ void help(void) #endif #ifdef TARGET_I386 "-isa simulate an ISA-only system (default is PCI system)\n" + "-std-vga simulate a standard VGA card with VESA Bochs Extensions\n" + " (default is CL-GD5446 PCI VGA)\n" #endif "\n" "During emulation, use C-a h to get terminal commands:\n", @@ -2179,6 +2181,7 @@ enum { QEMU_OPTION_localtime, QEMU_OPTION_cirrusvga, QEMU_OPTION_g, + QEMU_OPTION_std_vga, }; typedef struct QEMUOption { @@ -2229,6 +2232,7 @@ const QEMUOption qemu_options[] = { #endif { "localtime", 0, QEMU_OPTION_localtime }, { "isa", 0, QEMU_OPTION_isa }, + { "std-vga", 0, QEMU_OPTION_std_vga }, /* temporary options */ { "pci", 0, QEMU_OPTION_pci }, @@ -2518,6 +2522,9 @@ int main(int argc, char **argv) case QEMU_OPTION_cirrusvga: cirrus_vga_enabled = 1; break; + case QEMU_OPTION_std_vga: + cirrus_vga_enabled = 0; + break; case QEMU_OPTION_g: { const char *p; |