motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 01:03:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

suppressed unneeded options - added isapc machine

Browse source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1606 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2005-11-06 18:20:37 +00:00
parent 48024e4a48
commit 3dbbdc2555
4 changed files with 40 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

37
hw/pc.c
View file

@ -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,
};