Revision 3dbbdc25
| b/hw/pc.c | ||
|---|---|---|
| 410 | 410 |
static void pc_init1(int ram_size, int vga_ram_size, int boot_device, |
| 411 | 411 |
DisplayState *ds, const char **fd_filename, int snapshot, |
| 412 | 412 |
const char *kernel_filename, const char *kernel_cmdline, |
| 413 |
const char *initrd_filename) |
|
| 413 |
const char *initrd_filename, |
|
| 414 |
int pci_enabled) |
|
| 414 | 415 |
{
|
| 415 | 416 |
char buf[1024]; |
| 416 | 417 |
int ret, linux_boot, initrd_size, i, nb_nics1; |
| ... | ... | |
| 637 | 638 |
} |
| 638 | 639 |
} |
| 639 | 640 |
|
| 641 |
static void pc_init_pci(int ram_size, int vga_ram_size, int boot_device, |
|
| 642 |
DisplayState *ds, const char **fd_filename, |
|
| 643 |
int snapshot, |
|
| 644 |
const char *kernel_filename, |
|
| 645 |
const char *kernel_cmdline, |
|
| 646 |
const char *initrd_filename) |
|
| 647 |
{
|
|
| 648 |
pc_init1(ram_size, vga_ram_size, boot_device, |
|
| 649 |
ds, fd_filename, snapshot, |
|
| 650 |
kernel_filename, kernel_cmdline, |
|
| 651 |
initrd_filename, 1); |
|
| 652 |
} |
|
| 653 |
|
|
| 654 |
static void pc_init_isa(int ram_size, int vga_ram_size, int boot_device, |
|
| 655 |
DisplayState *ds, const char **fd_filename, |
|
| 656 |
int snapshot, |
|
| 657 |
const char *kernel_filename, |
|
| 658 |
const char *kernel_cmdline, |
|
| 659 |
const char *initrd_filename) |
|
| 660 |
{
|
|
| 661 |
pc_init1(ram_size, vga_ram_size, boot_device, |
|
| 662 |
ds, fd_filename, snapshot, |
|
| 663 |
kernel_filename, kernel_cmdline, |
|
| 664 |
initrd_filename, 0); |
|
| 665 |
} |
|
| 666 |
|
|
| 640 | 667 |
QEMUMachine pc_machine = {
|
| 641 | 668 |
"pc", |
| 642 | 669 |
"Standard PC", |
| 643 |
pc_init1, |
|
| 670 |
pc_init_pci, |
|
| 671 |
}; |
|
| 672 |
|
|
| 673 |
QEMUMachine isapc_machine = {
|
|
| 674 |
"isapc", |
|
| 675 |
"ISA-only PC", |
|
| 676 |
pc_init_isa, |
|
| 644 | 677 |
}; |
| b/qemu-doc.texi | ||
|---|---|---|
| 138 | 138 |
|
| 139 | 139 |
General options: |
| 140 | 140 |
@table @option |
| 141 |
@item -M machine |
|
| 142 |
Select the emulated machine (@code{-M ?} for list)
|
|
| 143 |
|
|
| 141 | 144 |
@item -fda file |
| 142 | 145 |
@item -fdb file |
| 143 | 146 |
Use @var{file} as floppy disk 0/1 image (@xref{disk_images}). You can
|
| ... | ... | |
| 390 | 393 |
all thoses parameters. This option is useful for old MS-DOS disk |
| 391 | 394 |
images. |
| 392 | 395 |
|
| 393 |
@item -isa |
|
| 394 |
Simulate an ISA-only system (default is PCI system). |
|
| 395 | 396 |
@item -std-vga |
| 396 | 397 |
Simulate a standard VGA card with Bochs VBE extensions (default is |
| 397 | 398 |
Cirrus Logic GD5446 PCI VGA) |
| ... | ... | |
| 1137 | 1138 |
|
| 1138 | 1139 |
@table @option |
| 1139 | 1140 |
|
| 1140 |
@item -prep |
|
| 1141 |
Simulate a PREP system (default is PowerMAC) |
|
| 1142 |
|
|
| 1143 | 1141 |
@item -g WxH[xDEPTH] |
| 1144 | 1142 |
|
| 1145 | 1143 |
Set the initial VGA graphic mode. The default is 800x600x15. |
| b/vl.c | ||
|---|---|---|
| 134 | 134 |
int gus_enabled = 0; |
| 135 | 135 |
int es1370_enabled = 0; |
| 136 | 136 |
#endif |
| 137 |
int pci_enabled = 1; |
|
| 138 |
int prep_enabled = 0; |
|
| 139 | 137 |
int rtc_utc = 1; |
| 140 | 138 |
int cirrus_vga_enabled = 1; |
| 141 | 139 |
#ifdef TARGET_SPARC |
| ... | ... | |
| 3087 | 3085 |
QEMU_OPTION_hdachs, |
| 3088 | 3086 |
QEMU_OPTION_L, |
| 3089 | 3087 |
QEMU_OPTION_no_code_copy, |
| 3090 |
QEMU_OPTION_pci, |
|
| 3091 |
QEMU_OPTION_isa, |
|
| 3092 |
QEMU_OPTION_prep, |
|
| 3093 | 3088 |
QEMU_OPTION_k, |
| 3094 | 3089 |
QEMU_OPTION_localtime, |
| 3095 | 3090 |
QEMU_OPTION_cirrusvga, |
| ... | ... | |
| 3163 | 3158 |
#ifdef USE_KQEMU |
| 3164 | 3159 |
{ "no-kqemu", 0, QEMU_OPTION_no_kqemu },
|
| 3165 | 3160 |
#endif |
| 3166 |
#ifdef TARGET_PPC |
|
| 3167 |
{ "prep", 0, QEMU_OPTION_prep },
|
|
| 3168 |
#endif |
|
| 3169 | 3161 |
#if defined(TARGET_PPC) || defined(TARGET_SPARC) |
| 3170 | 3162 |
{ "g", 1, QEMU_OPTION_g },
|
| 3171 | 3163 |
#endif |
| 3172 | 3164 |
{ "localtime", 0, QEMU_OPTION_localtime },
|
| 3173 |
{ "isa", 0, QEMU_OPTION_isa },
|
|
| 3174 | 3165 |
{ "std-vga", 0, QEMU_OPTION_std_vga },
|
| 3175 | 3166 |
{ "monitor", 1, QEMU_OPTION_monitor },
|
| 3176 | 3167 |
{ "serial", 1, QEMU_OPTION_serial },
|
| ... | ... | |
| 3183 | 3174 |
|
| 3184 | 3175 |
/* temporary options */ |
| 3185 | 3176 |
{ "usb", 0, QEMU_OPTION_usb },
|
| 3186 |
{ "pci", 0, QEMU_OPTION_pci },
|
|
| 3187 | 3177 |
{ "cirrusvga", 0, QEMU_OPTION_cirrusvga },
|
| 3188 | 3178 |
{ NULL },
|
| 3189 | 3179 |
}; |
| ... | ... | |
| 3239 | 3229 |
{
|
| 3240 | 3230 |
#if defined(TARGET_I386) |
| 3241 | 3231 |
qemu_register_machine(&pc_machine); |
| 3232 |
qemu_register_machine(&isapc_machine); |
|
| 3242 | 3233 |
#elif defined(TARGET_PPC) |
| 3243 | 3234 |
qemu_register_machine(&heathrow_machine); |
| 3244 | 3235 |
qemu_register_machine(&core99_machine); |
| ... | ... | |
| 3676 | 3667 |
case QEMU_OPTION_S: |
| 3677 | 3668 |
start_emulation = 0; |
| 3678 | 3669 |
break; |
| 3679 |
case QEMU_OPTION_pci: |
|
| 3680 |
pci_enabled = 1; |
|
| 3681 |
break; |
|
| 3682 |
case QEMU_OPTION_isa: |
|
| 3683 |
pci_enabled = 0; |
|
| 3684 |
break; |
|
| 3685 |
case QEMU_OPTION_prep: |
|
| 3686 |
prep_enabled = 1; |
|
| 3687 |
break; |
|
| 3688 | 3670 |
case QEMU_OPTION_k: |
| 3689 | 3671 |
keyboard_layout = optarg; |
| 3690 | 3672 |
break; |
| b/vl.h | ||
|---|---|---|
| 488 | 488 |
|
| 489 | 489 |
/* PCI bus */ |
| 490 | 490 |
|
| 491 |
extern int pci_enabled; |
|
| 492 |
|
|
| 493 | 491 |
extern target_phys_addr_t pci_mem_base; |
| 494 | 492 |
|
| 495 | 493 |
typedef struct PCIBus PCIBus; |
| ... | ... | |
| 729 | 727 |
|
| 730 | 728 |
/* pc.c */ |
| 731 | 729 |
extern QEMUMachine pc_machine; |
| 730 |
extern QEMUMachine isapc_machine; |
|
| 732 | 731 |
|
| 733 | 732 |
/* ppc.c */ |
| 734 | 733 |
extern QEMUMachine prep_machine; |
| ... | ... | |
| 745 | 744 |
|
| 746 | 745 |
extern CPUWriteMemoryFunc *PPC_io_write[]; |
| 747 | 746 |
extern CPUReadMemoryFunc *PPC_io_read[]; |
| 748 |
extern int prep_enabled; |
|
| 749 | 747 |
void PPC_debug_write (void *opaque, uint32_t addr, uint32_t val); |
| 750 | 748 |
|
| 751 | 749 |
/* sun4m.c */ |
Also available in: Unified diff