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;
}
}
+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,
};
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
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)
@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.
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
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,
#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 },
/* temporary options */
{ "usb", 0, QEMU_OPTION_usb },
- { "pci", 0, QEMU_OPTION_pci },
{ "cirrusvga", 0, QEMU_OPTION_cirrusvga },
{ NULL },
};
{
#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);
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;
/* PCI bus */
-extern int pci_enabled;
-
extern target_phys_addr_t pci_mem_base;
typedef struct PCIBus PCIBus;
/* pc.c */
extern QEMUMachine pc_machine;
+extern QEMUMachine isapc_machine;
/* ppc.c */
extern QEMUMachine prep_machine;
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 */