Commit b5ff2d6e2d67a14b01872d852d879a69a83242cd
1 parent
54fa5af5
PC machine support
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1446 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
10 additions
and
4 deletions
hw/pc.c
@@ -380,10 +380,10 @@ static int parallel_io[MAX_PARALLEL_PORTS] = { 0x378, 0x278, 0x3bc }; | @@ -380,10 +380,10 @@ static int parallel_io[MAX_PARALLEL_PORTS] = { 0x378, 0x278, 0x3bc }; | ||
380 | static int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 }; | 380 | static int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 }; |
381 | 381 | ||
382 | /* PC hardware initialisation */ | 382 | /* PC hardware initialisation */ |
383 | -void pc_init(int ram_size, int vga_ram_size, int boot_device, | ||
384 | - DisplayState *ds, const char **fd_filename, int snapshot, | ||
385 | - const char *kernel_filename, const char *kernel_cmdline, | ||
386 | - const char *initrd_filename) | 383 | +static void pc_init1(int ram_size, int vga_ram_size, int boot_device, |
384 | + DisplayState *ds, const char **fd_filename, int snapshot, | ||
385 | + const char *kernel_filename, const char *kernel_cmdline, | ||
386 | + const char *initrd_filename) | ||
387 | { | 387 | { |
388 | char buf[1024]; | 388 | char buf[1024]; |
389 | int ret, linux_boot, initrd_size, i, nb_nics1; | 389 | int ret, linux_boot, initrd_size, i, nb_nics1; |
@@ -595,3 +595,9 @@ void pc_init(int ram_size, int vga_ram_size, int boot_device, | @@ -595,3 +595,9 @@ void pc_init(int ram_size, int vga_ram_size, int boot_device, | ||
595 | pci_bios_init(); | 595 | pci_bios_init(); |
596 | } | 596 | } |
597 | } | 597 | } |
598 | + | ||
599 | +QEMUMachine pc_machine = { | ||
600 | + "pc", | ||
601 | + "Standard PC", | ||
602 | + pc_init1, | ||
603 | +}; |