/[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.35 by bellard, Sat Jan 15 12:02:56 2005 UTC revision 1.36 by bellard, Sun Jun 5 14:51:11 2005 UTC
# Line 380  static int parallel_io[MAX_PARALLEL_PORT Line 380  static int parallel_io[MAX_PARALLEL_PORT
380  static int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 };  static int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 };
381    
382  /* PC hardware initialisation */  /* PC hardware initialisation */
383  void pc_init(int ram_size, int vga_ram_size, int boot_device,  static void pc_init1(int ram_size, int vga_ram_size, int boot_device,
384               DisplayState *ds, const char **fd_filename, int snapshot,                       DisplayState *ds, const char **fd_filename, int snapshot,
385               const char *kernel_filename, const char *kernel_cmdline,                       const char *kernel_filename, const char *kernel_cmdline,
386               const char *initrd_filename)                       const char *initrd_filename)
387  {  {
388      char buf[1024];      char buf[1024];
389      int ret, linux_boot, initrd_size, i, nb_nics1;      int ret, linux_boot, initrd_size, i, nb_nics1;
# Line 595  void pc_init(int ram_size, int vga_ram_s Line 595  void pc_init(int ram_size, int vga_ram_s
595          pci_bios_init();          pci_bios_init();
596      }      }
597  }  }
598    
599    QEMUMachine pc_machine = {
600        "pc",
601        "Standard PC",
602        pc_init1,
603    };

Legend:
Removed from v.1.35  
changed lines
  Added in v.1.36

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