Revision 3dbbdc25 hw/pc.c

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

Also available in: Unified diff