mirror of https://gitee.com/openkylin/qemu.git
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
This commit is contained in:
parent
7e71f16f9a
commit
1bfe856eb2
21
vl.c
21
vl.c
|
@ -99,7 +99,7 @@ extern void __sigaction();
|
||||||
#ifdef TARGET_PPC
|
#ifdef TARGET_PPC
|
||||||
#define DEFAULT_RAM_SIZE 144
|
#define DEFAULT_RAM_SIZE 144
|
||||||
#else
|
#else
|
||||||
#define DEFAULT_RAM_SIZE 32
|
#define DEFAULT_RAM_SIZE 128
|
||||||
#endif
|
#endif
|
||||||
/* in ms */
|
/* in ms */
|
||||||
#define GUI_REFRESH_INTERVAL 30
|
#define GUI_REFRESH_INTERVAL 30
|
||||||
|
@ -133,9 +133,9 @@ int audio_enabled = 0;
|
||||||
int pci_enabled = 1;
|
int pci_enabled = 1;
|
||||||
int prep_enabled = 0;
|
int prep_enabled = 0;
|
||||||
int rtc_utc = 1;
|
int rtc_utc = 1;
|
||||||
int cirrus_vga_enabled = 0;
|
int cirrus_vga_enabled = 1;
|
||||||
int graphic_width = 640;
|
int graphic_width = 800;
|
||||||
int graphic_height = 480;
|
int graphic_height = 600;
|
||||||
int graphic_depth = 15;
|
int graphic_depth = 15;
|
||||||
|
|
||||||
/***********************************************************/
|
/***********************************************************/
|
||||||
|
@ -960,14 +960,14 @@ int serial_open_device(void)
|
||||||
|
|
||||||
int serial_open_device(void)
|
int serial_open_device(void)
|
||||||
{
|
{
|
||||||
char slave_name[1024];
|
|
||||||
int master_fd, slave_fd;
|
|
||||||
|
|
||||||
if (serial_console == NULL && nographic) {
|
if (serial_console == NULL && nographic) {
|
||||||
/* use console for serial port */
|
/* use console for serial port */
|
||||||
return 0;
|
return 0;
|
||||||
} else {
|
} else {
|
||||||
#if 0
|
#if 0
|
||||||
|
char slave_name[1024];
|
||||||
|
int master_fd, slave_fd;
|
||||||
|
|
||||||
/* Not satisfying */
|
/* Not satisfying */
|
||||||
if (openpty(&master_fd, &slave_fd, slave_name, NULL, NULL) < 0) {
|
if (openpty(&master_fd, &slave_fd, slave_name, NULL, NULL) < 0) {
|
||||||
fprintf(stderr, "warning: could not create pseudo terminal for serial port\n");
|
fprintf(stderr, "warning: could not create pseudo terminal for serial port\n");
|
||||||
|
@ -2115,6 +2115,8 @@ void help(void)
|
||||||
#endif
|
#endif
|
||||||
#ifdef TARGET_I386
|
#ifdef TARGET_I386
|
||||||
"-isa simulate an ISA-only system (default is PCI system)\n"
|
"-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
|
#endif
|
||||||
"\n"
|
"\n"
|
||||||
"During emulation, use C-a h to get terminal commands:\n",
|
"During emulation, use C-a h to get terminal commands:\n",
|
||||||
|
@ -2179,6 +2181,7 @@ enum {
|
||||||
QEMU_OPTION_localtime,
|
QEMU_OPTION_localtime,
|
||||||
QEMU_OPTION_cirrusvga,
|
QEMU_OPTION_cirrusvga,
|
||||||
QEMU_OPTION_g,
|
QEMU_OPTION_g,
|
||||||
|
QEMU_OPTION_std_vga,
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct QEMUOption {
|
typedef struct QEMUOption {
|
||||||
|
@ -2229,6 +2232,7 @@ const QEMUOption qemu_options[] = {
|
||||||
#endif
|
#endif
|
||||||
{ "localtime", 0, QEMU_OPTION_localtime },
|
{ "localtime", 0, QEMU_OPTION_localtime },
|
||||||
{ "isa", 0, QEMU_OPTION_isa },
|
{ "isa", 0, QEMU_OPTION_isa },
|
||||||
|
{ "std-vga", 0, QEMU_OPTION_std_vga },
|
||||||
|
|
||||||
/* temporary options */
|
/* temporary options */
|
||||||
{ "pci", 0, QEMU_OPTION_pci },
|
{ "pci", 0, QEMU_OPTION_pci },
|
||||||
|
@ -2518,6 +2522,9 @@ int main(int argc, char **argv)
|
||||||
case QEMU_OPTION_cirrusvga:
|
case QEMU_OPTION_cirrusvga:
|
||||||
cirrus_vga_enabled = 1;
|
cirrus_vga_enabled = 1;
|
||||||
break;
|
break;
|
||||||
|
case QEMU_OPTION_std_vga:
|
||||||
|
cirrus_vga_enabled = 0;
|
||||||
|
break;
|
||||||
case QEMU_OPTION_g:
|
case QEMU_OPTION_g:
|
||||||
{
|
{
|
||||||
const char *p;
|
const char *p;
|
||||||
|
|
Loading…
Reference in New Issue