diff options
| -rw-r--r-- | hw/pc.c | 37 | ||||
| -rw-r--r-- | qemu-doc.texi | 8 | ||||
| -rw-r--r-- | vl.c | 20 | ||||
| -rw-r--r-- | vl.h | 4 |
4 files changed, 40 insertions, 29 deletions
@@ -410,7 +410,8 @@ static int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 }; static void pc_init1(int ram_size, int vga_ram_size, int boot_device, DisplayState *ds, const char **fd_filename, int snapshot, const char *kernel_filename, const char *kernel_cmdline, - const char *initrd_filename) + const char *initrd_filename, + int pci_enabled) { char buf[1024]; int ret, linux_boot, initrd_size, i, nb_nics1; @@ -637,8 +638,40 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device, } } +static void pc_init_pci(int ram_size, int vga_ram_size, int boot_device, + DisplayState *ds, const char **fd_filename, + int snapshot, + const char *kernel_filename, + const char *kernel_cmdline, + const char *initrd_filename) +{ + pc_init1(ram_size, vga_ram_size, boot_device, + ds, fd_filename, snapshot, + kernel_filename, kernel_cmdline, + initrd_filename, 1); +} + +static void pc_init_isa(int ram_size, int vga_ram_size, int boot_device, + DisplayState *ds, const char **fd_filename, + int snapshot, + const char *kernel_filename, + const char *kernel_cmdline, + const char *initrd_filename) +{ + pc_init1(ram_size, vga_ram_size, boot_device, + ds, fd_filename, snapshot, + kernel_filename, kernel_cmdline, + initrd_filename, 0); +} + QEMUMachine pc_machine = { "pc", "Standard PC", - pc_init1, + pc_init_pci, +}; + +QEMUMachine isapc_machine = { + "isapc", + "ISA-only PC", + pc_init_isa, }; diff --git a/qemu-doc.texi b/qemu-doc.texi index 6d7e85cd64..df5f4e3c64 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -138,6 +138,9 @@ usage: qemu [options] [disk_image] General options: @table @option +@item -M machine +Select the emulated machine (@code{-M ?} for list) + @item -fda file @item -fdb file Use @var{file} as floppy disk 0/1 image (@xref{disk_images}). You can @@ -390,8 +393,6 @@ translation mode (@var{t}=none, lba or auto). Usually QEMU can guess all thoses parameters. This option is useful for old MS-DOS disk images. -@item -isa -Simulate an ISA-only system (default is PCI system). @item -std-vga Simulate a standard VGA card with Bochs VBE extensions (default is Cirrus Logic GD5446 PCI VGA) @@ -1137,9 +1138,6 @@ The following options are specific to the PowerPC emulation: @table @option -@item -prep -Simulate a PREP system (default is PowerMAC) - @item -g WxH[xDEPTH] Set the initial VGA graphic mode. The default is 800x600x15. @@ -134,8 +134,6 @@ int adlib_enabled = 0; int gus_enabled = 0; int es1370_enabled = 0; #endif -int pci_enabled = 1; -int prep_enabled = 0; int rtc_utc = 1; int cirrus_vga_enabled = 1; #ifdef TARGET_SPARC @@ -3087,9 +3085,6 @@ enum { QEMU_OPTION_hdachs, QEMU_OPTION_L, QEMU_OPTION_no_code_copy, - QEMU_OPTION_pci, - QEMU_OPTION_isa, - QEMU_OPTION_prep, QEMU_OPTION_k, QEMU_OPTION_localtime, QEMU_OPTION_cirrusvga, @@ -3163,14 +3158,10 @@ const QEMUOption qemu_options[] = { #ifdef USE_KQEMU { "no-kqemu", 0, QEMU_OPTION_no_kqemu }, #endif -#ifdef TARGET_PPC - { "prep", 0, QEMU_OPTION_prep }, -#endif #if defined(TARGET_PPC) || defined(TARGET_SPARC) { "g", 1, QEMU_OPTION_g }, #endif { "localtime", 0, QEMU_OPTION_localtime }, - { "isa", 0, QEMU_OPTION_isa }, { "std-vga", 0, QEMU_OPTION_std_vga }, { "monitor", 1, QEMU_OPTION_monitor }, { "serial", 1, QEMU_OPTION_serial }, @@ -3183,7 +3174,6 @@ const QEMUOption qemu_options[] = { /* temporary options */ { "usb", 0, QEMU_OPTION_usb }, - { "pci", 0, QEMU_OPTION_pci }, { "cirrusvga", 0, QEMU_OPTION_cirrusvga }, { NULL }, }; @@ -3239,6 +3229,7 @@ void register_machines(void) { #if defined(TARGET_I386) qemu_register_machine(&pc_machine); + qemu_register_machine(&isapc_machine); #elif defined(TARGET_PPC) qemu_register_machine(&heathrow_machine); qemu_register_machine(&core99_machine); @@ -3676,15 +3667,6 @@ int main(int argc, char **argv) case QEMU_OPTION_S: start_emulation = 0; break; - case QEMU_OPTION_pci: - pci_enabled = 1; - break; - case QEMU_OPTION_isa: - pci_enabled = 0; - break; - case QEMU_OPTION_prep: - prep_enabled = 1; - break; case QEMU_OPTION_k: keyboard_layout = optarg; break; @@ -488,8 +488,6 @@ void isa_unassign_ioport(int start, int length); /* PCI bus */ -extern int pci_enabled; - extern target_phys_addr_t pci_mem_base; typedef struct PCIBus PCIBus; @@ -729,6 +727,7 @@ int pit_get_out(PITState *pit, int channel, int64_t current_time); /* pc.c */ extern QEMUMachine pc_machine; +extern QEMUMachine isapc_machine; /* ppc.c */ extern QEMUMachine prep_machine; @@ -745,7 +744,6 @@ void PREP_debug_write (void *opaque, uint32_t addr, uint32_t val); extern CPUWriteMemoryFunc *PPC_io_write[]; extern CPUReadMemoryFunc *PPC_io_read[]; -extern int prep_enabled; void PPC_debug_write (void *opaque, uint32_t addr, uint32_t val); /* sun4m.c */ |