/[qemu]/qemu/hw/pc.c
ViewVC logotype

Diff of /qemu/hw/pc.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.44 by bellard, Sun Nov 6 16:13:29 2005 UTC revision 1.45 by bellard, Sun Nov 6 18:20:37 2005 UTC
# Line 410  static int parallel_irq[MAX_PARALLEL_POR Line 410  static int parallel_irq[MAX_PARALLEL_POR
410  static void pc_init1(int ram_size, int vga_ram_size, int boot_device,  static void pc_init1(int ram_size, int vga_ram_size, int boot_device,
411                       DisplayState *ds, const char **fd_filename, int snapshot,                       DisplayState *ds, const char **fd_filename, int snapshot,
412                       const char *kernel_filename, const char *kernel_cmdline,                       const char *kernel_filename, const char *kernel_cmdline,
413                       const char *initrd_filename)                       const char *initrd_filename,
414                         int pci_enabled)
415  {  {
416      char buf[1024];      char buf[1024];
417      int ret, linux_boot, initrd_size, i, nb_nics1;      int ret, linux_boot, initrd_size, i, nb_nics1;
# Line 637  static void pc_init1(int ram_size, int v Line 638  static void pc_init1(int ram_size, int v
638      }      }
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    
667  QEMUMachine pc_machine = {  QEMUMachine pc_machine = {
668      "pc",      "pc",
669      "Standard PC",      "Standard PC",
670      pc_init1,      pc_init_pci,
671    };
672    
673    QEMUMachine isapc_machine = {
674        "isapc",
675        "ISA-only PC",
676        pc_init_isa,
677  };  };

Legend:
Removed from v.1.44  
changed lines
  Added in v.1.45

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26