aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-06-05 14:51:11 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-06-05 14:51:11 +0000
commitb5ff2d6e2d67a14b01872d852d879a69a83242cd (patch)
tree73c452624336071638b10f5490b137d2b36f45a4 /hw
parent54fa5af54622a9bd2d4e6988a6e402f60bde3653 (diff)
PC machine support
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1446 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r--hw/pc.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/hw/pc.c b/hw/pc.c
index 5deb445a3c..dac125c094 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -380,10 +380,10 @@ static int parallel_io[MAX_PARALLEL_PORTS] = { 0x378, 0x278, 0x3bc };
static int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 };
/* PC hardware initialisation */
-void pc_init(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)
+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)
{
char buf[1024];
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,
pci_bios_init();
}
}
+
+QEMUMachine pc_machine = {
+ "pc",
+ "Standard PC",
+ pc_init1,
+};