Revision 1bfe856e
b/vl.c | ||
---|---|---|
99 | 99 |
#ifdef TARGET_PPC |
100 | 100 |
#define DEFAULT_RAM_SIZE 144 |
101 | 101 |
#else |
102 |
#define DEFAULT_RAM_SIZE 32
|
|
102 |
#define DEFAULT_RAM_SIZE 128
|
|
103 | 103 |
#endif |
104 | 104 |
/* in ms */ |
105 | 105 |
#define GUI_REFRESH_INTERVAL 30 |
... | ... | |
133 | 133 |
int pci_enabled = 1; |
134 | 134 |
int prep_enabled = 0; |
135 | 135 |
int rtc_utc = 1; |
136 |
int cirrus_vga_enabled = 0;
|
|
137 |
int graphic_width = 640;
|
|
138 |
int graphic_height = 480;
|
|
136 |
int cirrus_vga_enabled = 1;
|
|
137 |
int graphic_width = 800;
|
|
138 |
int graphic_height = 600;
|
|
139 | 139 |
int graphic_depth = 15; |
140 | 140 |
|
141 | 141 |
/***********************************************************/ |
... | ... | |
960 | 960 |
|
961 | 961 |
int serial_open_device(void) |
962 | 962 |
{ |
963 |
char slave_name[1024]; |
|
964 |
int master_fd, slave_fd; |
|
965 |
|
|
966 | 963 |
if (serial_console == NULL && nographic) { |
967 | 964 |
/* use console for serial port */ |
968 | 965 |
return 0; |
969 | 966 |
} else { |
970 | 967 |
#if 0 |
968 |
char slave_name[1024]; |
|
969 |
int master_fd, slave_fd; |
|
970 |
|
|
971 | 971 |
/* Not satisfying */ |
972 | 972 |
if (openpty(&master_fd, &slave_fd, slave_name, NULL, NULL) < 0) { |
973 | 973 |
fprintf(stderr, "warning: could not create pseudo terminal for serial port\n"); |
... | ... | |
2115 | 2115 |
#endif |
2116 | 2116 |
#ifdef TARGET_I386 |
2117 | 2117 |
"-isa simulate an ISA-only system (default is PCI system)\n" |
2118 |
"-std-vga simulate a standard VGA card with VESA Bochs Extensions\n" |
|
2119 |
" (default is CL-GD5446 PCI VGA)\n" |
|
2118 | 2120 |
#endif |
2119 | 2121 |
"\n" |
2120 | 2122 |
"During emulation, use C-a h to get terminal commands:\n", |
... | ... | |
2179 | 2181 |
QEMU_OPTION_localtime, |
2180 | 2182 |
QEMU_OPTION_cirrusvga, |
2181 | 2183 |
QEMU_OPTION_g, |
2184 |
QEMU_OPTION_std_vga, |
|
2182 | 2185 |
}; |
2183 | 2186 |
|
2184 | 2187 |
typedef struct QEMUOption { |
... | ... | |
2229 | 2232 |
#endif |
2230 | 2233 |
{ "localtime", 0, QEMU_OPTION_localtime }, |
2231 | 2234 |
{ "isa", 0, QEMU_OPTION_isa }, |
2235 |
{ "std-vga", 0, QEMU_OPTION_std_vga }, |
|
2232 | 2236 |
|
2233 | 2237 |
/* temporary options */ |
2234 | 2238 |
{ "pci", 0, QEMU_OPTION_pci }, |
... | ... | |
2518 | 2522 |
case QEMU_OPTION_cirrusvga: |
2519 | 2523 |
cirrus_vga_enabled = 1; |
2520 | 2524 |
break; |
2525 |
case QEMU_OPTION_std_vga: |
|
2526 |
cirrus_vga_enabled = 0; |
|
2527 |
break; |
|
2521 | 2528 |
case QEMU_OPTION_g: |
2522 | 2529 |
{ |
2523 | 2530 |
const char *p; |
Also available in: Unified diff