Patchwork [v4,5/5] merge pc_piix.c to pc.c

login
register
mail settings
Submitter Wanpeng Li
Date July 18, 2012, 1:19 p.m.
Message ID <1342617545-9261-6-git-send-email-liwanp@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/171674/
State New
Headers show

Comments

Wanpeng Li - July 18, 2012, 1:19 p.m.
[CCing ML]

From: Anthony Liguori <aliguori@us.ibm.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
---
 hw/i386/Makefile.objs |    1 -
 hw/pc.c               |  753 +++++++++++++++++++++++++++++++++++++++++++------
 hw/pc.h               |   46 +---
 hw/pc_piix.c          |  661 -------------------------------------------
 4 files changed, 667 insertions(+), 794 deletions(-)
 delete mode 100644 hw/pc_piix.c
Michael S. Tsirkin - July 18, 2012, 4:14 p.m.
On Wed, Jul 18, 2012 at 09:19:05PM +0800, Wanpeng Li wrote:
> [CCing ML]
> 
> From: Anthony Liguori <aliguori@us.ibm.com>
> 
> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
> Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>

Yes, it was a bad idea to split to begin with, but the
machine compatibility code IMO is better kept
somewhere separate, if for no other reason that
we keep touching it with each revision.
Would be nice to leave pc alone.

> ---
>  hw/i386/Makefile.objs |    1 -
>  hw/pc.c               |  753 +++++++++++++++++++++++++++++++++++++++++++------
>  hw/pc.h               |   46 +---
>  hw/pc_piix.c          |  661 -------------------------------------------
>  4 files changed, 667 insertions(+), 794 deletions(-)
>  delete mode 100644 hw/pc_piix.c
> 
> diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
> index 49b32d0..868020c 100644
> --- a/hw/i386/Makefile.objs
> +++ b/hw/i386/Makefile.objs
> @@ -4,7 +4,6 @@ obj-y += sga.o ioapic_common.o ioapic.o i440fx.o piix3.o
>  obj-y += vmport.o
>  obj-y += pci-hotplug.o smbios.o wdt_ib700.o
>  obj-y += debugcon.o multiboot.o
> -obj-y += pc_piix.o
>  obj-y += pc_sysfw.o
>  obj-$(CONFIG_XEN) += xen_platform.o xen_apic.o
>  obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o
> diff --git a/hw/pc.c b/hw/pc.c
> index c7e9ab3..7c04339 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -27,6 +27,7 @@
>  #include "fdc.h"
>  #include "ide.h"
>  #include "pci.h"
> +#include "usb.h"
>  #include "vmware_vga.h"
>  #include "monitor.h"
>  #include "fw_cfg.h"
> @@ -47,7 +48,10 @@
>  #include "ui/qemu-spice.h"
>  #include "memory.h"
>  #include "exec-memory.h"
> +#include "kvm/clock.h"
>  #include "arch_init.h"
> +#include "smbus.h"
> +#include "boards.h"
>  
>  /* output Bochs bios info messages */
>  //#define DEBUG_BIOS
> @@ -75,6 +79,8 @@
>  
>  #define E820_NR_ENTRIES		16
>  
> +#define MAX_IDE_BUS 2
> +
>  struct e820_entry {
>      uint64_t address;
>      uint64_t length;
> @@ -86,10 +92,14 @@ struct e820_table {
>      struct e820_entry entry[E820_NR_ENTRIES];
>  } QEMU_PACKED __attribute((__aligned__(4)));
>  
> +static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 };
> +static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };
> +static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
> +
>  static struct e820_table e820_table;
>  struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX};
>  
> -void gsi_handler(void *opaque, int n, int level)
> +static void gsi_handler(void *opaque, int n, int level)
>  {
>      GSIState *s = opaque;
>  
> @@ -107,7 +117,7 @@ static void ioport80_write(void *opaque, uint32_t addr, uint32_t data)
>  /* MSDOS compatibility mode FPU exception support */
>  static qemu_irq ferr_irq;
>  
> -void pc_register_ferr_irq(qemu_irq irq)
> +static void pc_register_ferr_irq(qemu_irq irq)
>  {
>      ferr_irq = irq;
>  }
> @@ -330,7 +340,7 @@ static void pc_cmos_init_late(void *opaque)
>      qemu_unregister_reset(pc_cmos_init_late, opaque);
>  }
>  
> -void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
> +static void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
>                    const char *boot_device,
>                    ISADevice *floppy, BusState *idebus0, BusState *idebus1,
>                    ISADevice *s)
> @@ -860,7 +870,7 @@ static const int ne2000_irq[NE2000_NB_MAX] = { 9, 10, 11, 3, 4, 5 };
>  static const int parallel_io[MAX_PARALLEL_PORTS] = { 0x378, 0x278, 0x3bc };
>  static const int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 };
>  
> -void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd)
> +static void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd)
>  {
>      static int nb_ne2k = 0;
>  
> @@ -915,7 +925,7 @@ static DeviceState *apic_init(void *env, uint8_t apic_id)
>      return dev;
>  }
>  
> -void pc_acpi_smi_interrupt(void *opaque, int irq, int level)
> +static void pc_acpi_smi_interrupt(void *opaque, int irq, int level)
>  {
>      CPUX86State *s = opaque;
>  
> @@ -952,7 +962,7 @@ static X86CPU *pc_new_cpu(const char *cpu_model)
>      return cpu;
>  }
>  
> -void pc_cpus_init(const char *cpu_model)
> +static void pc_cpus_init(const char *cpu_model)
>  {
>      int i;
>  
> @@ -970,55 +980,18 @@ void pc_cpus_init(const char *cpu_model)
>      }
>  }
>  
> -void *pc_memory_init(MemoryRegion *system_memory,
> +static void *pc_memory_init(MemoryRegion *system_memory,
>                      const char *kernel_filename,
>                      const char *kernel_cmdline,
>                      const char *initrd_filename,
>                      ram_addr_t below_4g_mem_size,
> -                    ram_addr_t above_4g_mem_size,
> -                    MemoryRegion *rom_memory,
> -                    MemoryRegion **ram_memory)
> +                    ram_addr_t above_4g_mem_size)
>  {
>      int linux_boot, i;
> -    MemoryRegion *ram, *option_rom_mr;
> -    MemoryRegion *ram_below_4g, *ram_above_4g;
>      void *fw_cfg;
>  
>      linux_boot = (kernel_filename != NULL);
>  
> -    /* Allocate RAM.  We allocate it as a single memory region and use
> -     * aliases to address portions of it, mostly for backwards compatibility
> -     * with older qemus that used qemu_ram_alloc().
> -     */
> -    ram = g_malloc(sizeof(*ram));
> -    memory_region_init_ram(ram, "pc.ram",
> -                           below_4g_mem_size + above_4g_mem_size);
> -    vmstate_register_ram_global(ram);
> -    *ram_memory = ram;
> -    ram_below_4g = g_malloc(sizeof(*ram_below_4g));
> -    memory_region_init_alias(ram_below_4g, "ram-below-4g", ram,
> -                             0, below_4g_mem_size);
> -    memory_region_add_subregion(system_memory, 0, ram_below_4g);
> -    if (above_4g_mem_size > 0) {
> -        ram_above_4g = g_malloc(sizeof(*ram_above_4g));
> -        memory_region_init_alias(ram_above_4g, "ram-above-4g", ram,
> -                                 below_4g_mem_size, above_4g_mem_size);
> -        memory_region_add_subregion(system_memory, 0x100000000ULL,
> -                                    ram_above_4g);
> -    }
> -
> -
> -    /* Initialize PC system firmware */
> -    pc_system_firmware_init(rom_memory);
> -
> -    option_rom_mr = g_malloc(sizeof(*option_rom_mr));
> -    memory_region_init_ram(option_rom_mr, "pc.rom", PC_ROM_SIZE);
> -    vmstate_register_ram_global(option_rom_mr);
> -    memory_region_add_subregion_overlap(rom_memory,
> -                                        PC_ROM_MIN_VGA,
> -                                        option_rom_mr,
> -                                        1);
> -
>      fw_cfg = bochs_bios_init();
>      rom_set_fw(fw_cfg);
>  
> @@ -1032,12 +1005,12 @@ void *pc_memory_init(MemoryRegion *system_memory,
>      return fw_cfg;
>  }
>  
> -qemu_irq *pc_allocate_cpu_irq(void)
> +static qemu_irq *pc_allocate_cpu_irq(void)
>  {
>      return qemu_allocate_irqs(pic_irq_request, NULL, 1);
>  }
>  
> -DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus)
> +static DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus)
>  {
>      DeviceState *dev = NULL;
>  
> @@ -1081,60 +1054,20 @@ static void cpu_request_exit(void *opaque, int irq, int level)
>      }
>  }
>  
> -void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
> -                          ISADevice **rtc_state,
> +static void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
>                            ISADevice **floppy,
>                            bool no_vmport)
>  {
>      int i;
>      DriveInfo *fd[MAX_FD];
> -    DeviceState *hpet = NULL;
> -    int pit_isa_irq = 0;
> -    qemu_irq pit_alt_irq = NULL;
> -    qemu_irq rtc_irq = NULL;
>      qemu_irq *a20_line;
> -    ISADevice *i8042, *port92, *vmmouse, *pit = NULL;
> +    ISADevice *i8042, *port92, *vmmouse;
>      qemu_irq *cpu_exit_irq;
>  
>      register_ioport_write(0x80, 1, 1, ioport80_write, NULL);
>  
>      register_ioport_write(0xf0, 1, 1, ioportF0_write, NULL);
>  
> -    /*
> -     * Check if an HPET shall be created.
> -     *
> -     * Without KVM_CAP_PIT_STATE2, we cannot switch off the in-kernel PIT
> -     * when the HPET wants to take over. Thus we have to disable the latter.
> -     */
> -    if (!no_hpet && (!kvm_irqchip_in_kernel() || kvm_has_pit_state2())) {
> -        hpet = sysbus_try_create_simple("hpet", HPET_BASE, NULL);
> -
> -        if (hpet) {
> -            for (i = 0; i < GSI_NUM_PINS; i++) {
> -                sysbus_connect_irq(sysbus_from_qdev(hpet), i, gsi[i]);
> -            }
> -            pit_isa_irq = -1;
> -            pit_alt_irq = qdev_get_gpio_in(hpet, HPET_LEGACY_PIT_INT);
> -            rtc_irq = qdev_get_gpio_in(hpet, HPET_LEGACY_RTC_INT);
> -        }
> -    }
> -    *rtc_state = rtc_init(isa_bus, 2000, rtc_irq);
> -
> -    qemu_register_boot_set(pc_boot_set, *rtc_state);
> -
> -    if (!xen_enabled()) {
> -        if (kvm_irqchip_in_kernel()) {
> -            pit = kvm_pit_init(isa_bus, 0x40);
> -        } else {
> -            pit = pit_init(isa_bus, 0x40, pit_isa_irq, pit_alt_irq);
> -        }
> -        if (hpet) {
> -            /* connect PIT to output control line of the HPET */
> -            qdev_connect_gpio_out(hpet, 0, qdev_get_gpio_in(&pit->qdev, 0));
> -        }
> -        pcspk_init(isa_bus, pit);
> -    }
> -
>      for(i = 0; i < MAX_SERIAL_PORTS; i++) {
>          if (serial_hds[i]) {
>              serial_isa_init(isa_bus, i, serial_hds[i]);
> @@ -1172,7 +1105,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
>      *floppy = fdctrl_init_isa(isa_bus, fd);
>  }
>  
> -void pc_pci_device_init(PCIBus *pci_bus)
> +static void pc_pci_device_init(PCIBus *pci_bus)
>  {
>      int max_bus;
>      int bus;
> @@ -1182,3 +1115,643 @@ void pc_pci_device_init(PCIBus *pci_bus)
>          pci_create_simple(pci_bus, -1, "lsi53c895a");
>      }
>  }
> +
> +static void kvm_piix3_setup_irq_routing(bool pci_enabled)
> +{
> +#ifdef CONFIG_KVM
> +    KVMState *s = kvm_state;
> +    int i;
> +
> +    if (kvm_check_extension(s, KVM_CAP_IRQ_ROUTING)) {
> +        for (i = 0; i < 8; ++i) {
> +            if (i == 2) {
> +                continue;
> +            }
> +            kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_PIC_MASTER, i);
> +        }
> +        for (i = 8; i < 16; ++i) {
> +            kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_PIC_SLAVE, i - 8);
> +        }
> +        if (pci_enabled) {
> +            for (i = 0; i < 24; ++i) {
> +                if (i == 0) {
> +                    kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_IOAPIC, 2);
> +                } else if (i != 2) {
> +                    kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_IOAPIC, i);
> +                }
> +            }
> +        }
> +    }
> +#endif /* CONFIG_KVM */
> +}
> +
> +static void kvm_piix3_gsi_handler(void *opaque, int n, int level)
> +{
> +    GSIState *s = opaque;
> +
> +    if (n < ISA_NUM_IRQS) {
> +        /* Kernel will forward to both PIC and IOAPIC */
> +        qemu_set_irq(s->i8259_irq[n], level);
> +    } else {
> +        qemu_set_irq(s->ioapic_irq[n], level);
> +    }
> +}
> +
> +static void ioapic_init(GSIState *gsi_state)
> +{
> +    DeviceState *dev;
> +    SysBusDevice *d;
> +    unsigned int i;
> +
> +    if (kvm_irqchip_in_kernel()) {
> +        dev = qdev_create(NULL, "kvm-ioapic");
> +    } else {
> +        dev = qdev_create(NULL, "ioapic");
> +    }
> +    /* FIXME: this should be under piix3
> +    object_property_add_child(object_resolve_path("i440fx", NULL),
> +                                               "ioapic", OBJECT(dev), NULL);*/
> +    qdev_init_nofail(dev);
> +    d = sysbus_from_qdev(dev);
> +    sysbus_mmio_map(d, 0, 0xfec00000);
> +
> +    for (i = 0; i < IOAPIC_NUM_PINS; i++) {
> +        gsi_state->ioapic_irq[i] = qdev_get_gpio_in(dev, i);
> +    }
> +}
> +
> +static PCIBus *i440fx_init(I440FXPMCState **pi440fx_state, int *piix3_devfn,
> +                           ISABus **isa_bus, qemu_irq *pic,
> +                           MemoryRegion *address_space_mem,
> +                           MemoryRegion *address_space_io,
> +                           ram_addr_t ram_size,
> +                           const char *bios_name)
> +{
> +    I440FXState *s;
> +    PCIHostState *h;
> +
> +    s = I440FX(object_new(TYPE_I440FX));
> +    h = PCI_HOST(s);
> +
> +    /* FIXME make a properties */
> +    h->address_space = address_space_mem;
> +    s->address_space_io = address_space_io;
> +    s->piix3.pic = pic;
> +    if (bios_name) {
> +        g_free(s->bios_name);
> +        s->bios_name = g_strdup(bios_name);
> +    }
> +    s->pmc.ram_size = ram_size;
> +
> +    qdev_set_parent_bus(DEVICE(s), sysbus_get_default());
> +    qdev_init_nofail(DEVICE(s));
> +
> +    *isa_bus = s->piix3.bus;
> +    *pi440fx_state = &s->pmc;
> +    *piix3_devfn = s->piix3.dev.devfn;
> +
> +    return h->bus;
> +}
> +
> +/* PC hardware initialisation */
> +static void pc_init1(MemoryRegion *system_memory,
> +                     MemoryRegion *system_io,
> +                     ram_addr_t ram_size,
> +                     const char *boot_device,
> +                     const char *kernel_filename,
> +                     const char *kernel_cmdline,
> +                     const char *initrd_filename,
> +                     const char *cpu_model,
> +                     int pci_enabled,
> +                     int kvmclock_enabled)
> +{
> +    int i;
> +    ram_addr_t below_4g_mem_size, above_4g_mem_size;
> +    PCIBus *pci_bus;
> +    ISABus *isa_bus;
> +    I440FXPMCState *i440fx_state;
> +    int piix3_devfn = -1;
> +    qemu_irq *cpu_irq;
> +    qemu_irq *gsi;
> +    qemu_irq *i8259;
> +    qemu_irq *smi_irq;
> +    GSIState *gsi_state;
> +    DriveInfo * hd[MAX_IDE_BUS * MAX_IDE_DEVS];
> +    BusState *idebus[MAX_IDE_BUS];
> +    ISADevice *rtc_state;
> +    ISADevice *floppy;
> +
> +    void *fw_cfg = NULL;
> +
> +    pc_cpus_init(cpu_model);
> +
> +    if (kvmclock_enabled) {
> +        kvmclock_create();
> +    }
> +
> +    if (ram_size >= 0xe0000000) {
> +        above_4g_mem_size = ram_size - 0xe0000000;
> +        below_4g_mem_size = 0xe0000000;
> +    } else {
> +        above_4g_mem_size = 0;
> +        below_4g_mem_size = ram_size;
> +    }
> +
> +    /* allocate ram and load rom/bios */
> +    if (!xen_enabled()) {
> +        pc_memory_init(system_memory,
> +                       kernel_filename, kernel_cmdline, initrd_filename,
> +                       below_4g_mem_size, above_4g_mem_size);
> +    }
> +
> +    gsi_state = g_malloc0(sizeof(*gsi_state));
> +    if (kvm_irqchip_in_kernel()) {
> +        kvm_piix3_setup_irq_routing(pci_enabled);
> +        gsi = qemu_allocate_irqs(kvm_piix3_gsi_handler, gsi_state,
> +                                 GSI_NUM_PINS);
> +    } else {
> +        gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS);
> +    }
> +
> +    if (pci_enabled) {
> +        pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, &isa_bus, gsi,
> +                              system_memory, system_io, ram_size,
> +                              bios_name);
> +    } else {
> +        pci_bus = NULL;
> +        i440fx_state = NULL;
> +        isa_bus = isa_bus_new(NULL, system_io);
> +        no_hpet = 1;
> +    }
> +    isa_bus_irqs(isa_bus, gsi);
> +
> +    if (kvm_irqchip_in_kernel()) {
> +        i8259 = kvm_i8259_init(isa_bus);
> +    } else if (xen_enabled()) {
> +        i8259 = xen_interrupt_controller_init();
> +    } else {
> +        cpu_irq = pc_allocate_cpu_irq();
> +        i8259 = i8259_init(isa_bus, cpu_irq[0]);
> +    }
> +
> +    for (i = 0; i < ISA_NUM_IRQS; i++) {
> +        gsi_state->i8259_irq[i] = i8259[i];
> +    }
> +    if (pci_enabled) {
> +        ioapic_init(gsi_state);
> +    }
> +
> +    pc_register_ferr_irq(gsi[13]);
> +
> +    pc_vga_init(isa_bus, pci_enabled ? pci_bus : NULL);
> +    if (xen_enabled()) {
> +        pci_create_simple(pci_bus, -1, "xen-platform");
> +    }
> +
> +    /* init basic PC hardware */
> +    pc_basic_device_init(isa_bus, gsi, &floppy, xen_enabled());
> +
> +    for (i = 0; i < nb_nics; i++) {
> +        NICInfo *nd = &nd_table[i];
> +
> +        if (!pci_enabled || (nd->model && strcmp(nd->model, "ne2k_isa") == 0)) {
> +            pc_init_ne2k_isa(isa_bus, nd);
> +        } else {
> +            pci_nic_init_nofail(nd, "e1000", NULL);
> +        }
> +    }
> +
> +    ide_drive_get(hd, MAX_IDE_BUS);
> +    if (pci_enabled) {
> +        PCIDevice *dev;
> +        if (xen_enabled()) {
> +            dev = pci_piix3_xen_ide_init(pci_bus, hd, piix3_devfn + 1);
> +        } else {
> +            dev = pci_piix3_ide_init(pci_bus, hd, piix3_devfn + 1);
> +        }
> +        idebus[0] = qdev_get_child_bus(&dev->qdev, "ide.0");
> +        idebus[1] = qdev_get_child_bus(&dev->qdev, "ide.1");
> +    } else {
> +        for (i = 0; i < MAX_IDE_BUS; i++) {
> +            ISADevice *dev;
> +            dev = isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i],
> +                               ide_irq[i],
> +                               hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i + 1]);
> +            idebus[i] = qdev_get_child_bus(&dev->qdev, "ide.0");
> +        }
> +    }
> +
> +    /* FIXME */
> +    rtc_state = ISA_DEVICE(object_resolve_path("rtc", NULL));
> +    qemu_register_boot_set(pc_boot_set, rtc_state);
> +
> +    audio_init(isa_bus, pci_enabled ? pci_bus : NULL);
> +
> +    pc_cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device,
> +                 floppy, idebus[0], idebus[1], rtc_state);
> +
> +    if (pci_enabled && usb_enabled) {
> +        pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci");
> +    }
> +
> +    if (pci_enabled && acpi_enabled) {
> +        i2c_bus *smbus;
> +
> +        smi_irq = qemu_allocate_irqs(pc_acpi_smi_interrupt, first_cpu, 1);
> +        /* TODO: Populate SPD eeprom data.  */
> +        smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100,
> +                              gsi[9], *smi_irq,
> +                              kvm_enabled(), fw_cfg);
> +        smbus_eeprom_init(smbus, 8, NULL, 0);
> +    }
> +
> +    if (pci_enabled) {
> +        pc_pci_device_init(pci_bus);
> +    }
> +}
> +
> +static void pc_init_pci(ram_addr_t ram_size,
> +                        const char *boot_device,
> +                        const char *kernel_filename,
> +                        const char *kernel_cmdline,
> +                        const char *initrd_filename,
> +                        const char *cpu_model)
> +{
> +    pc_init1(get_system_memory(),
> +             get_system_io(),
> +             ram_size, boot_device,
> +             kernel_filename, kernel_cmdline,
> +             initrd_filename, cpu_model, 1, 1);
> +}
> +
> +static void pc_init_pci_no_kvmclock(ram_addr_t ram_size,
> +                                    const char *boot_device,
> +                                    const char *kernel_filename,
> +                                    const char *kernel_cmdline,
> +                                    const char *initrd_filename,
> +                                    const char *cpu_model)
> +{
> +    pc_init1(get_system_memory(),
> +             get_system_io(),
> +             ram_size, boot_device,
> +             kernel_filename, kernel_cmdline,
> +             initrd_filename, cpu_model, 1, 0);
> +}
> +
> +static void pc_init_isa(ram_addr_t ram_size,
> +                        const char *boot_device,
> +                        const char *kernel_filename,
> +                        const char *kernel_cmdline,
> +                        const char *initrd_filename,
> +                        const char *cpu_model)
> +{
> +    if (cpu_model == NULL) {
> +        cpu_model = "486";
> +    }
> +    pc_init1(get_system_memory(),
> +             get_system_io(),
> +             ram_size, boot_device,
> +             kernel_filename, kernel_cmdline,
> +             initrd_filename, cpu_model, 0, 1);
> +}
> +
> +#ifdef CONFIG_XEN
> +static void pc_xen_hvm_init(ram_addr_t ram_size,
> +                            const char *boot_device,
> +                            const char *kernel_filename,
> +                            const char *kernel_cmdline,
> +                            const char *initrd_filename,
> +                            const char *cpu_model)
> +{
> +    if (xen_hvm_init() != 0) {
> +        hw_error("xen hardware virtual machine initialisation failed");
> +    }
> +    pc_init_pci_no_kvmclock(ram_size, boot_device,
> +                            kernel_filename, kernel_cmdline,
> +                            initrd_filename, cpu_model);
> +    xen_vcpu_init();
> +}
> +#endif
> +
> +static QEMUMachine pc_machine_v1_2 = {
> +    .name = "pc-1.2",
> +    .alias = "pc",
> +    .desc = "Standard PC",
> +    .init = pc_init_pci,
> +    .max_cpus = 255,
> +    .is_default = 1,
> +};
> +
> +#define PC_COMPAT_1_1 \
> +do {
> +        {\
> +            .driver   = "VGA",\
> +            .property = "vgamem_mb",\
> +            .value    = stringify(8),\
> +        },{\
> +            .driver   = "vmware-svga",\
> +            .property = "vgamem_mb",\
> +            .value    = stringify(8),\
> +        },{\
> +            .driver   = "qxl-vga",\
> +            .property = "vgamem_mb",\
> +            .value    = stringify(8),\
> +        },{\
> +            .driver   = "qxl",\
> +            .property = "vgamem_mb",\
> +            .value    = stringify(8),\
> +        }
> +} while (0)
> +
> +static QEMUMachine pc_machine_v1_1 = {
> +    .name = "pc-1.1",
> +    .desc = "Standard PC",
> +    .init = pc_init_pci,
> +    .max_cpus = 255,
> +    .compat_props = (GlobalProperty[]) {
> +        PC_COMPAT_1_1,
> +        { /* end of list */ }
> +    },
> +};
> +
> +#define PC_COMPAT_1_0 \
> +do {
> +        PC_COMPAT_1_1,\
> +        {\
> +            .driver   = "pc-sysfw",\
> +            .property = "rom_only",\
> +            .value    = stringify(1),\
> +        }, {\
> +            .driver   = "isa-fdc",\
> +            .property = "check_media_rate",\
> +            .value    = "off",\
> +        }, {\
> +            .driver   = "virtio-balloon-pci",\
> +            .property = "class",\
> +            .value    = stringify(PCI_CLASS_MEMORY_RAM),\
> +        },{\
> +            .driver   = "apic",\
> +            .property = "vapic",\
> +            .value    = "off",\
> +        },{\
> +            .driver   = TYPE_USB_DEVICE,\
> +            .property = "full-path",\
> +            .value    = "no",\
> +        }
> +} while (0)
> +
> +static QEMUMachine pc_machine_v1_0 = {
> +    .name = "pc-1.0",
> +    .desc = "Standard PC",
> +    .init = pc_init_pci,
> +    .max_cpus = 255,
> +    .compat_props = (GlobalProperty[]) {
> +        PC_COMPAT_1_0,
> +        { /* end of list */ }
> +    },
> +    .hw_version = "1.0",
> +};
> +
> +#define PC_COMPAT_0_15 \
> +        PC_COMPAT_1_0
> +
> +static QEMUMachine pc_machine_v0_15 = {
> +    .name = "pc-0.15",
> +    .desc = "Standard PC",
> +    .init = pc_init_pci,
> +    .max_cpus = 255,
> +    .compat_props = (GlobalProperty[]) {
> +        PC_COMPAT_0_15,
> +        { /* end of list */ }
> +    },
> +    .hw_version = "0.15",
> +};
> +
> +#define PC_COMPAT_0_14 \
> +do {
> +        PC_COMPAT_0_15,\
> +        {\
> +            .driver   = "virtio-blk-pci",\
> +            .property = "event_idx",\
> +            .value    = "off",\
> +        },{\
> +            .driver   = "virtio-serial-pci",\
> +            .property = "event_idx",\
> +            .value    = "off",\
> +        },{\
> +            .driver   = "virtio-net-pci",\
> +            .property = "event_idx",\
> +            .value    = "off",\
> +        },{\
> +            .driver   = "virtio-balloon-pci",\
> +            .property = "event_idx",\
> +            .value    = "off",\
> +        }
> +} while (0)
> +
> +static QEMUMachine pc_machine_v0_14 = {
> +    .name = "pc-0.14",
> +    .desc = "Standard PC",
> +    .init = pc_init_pci,
> +    .max_cpus = 255,
> +    .compat_props = (GlobalProperty[]) {
> +        PC_COMPAT_0_14,
> +        {
> +            .driver   = "qxl",
> +            .property = "revision",
> +            .value    = stringify(2),
> +        },{
> +            .driver   = "qxl-vga",
> +            .property = "revision",
> +            .value    = stringify(2),
> +        },
> +        { /* end of list */ }
> +    },
> +    .hw_version = "0.14",
> +};
> +
> +#define PC_COMPAT_0_13 \
> +do {
> +        PC_COMPAT_0_14,\
> +        {\
> +            .driver   = TYPE_PCI_DEVICE,\
> +            .property = "command_serr_enable",\
> +            .value    = "off",\
> +        },{\
> +            .driver   = "AC97",\
> +            .property = "use_broken_id",\
> +            .value    = stringify(1),\
> +        }
> +} while (0)
> +
> +static QEMUMachine pc_machine_v0_13 = {
> +    .name = "pc-0.13",
> +    .desc = "Standard PC",
> +    .init = pc_init_pci_no_kvmclock,
> +    .max_cpus = 255,
> +    .compat_props = (GlobalProperty[]) {
> +        PC_COMPAT_0_13,
> +        {
> +            .driver   = "virtio-9p-pci",
> +            .property = "vectors",
> +            .value    = stringify(0),
> +        },{
> +            .driver   = "VGA",
> +            .property = "rombar",
> +            .value    = stringify(0),
> +        },{
> +            .driver   = "vmware-svga",
> +            .property = "rombar",
> +            .value    = stringify(0),
> +        },
> +        { /* end of list */ }
> +    },
> +    .hw_version = "0.13",
> +};
> +
> +#define PC_COMPAT_0_12 \
> +do {
> +        PC_COMPAT_0_13,\
> +        {\
> +            .driver   = "virtio-serial-pci",\
> +            .property = "max_ports",\
> +            .value    = stringify(1),\
> +        },{\
> +            .driver   = "virtio-serial-pci",\
> +            .property = "vectors",\
> +            .value    = stringify(0),\
> +        }
> +} while (0)
> +
> +static QEMUMachine pc_machine_v0_12 = {
> +    .name = "pc-0.12",
> +    .desc = "Standard PC",
> +    .init = pc_init_pci_no_kvmclock,
> +    .max_cpus = 255,
> +    .compat_props = (GlobalProperty[]) {
> +        PC_COMPAT_0_12,
> +        {
> +            .driver   = "VGA",
> +            .property = "rombar",
> +            .value    = stringify(0),
> +        },{
> +            .driver   = "vmware-svga",
> +            .property = "rombar",
> +            .value    = stringify(0),
> +        },
> +        { /* end of list */ }
> +    },
> +    .hw_version = "0.12",
> +};
> +
> +#define PC_COMPAT_0_11 \
> +do {
> +        PC_COMPAT_0_12,\
> +        {\
> +            .driver   = "virtio-blk-pci",\
> +            .property = "vectors",\
> +            .value    = stringify(0),\
> +        },{\
> +            .driver   = TYPE_PCI_DEVICE,\
> +            .property = "rombar",\
> +            .value    = stringify(0),\
> +        }
> +} while (0)
> +
> +static QEMUMachine pc_machine_v0_11 = {
> +    .name = "pc-0.11",
> +    .desc = "Standard PC, qemu 0.11",
> +    .init = pc_init_pci_no_kvmclock,
> +    .max_cpus = 255,
> +    .compat_props = (GlobalProperty[]) {
> +        PC_COMPAT_0_11,
> +        {
> +            .driver   = "ide-drive",
> +            .property = "ver",
> +            .value    = "0.11",
> +        },{
> +            .driver   = "scsi-disk",
> +            .property = "ver",
> +            .value    = "0.11",
> +        },
> +        { /* end of list */ }
> +    },
> +    .hw_version = "0.11",
> +};
> +
> +static QEMUMachine pc_machine_v0_10 = {
> +    .name = "pc-0.10",
> +    .desc = "Standard PC, qemu 0.10",
> +    .init = pc_init_pci_no_kvmclock,
> +    .max_cpus = 255,
> +    .compat_props = (GlobalProperty[]) {
> +        PC_COMPAT_0_11,
> +        {
> +            .driver   = "virtio-blk-pci",
> +            .property = "class",
> +            .value    = stringify(PCI_CLASS_STORAGE_OTHER),
> +        },{
> +            .driver   = "virtio-serial-pci",
> +            .property = "class",
> +            .value    = stringify(PCI_CLASS_DISPLAY_OTHER),
> +        },{
> +            .driver   = "virtio-net-pci",
> +            .property = "vectors",
> +            .value    = stringify(0),
> +        },{
> +            .driver   = "ide-drive",
> +            .property = "ver",
> +            .value    = "0.10",
> +        },{
> +            .driver   = "scsi-disk",
> +            .property = "ver",
> +            .value    = "0.10",
> +        },
> +        { /* end of list */ }
> +    },
> +    .hw_version = "0.10",
> +};
> +
> +static QEMUMachine isapc_machine = {
> +    .name = "isapc",
> +    .desc = "ISA-only PC",
> +    .init = pc_init_isa,
> +    .max_cpus = 1,
> +    .compat_props = (GlobalProperty[]) {
> +        {
> +            .driver   = "pc-sysfw",
> +            .property = "rom_only",
> +            .value    = stringify(1),
> +        },
> +        { /* end of list */ }
> +    },
> +};
> +
> +#ifdef CONFIG_XEN
> +static QEMUMachine xenfv_machine = {
> +    .name = "xenfv",
> +    .desc = "Xen Fully-virtualized PC",
> +    .init = pc_xen_hvm_init,
> +    .max_cpus = HVM_MAX_VCPUS,
> +    .default_machine_opts = "accel=xen",
> +};
> +#endif
> +
> +static void pc_machine_init(void)
> +{
> +    qemu_register_machine(&pc_machine_v1_2);
> +    qemu_register_machine(&pc_machine_v1_1);
> +    qemu_register_machine(&pc_machine_v1_0);
> +    qemu_register_machine(&pc_machine_v0_15);
> +    qemu_register_machine(&pc_machine_v0_14);
> +    qemu_register_machine(&pc_machine_v0_13);
> +    qemu_register_machine(&pc_machine_v0_12);
> +    qemu_register_machine(&pc_machine_v0_11);
> +    qemu_register_machine(&pc_machine_v0_10);
> +    qemu_register_machine(&isapc_machine);
> +#ifdef CONFIG_XEN
> +    qemu_register_machine(&xenfv_machine);
> +#endif
> +}
> +
> +machine_init(pc_machine_init);
> diff --git a/hw/pc.h b/hw/pc.h
> index 31ccb6f..7b56a1c 100644
> --- a/hw/pc.h
> +++ b/hw/pc.h
> @@ -9,6 +9,7 @@
>  #include "net.h"
>  #include "memory.h"
>  #include "ioapic.h"
> +#include "i440fx.h"
>  
>  /* PC-style peripherals (also used by other machines).  */
>  
> @@ -79,8 +80,6 @@ typedef struct GSIState {
>      qemu_irq ioapic_irq[IOAPIC_NUM_PINS];
>  } GSIState;
>  
> -void gsi_handler(void *opaque, int n, int level);
> -
>  /* vmport.c */
>  static inline void vmport_init(ISABus *bus)
>  {
> @@ -102,31 +101,6 @@ void i8042_setup_a20_line(ISADevice *dev, qemu_irq *a20_out);
>  /* pc.c */
>  extern int fd_bootchk;
>  
> -void pc_register_ferr_irq(qemu_irq irq);
> -void pc_acpi_smi_interrupt(void *opaque, int irq, int level);
> -
> -void pc_cpus_init(const char *cpu_model);
> -void *pc_memory_init(MemoryRegion *system_memory,
> -                    const char *kernel_filename,
> -                    const char *kernel_cmdline,
> -                    const char *initrd_filename,
> -                    ram_addr_t below_4g_mem_size,
> -                    ram_addr_t above_4g_mem_size,
> -                    MemoryRegion *rom_memory,
> -                    MemoryRegion **ram_memory);
> -qemu_irq *pc_allocate_cpu_irq(void);
> -DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus);
> -void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
> -                          ISADevice **rtc_state,
> -                          ISADevice **floppy,
> -                          bool no_vmport);
> -void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd);
> -void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
> -                  const char *boot_device,
> -                  ISADevice *floppy, BusState *ide0, BusState *ide1,
> -                  ISADevice *s);
> -void pc_pci_device_init(PCIBus *pci_bus);
> -
>  typedef void (*cpu_set_smm_t)(int smm, void *arg);
>  void cpu_smm_register(cpu_set_smm_t callback, void *arg);
>  
> @@ -148,21 +122,9 @@ void piix4_smbus_register_device(SMBusDevice *dev, uint8_t addr);
>  /* hpet.c */
>  extern int no_hpet;
>  
> -/* piix_pci.c */
> -struct PCII440FXState;
> -typedef struct PCII440FXState PCII440FXState;
> -
> -PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix_devfn,
> -                    ISABus **isa_bus, qemu_irq *pic,
> -                    MemoryRegion *address_space_mem,
> -                    MemoryRegion *address_space_io,
> -                    ram_addr_t ram_size,
> -                    target_phys_addr_t pci_hole_start,
> -                    target_phys_addr_t pci_hole_size,
> -                    target_phys_addr_t pci_hole64_start,
> -                    target_phys_addr_t pci_hole64_size,
> -                    MemoryRegion *pci_memory,
> -                    MemoryRegion *ram_memory);
> +/* pcspk.c */
> +void pcskp_init(ISADevice *pit);
> +int pcskp_audio_init(qemu_irq *pic);
>  
>  /* piix4.c */
>  extern PCIDevice *piix4_dev;
> diff --git a/hw/pc_piix.c b/hw/pc_piix.c
> deleted file mode 100644
> index 0c0096f..0000000
> --- a/hw/pc_piix.c
> +++ /dev/null
> @@ -1,661 +0,0 @@
> -/*
> - * QEMU PC System Emulator
> - *
> - * Copyright (c) 2003-2004 Fabrice Bellard
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining a copy
> - * of this software and associated documentation files (the "Software"), to deal
> - * in the Software without restriction, including without limitation the rights
> - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> - * copies of the Software, and to permit persons to whom the Software is
> - * furnished to do so, subject to the following conditions:
> - *
> - * The above copyright notice and this permission notice shall be included in
> - * all copies or substantial portions of the Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> - * THE SOFTWARE.
> - */
> -
> -#include <glib.h>
> -
> -#include "hw.h"
> -#include "pc.h"
> -#include "apic.h"
> -#include "pci.h"
> -#include "pci_ids.h"
> -#include "usb.h"
> -#include "net.h"
> -#include "boards.h"
> -#include "ide.h"
> -#include "kvm.h"
> -#include "kvm/clock.h"
> -#include "sysemu.h"
> -#include "sysbus.h"
> -#include "arch_init.h"
> -#include "blockdev.h"
> -#include "smbus.h"
> -#include "xen.h"
> -#include "memory.h"
> -#include "exec-memory.h"
> -#ifdef CONFIG_XEN
> -#  include <xen/hvm/hvm_info_table.h>
> -#endif
> -
> -#define MAX_IDE_BUS 2
> -
> -static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 };
> -static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };
> -static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
> -
> -static void kvm_piix3_setup_irq_routing(bool pci_enabled)
> -{
> -#ifdef CONFIG_KVM
> -    KVMState *s = kvm_state;
> -    int i;
> -
> -    if (kvm_check_extension(s, KVM_CAP_IRQ_ROUTING)) {
> -        for (i = 0; i < 8; ++i) {
> -            if (i == 2) {
> -                continue;
> -            }
> -            kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_PIC_MASTER, i);
> -        }
> -        for (i = 8; i < 16; ++i) {
> -            kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_PIC_SLAVE, i - 8);
> -        }
> -        if (pci_enabled) {
> -            for (i = 0; i < 24; ++i) {
> -                if (i == 0) {
> -                    kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_IOAPIC, 2);
> -                } else if (i != 2) {
> -                    kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_IOAPIC, i);
> -                }
> -            }
> -        }
> -    }
> -#endif /* CONFIG_KVM */
> -}
> -
> -static void kvm_piix3_gsi_handler(void *opaque, int n, int level)
> -{
> -    GSIState *s = opaque;
> -
> -    if (n < ISA_NUM_IRQS) {
> -        /* Kernel will forward to both PIC and IOAPIC */
> -        qemu_set_irq(s->i8259_irq[n], level);
> -    } else {
> -        qemu_set_irq(s->ioapic_irq[n], level);
> -    }
> -}
> -
> -static void ioapic_init(GSIState *gsi_state)
> -{
> -    DeviceState *dev;
> -    SysBusDevice *d;
> -    unsigned int i;
> -
> -    if (kvm_irqchip_in_kernel()) {
> -        dev = qdev_create(NULL, "kvm-ioapic");
> -    } else {
> -        dev = qdev_create(NULL, "ioapic");
> -    }
> -    /* FIXME: this should be under the piix3.  */
> -    object_property_add_child(object_resolve_path("i440fx", NULL),
> -                              "ioapic", OBJECT(dev), NULL);
> -    qdev_init_nofail(dev);
> -    d = sysbus_from_qdev(dev);
> -    sysbus_mmio_map(d, 0, 0xfec00000);
> -
> -    for (i = 0; i < IOAPIC_NUM_PINS; i++) {
> -        gsi_state->ioapic_irq[i] = qdev_get_gpio_in(dev, i);
> -    }
> -}
> -
> -/* PC hardware initialisation */
> -static void pc_init1(MemoryRegion *system_memory,
> -                     MemoryRegion *system_io,
> -                     ram_addr_t ram_size,
> -                     const char *boot_device,
> -                     const char *kernel_filename,
> -                     const char *kernel_cmdline,
> -                     const char *initrd_filename,
> -                     const char *cpu_model,
> -                     int pci_enabled,
> -                     int kvmclock_enabled)
> -{
> -    int i;
> -    ram_addr_t below_4g_mem_size, above_4g_mem_size;
> -    PCIBus *pci_bus;
> -    ISABus *isa_bus;
> -    PCII440FXState *i440fx_state;
> -    int piix3_devfn = -1;
> -    qemu_irq *cpu_irq;
> -    qemu_irq *gsi;
> -    qemu_irq *i8259;
> -    qemu_irq *smi_irq;
> -    GSIState *gsi_state;
> -    DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
> -    BusState *idebus[MAX_IDE_BUS];
> -    ISADevice *rtc_state;
> -    ISADevice *floppy;
> -    MemoryRegion *ram_memory;
> -    MemoryRegion *pci_memory;
> -    MemoryRegion *rom_memory;
> -    void *fw_cfg = NULL;
> -
> -    pc_cpus_init(cpu_model);
> -
> -    if (kvmclock_enabled) {
> -        kvmclock_create();
> -    }
> -
> -    if (ram_size >= 0xe0000000 ) {
> -        above_4g_mem_size = ram_size - 0xe0000000;
> -        below_4g_mem_size = 0xe0000000;
> -    } else {
> -        above_4g_mem_size = 0;
> -        below_4g_mem_size = ram_size;
> -    }
> -
> -    if (pci_enabled) {
> -        pci_memory = g_new(MemoryRegion, 1);
> -        memory_region_init(pci_memory, "pci", INT64_MAX);
> -        rom_memory = pci_memory;
> -    } else {
> -        pci_memory = NULL;
> -        rom_memory = system_memory;
> -    }
> -
> -    /* allocate ram and load rom/bios */
> -    if (!xen_enabled()) {
> -        fw_cfg = pc_memory_init(system_memory,
> -                       kernel_filename, kernel_cmdline, initrd_filename,
> -                       below_4g_mem_size, above_4g_mem_size,
> -                       pci_enabled ? rom_memory : system_memory, &ram_memory);
> -    }
> -
> -    gsi_state = g_malloc0(sizeof(*gsi_state));
> -    if (kvm_irqchip_in_kernel()) {
> -        kvm_piix3_setup_irq_routing(pci_enabled);
> -        gsi = qemu_allocate_irqs(kvm_piix3_gsi_handler, gsi_state,
> -                                 GSI_NUM_PINS);
> -    } else {
> -        gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS);
> -    }
> -
> -    if (pci_enabled) {
> -        pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, &isa_bus, gsi,
> -                              system_memory, system_io, ram_size,
> -                              below_4g_mem_size,
> -                              0x100000000ULL - below_4g_mem_size,
> -                              0x100000000ULL + above_4g_mem_size,
> -                              (sizeof(target_phys_addr_t) == 4
> -                               ? 0
> -                               : ((uint64_t)1 << 62)),
> -                              pci_memory, ram_memory);
> -    } else {
> -        pci_bus = NULL;
> -        i440fx_state = NULL;
> -        isa_bus = isa_bus_new(NULL, system_io);
> -        no_hpet = 1;
> -    }
> -    isa_bus_irqs(isa_bus, gsi);
> -
> -    if (kvm_irqchip_in_kernel()) {
> -        i8259 = kvm_i8259_init(isa_bus);
> -    } else if (xen_enabled()) {
> -        i8259 = xen_interrupt_controller_init();
> -    } else {
> -        cpu_irq = pc_allocate_cpu_irq();
> -        i8259 = i8259_init(isa_bus, cpu_irq[0]);
> -    }
> -
> -    for (i = 0; i < ISA_NUM_IRQS; i++) {
> -        gsi_state->i8259_irq[i] = i8259[i];
> -    }
> -    if (pci_enabled) {
> -        ioapic_init(gsi_state);
> -    }
> -
> -    pc_register_ferr_irq(gsi[13]);
> -
> -    pc_vga_init(isa_bus, pci_enabled ? pci_bus : NULL);
> -    if (xen_enabled()) {
> -        pci_create_simple(pci_bus, -1, "xen-platform");
> -    }
> -
> -    /* init basic PC hardware */
> -    pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, xen_enabled());
> -
> -    for(i = 0; i < nb_nics; i++) {
> -        NICInfo *nd = &nd_table[i];
> -
> -        if (!pci_enabled || (nd->model && strcmp(nd->model, "ne2k_isa") == 0))
> -            pc_init_ne2k_isa(isa_bus, nd);
> -        else
> -            pci_nic_init_nofail(nd, "e1000", NULL);
> -    }
> -
> -    ide_drive_get(hd, MAX_IDE_BUS);
> -    if (pci_enabled) {
> -        PCIDevice *dev;
> -        if (xen_enabled()) {
> -            dev = pci_piix3_xen_ide_init(pci_bus, hd, piix3_devfn + 1);
> -        } else {
> -            dev = pci_piix3_ide_init(pci_bus, hd, piix3_devfn + 1);
> -        }
> -        idebus[0] = qdev_get_child_bus(&dev->qdev, "ide.0");
> -        idebus[1] = qdev_get_child_bus(&dev->qdev, "ide.1");
> -    } else {
> -        for(i = 0; i < MAX_IDE_BUS; i++) {
> -            ISADevice *dev;
> -            dev = isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i],
> -                               ide_irq[i],
> -                               hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i + 1]);
> -            idebus[i] = qdev_get_child_bus(&dev->qdev, "ide.0");
> -        }
> -    }
> -
> -    audio_init(isa_bus, pci_enabled ? pci_bus : NULL);
> -
> -    pc_cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device,
> -                 floppy, idebus[0], idebus[1], rtc_state);
> -
> -    if (pci_enabled && usb_enabled) {
> -        pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci");
> -    }
> -
> -    if (pci_enabled && acpi_enabled) {
> -        i2c_bus *smbus;
> -
> -        smi_irq = qemu_allocate_irqs(pc_acpi_smi_interrupt, first_cpu, 1);
> -        /* TODO: Populate SPD eeprom data.  */
> -        smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100,
> -                              gsi[9], *smi_irq,
> -                              kvm_enabled(), fw_cfg);
> -        smbus_eeprom_init(smbus, 8, NULL, 0);
> -    }
> -
> -    if (pci_enabled) {
> -        pc_pci_device_init(pci_bus);
> -    }
> -}
> -
> -static void pc_init_pci(ram_addr_t ram_size,
> -                        const char *boot_device,
> -                        const char *kernel_filename,
> -                        const char *kernel_cmdline,
> -                        const char *initrd_filename,
> -                        const char *cpu_model)
> -{
> -    pc_init1(get_system_memory(),
> -             get_system_io(),
> -             ram_size, boot_device,
> -             kernel_filename, kernel_cmdline,
> -             initrd_filename, cpu_model, 1, 1);
> -}
> -
> -static void pc_init_pci_no_kvmclock(ram_addr_t ram_size,
> -                                    const char *boot_device,
> -                                    const char *kernel_filename,
> -                                    const char *kernel_cmdline,
> -                                    const char *initrd_filename,
> -                                    const char *cpu_model)
> -{
> -    pc_init1(get_system_memory(),
> -             get_system_io(),
> -             ram_size, boot_device,
> -             kernel_filename, kernel_cmdline,
> -             initrd_filename, cpu_model, 1, 0);
> -}
> -
> -static void pc_init_isa(ram_addr_t ram_size,
> -                        const char *boot_device,
> -                        const char *kernel_filename,
> -                        const char *kernel_cmdline,
> -                        const char *initrd_filename,
> -                        const char *cpu_model)
> -{
> -    if (cpu_model == NULL)
> -        cpu_model = "486";
> -    pc_init1(get_system_memory(),
> -             get_system_io(),
> -             ram_size, boot_device,
> -             kernel_filename, kernel_cmdline,
> -             initrd_filename, cpu_model, 0, 1);
> -}
> -
> -#ifdef CONFIG_XEN
> -static void pc_xen_hvm_init(ram_addr_t ram_size,
> -                            const char *boot_device,
> -                            const char *kernel_filename,
> -                            const char *kernel_cmdline,
> -                            const char *initrd_filename,
> -                            const char *cpu_model)
> -{
> -    if (xen_hvm_init() != 0) {
> -        hw_error("xen hardware virtual machine initialisation failed");
> -    }
> -    pc_init_pci_no_kvmclock(ram_size, boot_device,
> -                            kernel_filename, kernel_cmdline,
> -                            initrd_filename, cpu_model);
> -    xen_vcpu_init();
> -}
> -#endif
> -
> -static QEMUMachine pc_machine_v1_2 = {
> -    .name = "pc-1.2",
> -    .alias = "pc",
> -    .desc = "Standard PC",
> -    .init = pc_init_pci,
> -    .max_cpus = 255,
> -    .is_default = 1,
> -};
> -
> -#define PC_COMPAT_1_1 \
> -        {\
> -            .driver   = "VGA",\
> -            .property = "vgamem_mb",\
> -            .value    = stringify(8),\
> -        },{\
> -            .driver   = "vmware-svga",\
> -            .property = "vgamem_mb",\
> -            .value    = stringify(8),\
> -        },{\
> -            .driver   = "qxl-vga",\
> -            .property = "vgamem_mb",\
> -            .value    = stringify(8),\
> -        },{\
> -            .driver   = "qxl",\
> -            .property = "vgamem_mb",\
> -            .value    = stringify(8),\
> -        }
> -
> -static QEMUMachine pc_machine_v1_1 = {
> -    .name = "pc-1.1",
> -    .desc = "Standard PC",
> -    .init = pc_init_pci,
> -    .max_cpus = 255,
> -    .compat_props = (GlobalProperty[]) {
> -        PC_COMPAT_1_1,
> -        { /* end of list */ }
> -    },
> -};
> -
> -#define PC_COMPAT_1_0 \
> -        PC_COMPAT_1_1,\
> -        {\
> -            .driver   = "pc-sysfw",\
> -            .property = "rom_only",\
> -            .value    = stringify(1),\
> -        }, {\
> -            .driver   = "isa-fdc",\
> -            .property = "check_media_rate",\
> -            .value    = "off",\
> -        }, {\
> -            .driver   = "virtio-balloon-pci",\
> -            .property = "class",\
> -            .value    = stringify(PCI_CLASS_MEMORY_RAM),\
> -        },{\
> -            .driver   = "apic",\
> -            .property = "vapic",\
> -            .value    = "off",\
> -        },{\
> -            .driver   = TYPE_USB_DEVICE,\
> -            .property = "full-path",\
> -            .value    = "no",\
> -        }
> -
> -static QEMUMachine pc_machine_v1_0 = {
> -    .name = "pc-1.0",
> -    .desc = "Standard PC",
> -    .init = pc_init_pci,
> -    .max_cpus = 255,
> -    .compat_props = (GlobalProperty[]) {
> -        PC_COMPAT_1_0,
> -        { /* end of list */ }
> -    },
> -    .hw_version = "1.0",
> -};
> -
> -#define PC_COMPAT_0_15 \
> -        PC_COMPAT_1_0
> -
> -static QEMUMachine pc_machine_v0_15 = {
> -    .name = "pc-0.15",
> -    .desc = "Standard PC",
> -    .init = pc_init_pci,
> -    .max_cpus = 255,
> -    .compat_props = (GlobalProperty[]) {
> -        PC_COMPAT_0_15,
> -        { /* end of list */ }
> -    },
> -    .hw_version = "0.15",
> -};
> -
> -#define PC_COMPAT_0_14 \
> -        PC_COMPAT_0_15,\
> -        {\
> -            .driver   = "virtio-blk-pci",\
> -            .property = "event_idx",\
> -            .value    = "off",\
> -        },{\
> -            .driver   = "virtio-serial-pci",\
> -            .property = "event_idx",\
> -            .value    = "off",\
> -        },{\
> -            .driver   = "virtio-net-pci",\
> -            .property = "event_idx",\
> -            .value    = "off",\
> -        },{\
> -            .driver   = "virtio-balloon-pci",\
> -            .property = "event_idx",\
> -            .value    = "off",\
> -        }
> -
> -static QEMUMachine pc_machine_v0_14 = {
> -    .name = "pc-0.14",
> -    .desc = "Standard PC",
> -    .init = pc_init_pci,
> -    .max_cpus = 255,
> -    .compat_props = (GlobalProperty[]) {
> -        PC_COMPAT_0_14, 
> -        {
> -            .driver   = "qxl",
> -            .property = "revision",
> -            .value    = stringify(2),
> -        },{
> -            .driver   = "qxl-vga",
> -            .property = "revision",
> -            .value    = stringify(2),
> -        },
> -        { /* end of list */ }
> -    },
> -    .hw_version = "0.14",
> -};
> -
> -#define PC_COMPAT_0_13 \
> -        PC_COMPAT_0_14,\
> -        {\
> -            .driver   = TYPE_PCI_DEVICE,\
> -            .property = "command_serr_enable",\
> -            .value    = "off",\
> -        },{\
> -            .driver   = "AC97",\
> -            .property = "use_broken_id",\
> -            .value    = stringify(1),\
> -        }
> -
> -static QEMUMachine pc_machine_v0_13 = {
> -    .name = "pc-0.13",
> -    .desc = "Standard PC",
> -    .init = pc_init_pci_no_kvmclock,
> -    .max_cpus = 255,
> -    .compat_props = (GlobalProperty[]) {
> -        PC_COMPAT_0_13,
> -        {
> -            .driver   = "virtio-9p-pci",
> -            .property = "vectors",
> -            .value    = stringify(0),
> -        },{
> -            .driver   = "VGA",
> -            .property = "rombar",
> -            .value    = stringify(0),
> -        },{
> -            .driver   = "vmware-svga",
> -            .property = "rombar",
> -            .value    = stringify(0),
> -        },
> -        { /* end of list */ }
> -    },
> -    .hw_version = "0.13",
> -};
> -
> -#define PC_COMPAT_0_12 \
> -        PC_COMPAT_0_13,\
> -        {\
> -            .driver   = "virtio-serial-pci",\
> -            .property = "max_ports",\
> -            .value    = stringify(1),\
> -        },{\
> -            .driver   = "virtio-serial-pci",\
> -            .property = "vectors",\
> -            .value    = stringify(0),\
> -        }
> -
> -static QEMUMachine pc_machine_v0_12 = {
> -    .name = "pc-0.12",
> -    .desc = "Standard PC",
> -    .init = pc_init_pci_no_kvmclock,
> -    .max_cpus = 255,
> -    .compat_props = (GlobalProperty[]) {
> -        PC_COMPAT_0_12,
> -        {
> -            .driver   = "VGA",
> -            .property = "rombar",
> -            .value    = stringify(0),
> -        },{
> -            .driver   = "vmware-svga",
> -            .property = "rombar",
> -            .value    = stringify(0),
> -        },
> -        { /* end of list */ }
> -    },
> -    .hw_version = "0.12",
> -};
> -
> -#define PC_COMPAT_0_11 \
> -        PC_COMPAT_0_12,\
> -        {\
> -            .driver   = "virtio-blk-pci",\
> -            .property = "vectors",\
> -            .value    = stringify(0),\
> -        },{\
> -            .driver   = TYPE_PCI_DEVICE,\
> -            .property = "rombar",\
> -            .value    = stringify(0),\
> -        }
> -
> -static QEMUMachine pc_machine_v0_11 = {
> -    .name = "pc-0.11",
> -    .desc = "Standard PC, qemu 0.11",
> -    .init = pc_init_pci_no_kvmclock,
> -    .max_cpus = 255,
> -    .compat_props = (GlobalProperty[]) {
> -        PC_COMPAT_0_11,
> -        {
> -            .driver   = "ide-drive",
> -            .property = "ver",
> -            .value    = "0.11",
> -        },{
> -            .driver   = "scsi-disk",
> -            .property = "ver",
> -            .value    = "0.11",
> -        },
> -        { /* end of list */ }
> -    },
> -    .hw_version = "0.11",
> -};
> -
> -static QEMUMachine pc_machine_v0_10 = {
> -    .name = "pc-0.10",
> -    .desc = "Standard PC, qemu 0.10",
> -    .init = pc_init_pci_no_kvmclock,
> -    .max_cpus = 255,
> -    .compat_props = (GlobalProperty[]) {
> -        PC_COMPAT_0_11,
> -        {
> -            .driver   = "virtio-blk-pci",
> -            .property = "class",
> -            .value    = stringify(PCI_CLASS_STORAGE_OTHER),
> -        },{
> -            .driver   = "virtio-serial-pci",
> -            .property = "class",
> -            .value    = stringify(PCI_CLASS_DISPLAY_OTHER),
> -        },{
> -            .driver   = "virtio-net-pci",
> -            .property = "vectors",
> -            .value    = stringify(0),
> -        },{
> -            .driver   = "ide-drive",
> -            .property = "ver",
> -            .value    = "0.10",
> -        },{
> -            .driver   = "scsi-disk",
> -            .property = "ver",
> -            .value    = "0.10",
> -        },
> -        { /* end of list */ }
> -    },
> -    .hw_version = "0.10",
> -};
> -
> -static QEMUMachine isapc_machine = {
> -    .name = "isapc",
> -    .desc = "ISA-only PC",
> -    .init = pc_init_isa,
> -    .max_cpus = 1,
> -    .compat_props = (GlobalProperty[]) {
> -        {
> -            .driver   = "pc-sysfw",
> -            .property = "rom_only",
> -            .value    = stringify(1),
> -        },
> -        { /* end of list */ }
> -    },
> -};
> -
> -#ifdef CONFIG_XEN
> -static QEMUMachine xenfv_machine = {
> -    .name = "xenfv",
> -    .desc = "Xen Fully-virtualized PC",
> -    .init = pc_xen_hvm_init,
> -    .max_cpus = HVM_MAX_VCPUS,
> -    .default_machine_opts = "accel=xen",
> -};
> -#endif
> -
> -static void pc_machine_init(void)
> -{
> -    qemu_register_machine(&pc_machine_v1_2);
> -    qemu_register_machine(&pc_machine_v1_1);
> -    qemu_register_machine(&pc_machine_v1_0);
> -    qemu_register_machine(&pc_machine_v0_15);
> -    qemu_register_machine(&pc_machine_v0_14);
> -    qemu_register_machine(&pc_machine_v0_13);
> -    qemu_register_machine(&pc_machine_v0_12);
> -    qemu_register_machine(&pc_machine_v0_11);
> -    qemu_register_machine(&pc_machine_v0_10);
> -    qemu_register_machine(&isapc_machine);
> -#ifdef CONFIG_XEN
> -    qemu_register_machine(&xenfv_machine);
> -#endif
> -}
> -
> -machine_init(pc_machine_init);
> -- 
> 1.7.5.4

Patch

diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index 49b32d0..868020c 100644
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -4,7 +4,6 @@  obj-y += sga.o ioapic_common.o ioapic.o i440fx.o piix3.o
 obj-y += vmport.o
 obj-y += pci-hotplug.o smbios.o wdt_ib700.o
 obj-y += debugcon.o multiboot.o
-obj-y += pc_piix.o
 obj-y += pc_sysfw.o
 obj-$(CONFIG_XEN) += xen_platform.o xen_apic.o
 obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o
diff --git a/hw/pc.c b/hw/pc.c
index c7e9ab3..7c04339 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -27,6 +27,7 @@ 
 #include "fdc.h"
 #include "ide.h"
 #include "pci.h"
+#include "usb.h"
 #include "vmware_vga.h"
 #include "monitor.h"
 #include "fw_cfg.h"
@@ -47,7 +48,10 @@ 
 #include "ui/qemu-spice.h"
 #include "memory.h"
 #include "exec-memory.h"
+#include "kvm/clock.h"
 #include "arch_init.h"
+#include "smbus.h"
+#include "boards.h"
 
 /* output Bochs bios info messages */
 //#define DEBUG_BIOS
@@ -75,6 +79,8 @@ 
 
 #define E820_NR_ENTRIES		16
 
+#define MAX_IDE_BUS 2
+
 struct e820_entry {
     uint64_t address;
     uint64_t length;
@@ -86,10 +92,14 @@  struct e820_table {
     struct e820_entry entry[E820_NR_ENTRIES];
 } QEMU_PACKED __attribute((__aligned__(4)));
 
+static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 };
+static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };
+static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
+
 static struct e820_table e820_table;
 struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX};
 
-void gsi_handler(void *opaque, int n, int level)
+static void gsi_handler(void *opaque, int n, int level)
 {
     GSIState *s = opaque;
 
@@ -107,7 +117,7 @@  static void ioport80_write(void *opaque, uint32_t addr, uint32_t data)
 /* MSDOS compatibility mode FPU exception support */
 static qemu_irq ferr_irq;
 
-void pc_register_ferr_irq(qemu_irq irq)
+static void pc_register_ferr_irq(qemu_irq irq)
 {
     ferr_irq = irq;
 }
@@ -330,7 +340,7 @@  static void pc_cmos_init_late(void *opaque)
     qemu_unregister_reset(pc_cmos_init_late, opaque);
 }
 
-void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
+static void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
                   const char *boot_device,
                   ISADevice *floppy, BusState *idebus0, BusState *idebus1,
                   ISADevice *s)
@@ -860,7 +870,7 @@  static const int ne2000_irq[NE2000_NB_MAX] = { 9, 10, 11, 3, 4, 5 };
 static const int parallel_io[MAX_PARALLEL_PORTS] = { 0x378, 0x278, 0x3bc };
 static const int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 };
 
-void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd)
+static void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd)
 {
     static int nb_ne2k = 0;
 
@@ -915,7 +925,7 @@  static DeviceState *apic_init(void *env, uint8_t apic_id)
     return dev;
 }
 
-void pc_acpi_smi_interrupt(void *opaque, int irq, int level)
+static void pc_acpi_smi_interrupt(void *opaque, int irq, int level)
 {
     CPUX86State *s = opaque;
 
@@ -952,7 +962,7 @@  static X86CPU *pc_new_cpu(const char *cpu_model)
     return cpu;
 }
 
-void pc_cpus_init(const char *cpu_model)
+static void pc_cpus_init(const char *cpu_model)
 {
     int i;
 
@@ -970,55 +980,18 @@  void pc_cpus_init(const char *cpu_model)
     }
 }
 
-void *pc_memory_init(MemoryRegion *system_memory,
+static void *pc_memory_init(MemoryRegion *system_memory,
                     const char *kernel_filename,
                     const char *kernel_cmdline,
                     const char *initrd_filename,
                     ram_addr_t below_4g_mem_size,
-                    ram_addr_t above_4g_mem_size,
-                    MemoryRegion *rom_memory,
-                    MemoryRegion **ram_memory)
+                    ram_addr_t above_4g_mem_size)
 {
     int linux_boot, i;
-    MemoryRegion *ram, *option_rom_mr;
-    MemoryRegion *ram_below_4g, *ram_above_4g;
     void *fw_cfg;
 
     linux_boot = (kernel_filename != NULL);
 
-    /* Allocate RAM.  We allocate it as a single memory region and use
-     * aliases to address portions of it, mostly for backwards compatibility
-     * with older qemus that used qemu_ram_alloc().
-     */
-    ram = g_malloc(sizeof(*ram));
-    memory_region_init_ram(ram, "pc.ram",
-                           below_4g_mem_size + above_4g_mem_size);
-    vmstate_register_ram_global(ram);
-    *ram_memory = ram;
-    ram_below_4g = g_malloc(sizeof(*ram_below_4g));
-    memory_region_init_alias(ram_below_4g, "ram-below-4g", ram,
-                             0, below_4g_mem_size);
-    memory_region_add_subregion(system_memory, 0, ram_below_4g);
-    if (above_4g_mem_size > 0) {
-        ram_above_4g = g_malloc(sizeof(*ram_above_4g));
-        memory_region_init_alias(ram_above_4g, "ram-above-4g", ram,
-                                 below_4g_mem_size, above_4g_mem_size);
-        memory_region_add_subregion(system_memory, 0x100000000ULL,
-                                    ram_above_4g);
-    }
-
-
-    /* Initialize PC system firmware */
-    pc_system_firmware_init(rom_memory);
-
-    option_rom_mr = g_malloc(sizeof(*option_rom_mr));
-    memory_region_init_ram(option_rom_mr, "pc.rom", PC_ROM_SIZE);
-    vmstate_register_ram_global(option_rom_mr);
-    memory_region_add_subregion_overlap(rom_memory,
-                                        PC_ROM_MIN_VGA,
-                                        option_rom_mr,
-                                        1);
-
     fw_cfg = bochs_bios_init();
     rom_set_fw(fw_cfg);
 
@@ -1032,12 +1005,12 @@  void *pc_memory_init(MemoryRegion *system_memory,
     return fw_cfg;
 }
 
-qemu_irq *pc_allocate_cpu_irq(void)
+static qemu_irq *pc_allocate_cpu_irq(void)
 {
     return qemu_allocate_irqs(pic_irq_request, NULL, 1);
 }
 
-DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus)
+static DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus)
 {
     DeviceState *dev = NULL;
 
@@ -1081,60 +1054,20 @@  static void cpu_request_exit(void *opaque, int irq, int level)
     }
 }
 
-void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
-                          ISADevice **rtc_state,
+static void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
                           ISADevice **floppy,
                           bool no_vmport)
 {
     int i;
     DriveInfo *fd[MAX_FD];
-    DeviceState *hpet = NULL;
-    int pit_isa_irq = 0;
-    qemu_irq pit_alt_irq = NULL;
-    qemu_irq rtc_irq = NULL;
     qemu_irq *a20_line;
-    ISADevice *i8042, *port92, *vmmouse, *pit = NULL;
+    ISADevice *i8042, *port92, *vmmouse;
     qemu_irq *cpu_exit_irq;
 
     register_ioport_write(0x80, 1, 1, ioport80_write, NULL);
 
     register_ioport_write(0xf0, 1, 1, ioportF0_write, NULL);
 
-    /*
-     * Check if an HPET shall be created.
-     *
-     * Without KVM_CAP_PIT_STATE2, we cannot switch off the in-kernel PIT
-     * when the HPET wants to take over. Thus we have to disable the latter.
-     */
-    if (!no_hpet && (!kvm_irqchip_in_kernel() || kvm_has_pit_state2())) {
-        hpet = sysbus_try_create_simple("hpet", HPET_BASE, NULL);
-
-        if (hpet) {
-            for (i = 0; i < GSI_NUM_PINS; i++) {
-                sysbus_connect_irq(sysbus_from_qdev(hpet), i, gsi[i]);
-            }
-            pit_isa_irq = -1;
-            pit_alt_irq = qdev_get_gpio_in(hpet, HPET_LEGACY_PIT_INT);
-            rtc_irq = qdev_get_gpio_in(hpet, HPET_LEGACY_RTC_INT);
-        }
-    }
-    *rtc_state = rtc_init(isa_bus, 2000, rtc_irq);
-
-    qemu_register_boot_set(pc_boot_set, *rtc_state);
-
-    if (!xen_enabled()) {
-        if (kvm_irqchip_in_kernel()) {
-            pit = kvm_pit_init(isa_bus, 0x40);
-        } else {
-            pit = pit_init(isa_bus, 0x40, pit_isa_irq, pit_alt_irq);
-        }
-        if (hpet) {
-            /* connect PIT to output control line of the HPET */
-            qdev_connect_gpio_out(hpet, 0, qdev_get_gpio_in(&pit->qdev, 0));
-        }
-        pcspk_init(isa_bus, pit);
-    }
-
     for(i = 0; i < MAX_SERIAL_PORTS; i++) {
         if (serial_hds[i]) {
             serial_isa_init(isa_bus, i, serial_hds[i]);
@@ -1172,7 +1105,7 @@  void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
     *floppy = fdctrl_init_isa(isa_bus, fd);
 }
 
-void pc_pci_device_init(PCIBus *pci_bus)
+static void pc_pci_device_init(PCIBus *pci_bus)
 {
     int max_bus;
     int bus;
@@ -1182,3 +1115,643 @@  void pc_pci_device_init(PCIBus *pci_bus)
         pci_create_simple(pci_bus, -1, "lsi53c895a");
     }
 }
+
+static void kvm_piix3_setup_irq_routing(bool pci_enabled)
+{
+#ifdef CONFIG_KVM
+    KVMState *s = kvm_state;
+    int i;
+
+    if (kvm_check_extension(s, KVM_CAP_IRQ_ROUTING)) {
+        for (i = 0; i < 8; ++i) {
+            if (i == 2) {
+                continue;
+            }
+            kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_PIC_MASTER, i);
+        }
+        for (i = 8; i < 16; ++i) {
+            kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_PIC_SLAVE, i - 8);
+        }
+        if (pci_enabled) {
+            for (i = 0; i < 24; ++i) {
+                if (i == 0) {
+                    kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_IOAPIC, 2);
+                } else if (i != 2) {
+                    kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_IOAPIC, i);
+                }
+            }
+        }
+    }
+#endif /* CONFIG_KVM */
+}
+
+static void kvm_piix3_gsi_handler(void *opaque, int n, int level)
+{
+    GSIState *s = opaque;
+
+    if (n < ISA_NUM_IRQS) {
+        /* Kernel will forward to both PIC and IOAPIC */
+        qemu_set_irq(s->i8259_irq[n], level);
+    } else {
+        qemu_set_irq(s->ioapic_irq[n], level);
+    }
+}
+
+static void ioapic_init(GSIState *gsi_state)
+{
+    DeviceState *dev;
+    SysBusDevice *d;
+    unsigned int i;
+
+    if (kvm_irqchip_in_kernel()) {
+        dev = qdev_create(NULL, "kvm-ioapic");
+    } else {
+        dev = qdev_create(NULL, "ioapic");
+    }
+    /* FIXME: this should be under piix3
+    object_property_add_child(object_resolve_path("i440fx", NULL),
+                                               "ioapic", OBJECT(dev), NULL);*/
+    qdev_init_nofail(dev);
+    d = sysbus_from_qdev(dev);
+    sysbus_mmio_map(d, 0, 0xfec00000);
+
+    for (i = 0; i < IOAPIC_NUM_PINS; i++) {
+        gsi_state->ioapic_irq[i] = qdev_get_gpio_in(dev, i);
+    }
+}
+
+static PCIBus *i440fx_init(I440FXPMCState **pi440fx_state, int *piix3_devfn,
+                           ISABus **isa_bus, qemu_irq *pic,
+                           MemoryRegion *address_space_mem,
+                           MemoryRegion *address_space_io,
+                           ram_addr_t ram_size,
+                           const char *bios_name)
+{
+    I440FXState *s;
+    PCIHostState *h;
+
+    s = I440FX(object_new(TYPE_I440FX));
+    h = PCI_HOST(s);
+
+    /* FIXME make a properties */
+    h->address_space = address_space_mem;
+    s->address_space_io = address_space_io;
+    s->piix3.pic = pic;
+    if (bios_name) {
+        g_free(s->bios_name);
+        s->bios_name = g_strdup(bios_name);
+    }
+    s->pmc.ram_size = ram_size;
+
+    qdev_set_parent_bus(DEVICE(s), sysbus_get_default());
+    qdev_init_nofail(DEVICE(s));
+
+    *isa_bus = s->piix3.bus;
+    *pi440fx_state = &s->pmc;
+    *piix3_devfn = s->piix3.dev.devfn;
+
+    return h->bus;
+}
+
+/* PC hardware initialisation */
+static void pc_init1(MemoryRegion *system_memory,
+                     MemoryRegion *system_io,
+                     ram_addr_t ram_size,
+                     const char *boot_device,
+                     const char *kernel_filename,
+                     const char *kernel_cmdline,
+                     const char *initrd_filename,
+                     const char *cpu_model,
+                     int pci_enabled,
+                     int kvmclock_enabled)
+{
+    int i;
+    ram_addr_t below_4g_mem_size, above_4g_mem_size;
+    PCIBus *pci_bus;
+    ISABus *isa_bus;
+    I440FXPMCState *i440fx_state;
+    int piix3_devfn = -1;
+    qemu_irq *cpu_irq;
+    qemu_irq *gsi;
+    qemu_irq *i8259;
+    qemu_irq *smi_irq;
+    GSIState *gsi_state;
+    DriveInfo * hd[MAX_IDE_BUS * MAX_IDE_DEVS];
+    BusState *idebus[MAX_IDE_BUS];
+    ISADevice *rtc_state;
+    ISADevice *floppy;
+
+    void *fw_cfg = NULL;
+
+    pc_cpus_init(cpu_model);
+
+    if (kvmclock_enabled) {
+        kvmclock_create();
+    }
+
+    if (ram_size >= 0xe0000000) {
+        above_4g_mem_size = ram_size - 0xe0000000;
+        below_4g_mem_size = 0xe0000000;
+    } else {
+        above_4g_mem_size = 0;
+        below_4g_mem_size = ram_size;
+    }
+
+    /* allocate ram and load rom/bios */
+    if (!xen_enabled()) {
+        pc_memory_init(system_memory,
+                       kernel_filename, kernel_cmdline, initrd_filename,
+                       below_4g_mem_size, above_4g_mem_size);
+    }
+
+    gsi_state = g_malloc0(sizeof(*gsi_state));
+    if (kvm_irqchip_in_kernel()) {
+        kvm_piix3_setup_irq_routing(pci_enabled);
+        gsi = qemu_allocate_irqs(kvm_piix3_gsi_handler, gsi_state,
+                                 GSI_NUM_PINS);
+    } else {
+        gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS);
+    }
+
+    if (pci_enabled) {
+        pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, &isa_bus, gsi,
+                              system_memory, system_io, ram_size,
+                              bios_name);
+    } else {
+        pci_bus = NULL;
+        i440fx_state = NULL;
+        isa_bus = isa_bus_new(NULL, system_io);
+        no_hpet = 1;
+    }
+    isa_bus_irqs(isa_bus, gsi);
+
+    if (kvm_irqchip_in_kernel()) {
+        i8259 = kvm_i8259_init(isa_bus);
+    } else if (xen_enabled()) {
+        i8259 = xen_interrupt_controller_init();
+    } else {
+        cpu_irq = pc_allocate_cpu_irq();
+        i8259 = i8259_init(isa_bus, cpu_irq[0]);
+    }
+
+    for (i = 0; i < ISA_NUM_IRQS; i++) {
+        gsi_state->i8259_irq[i] = i8259[i];
+    }
+    if (pci_enabled) {
+        ioapic_init(gsi_state);
+    }
+
+    pc_register_ferr_irq(gsi[13]);
+
+    pc_vga_init(isa_bus, pci_enabled ? pci_bus : NULL);
+    if (xen_enabled()) {
+        pci_create_simple(pci_bus, -1, "xen-platform");
+    }
+
+    /* init basic PC hardware */
+    pc_basic_device_init(isa_bus, gsi, &floppy, xen_enabled());
+
+    for (i = 0; i < nb_nics; i++) {
+        NICInfo *nd = &nd_table[i];
+
+        if (!pci_enabled || (nd->model && strcmp(nd->model, "ne2k_isa") == 0)) {
+            pc_init_ne2k_isa(isa_bus, nd);
+        } else {
+            pci_nic_init_nofail(nd, "e1000", NULL);
+        }
+    }
+
+    ide_drive_get(hd, MAX_IDE_BUS);
+    if (pci_enabled) {
+        PCIDevice *dev;
+        if (xen_enabled()) {
+            dev = pci_piix3_xen_ide_init(pci_bus, hd, piix3_devfn + 1);
+        } else {
+            dev = pci_piix3_ide_init(pci_bus, hd, piix3_devfn + 1);
+        }
+        idebus[0] = qdev_get_child_bus(&dev->qdev, "ide.0");
+        idebus[1] = qdev_get_child_bus(&dev->qdev, "ide.1");
+    } else {
+        for (i = 0; i < MAX_IDE_BUS; i++) {
+            ISADevice *dev;
+            dev = isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i],
+                               ide_irq[i],
+                               hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i + 1]);
+            idebus[i] = qdev_get_child_bus(&dev->qdev, "ide.0");
+        }
+    }
+
+    /* FIXME */
+    rtc_state = ISA_DEVICE(object_resolve_path("rtc", NULL));
+    qemu_register_boot_set(pc_boot_set, rtc_state);
+
+    audio_init(isa_bus, pci_enabled ? pci_bus : NULL);
+
+    pc_cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device,
+                 floppy, idebus[0], idebus[1], rtc_state);
+
+    if (pci_enabled && usb_enabled) {
+        pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci");
+    }
+
+    if (pci_enabled && acpi_enabled) {
+        i2c_bus *smbus;
+
+        smi_irq = qemu_allocate_irqs(pc_acpi_smi_interrupt, first_cpu, 1);
+        /* TODO: Populate SPD eeprom data.  */
+        smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100,
+                              gsi[9], *smi_irq,
+                              kvm_enabled(), fw_cfg);
+        smbus_eeprom_init(smbus, 8, NULL, 0);
+    }
+
+    if (pci_enabled) {
+        pc_pci_device_init(pci_bus);
+    }
+}
+
+static void pc_init_pci(ram_addr_t ram_size,
+                        const char *boot_device,
+                        const char *kernel_filename,
+                        const char *kernel_cmdline,
+                        const char *initrd_filename,
+                        const char *cpu_model)
+{
+    pc_init1(get_system_memory(),
+             get_system_io(),
+             ram_size, boot_device,
+             kernel_filename, kernel_cmdline,
+             initrd_filename, cpu_model, 1, 1);
+}
+
+static void pc_init_pci_no_kvmclock(ram_addr_t ram_size,
+                                    const char *boot_device,
+                                    const char *kernel_filename,
+                                    const char *kernel_cmdline,
+                                    const char *initrd_filename,
+                                    const char *cpu_model)
+{
+    pc_init1(get_system_memory(),
+             get_system_io(),
+             ram_size, boot_device,
+             kernel_filename, kernel_cmdline,
+             initrd_filename, cpu_model, 1, 0);
+}
+
+static void pc_init_isa(ram_addr_t ram_size,
+                        const char *boot_device,
+                        const char *kernel_filename,
+                        const char *kernel_cmdline,
+                        const char *initrd_filename,
+                        const char *cpu_model)
+{
+    if (cpu_model == NULL) {
+        cpu_model = "486";
+    }
+    pc_init1(get_system_memory(),
+             get_system_io(),
+             ram_size, boot_device,
+             kernel_filename, kernel_cmdline,
+             initrd_filename, cpu_model, 0, 1);
+}
+
+#ifdef CONFIG_XEN
+static void pc_xen_hvm_init(ram_addr_t ram_size,
+                            const char *boot_device,
+                            const char *kernel_filename,
+                            const char *kernel_cmdline,
+                            const char *initrd_filename,
+                            const char *cpu_model)
+{
+    if (xen_hvm_init() != 0) {
+        hw_error("xen hardware virtual machine initialisation failed");
+    }
+    pc_init_pci_no_kvmclock(ram_size, boot_device,
+                            kernel_filename, kernel_cmdline,
+                            initrd_filename, cpu_model);
+    xen_vcpu_init();
+}
+#endif
+
+static QEMUMachine pc_machine_v1_2 = {
+    .name = "pc-1.2",
+    .alias = "pc",
+    .desc = "Standard PC",
+    .init = pc_init_pci,
+    .max_cpus = 255,
+    .is_default = 1,
+};
+
+#define PC_COMPAT_1_1 \
+do {
+        {\
+            .driver   = "VGA",\
+            .property = "vgamem_mb",\
+            .value    = stringify(8),\
+        },{\
+            .driver   = "vmware-svga",\
+            .property = "vgamem_mb",\
+            .value    = stringify(8),\
+        },{\
+            .driver   = "qxl-vga",\
+            .property = "vgamem_mb",\
+            .value    = stringify(8),\
+        },{\
+            .driver   = "qxl",\
+            .property = "vgamem_mb",\
+            .value    = stringify(8),\
+        }
+} while (0)
+
+static QEMUMachine pc_machine_v1_1 = {
+    .name = "pc-1.1",
+    .desc = "Standard PC",
+    .init = pc_init_pci,
+    .max_cpus = 255,
+    .compat_props = (GlobalProperty[]) {
+        PC_COMPAT_1_1,
+        { /* end of list */ }
+    },
+};
+
+#define PC_COMPAT_1_0 \
+do {
+        PC_COMPAT_1_1,\
+        {\
+            .driver   = "pc-sysfw",\
+            .property = "rom_only",\
+            .value    = stringify(1),\
+        }, {\
+            .driver   = "isa-fdc",\
+            .property = "check_media_rate",\
+            .value    = "off",\
+        }, {\
+            .driver   = "virtio-balloon-pci",\
+            .property = "class",\
+            .value    = stringify(PCI_CLASS_MEMORY_RAM),\
+        },{\
+            .driver   = "apic",\
+            .property = "vapic",\
+            .value    = "off",\
+        },{\
+            .driver   = TYPE_USB_DEVICE,\
+            .property = "full-path",\
+            .value    = "no",\
+        }
+} while (0)
+
+static QEMUMachine pc_machine_v1_0 = {
+    .name = "pc-1.0",
+    .desc = "Standard PC",
+    .init = pc_init_pci,
+    .max_cpus = 255,
+    .compat_props = (GlobalProperty[]) {
+        PC_COMPAT_1_0,
+        { /* end of list */ }
+    },
+    .hw_version = "1.0",
+};
+
+#define PC_COMPAT_0_15 \
+        PC_COMPAT_1_0
+
+static QEMUMachine pc_machine_v0_15 = {
+    .name = "pc-0.15",
+    .desc = "Standard PC",
+    .init = pc_init_pci,
+    .max_cpus = 255,
+    .compat_props = (GlobalProperty[]) {
+        PC_COMPAT_0_15,
+        { /* end of list */ }
+    },
+    .hw_version = "0.15",
+};
+
+#define PC_COMPAT_0_14 \
+do {
+        PC_COMPAT_0_15,\
+        {\
+            .driver   = "virtio-blk-pci",\
+            .property = "event_idx",\
+            .value    = "off",\
+        },{\
+            .driver   = "virtio-serial-pci",\
+            .property = "event_idx",\
+            .value    = "off",\
+        },{\
+            .driver   = "virtio-net-pci",\
+            .property = "event_idx",\
+            .value    = "off",\
+        },{\
+            .driver   = "virtio-balloon-pci",\
+            .property = "event_idx",\
+            .value    = "off",\
+        }
+} while (0)
+
+static QEMUMachine pc_machine_v0_14 = {
+    .name = "pc-0.14",
+    .desc = "Standard PC",
+    .init = pc_init_pci,
+    .max_cpus = 255,
+    .compat_props = (GlobalProperty[]) {
+        PC_COMPAT_0_14,
+        {
+            .driver   = "qxl",
+            .property = "revision",
+            .value    = stringify(2),
+        },{
+            .driver   = "qxl-vga",
+            .property = "revision",
+            .value    = stringify(2),
+        },
+        { /* end of list */ }
+    },
+    .hw_version = "0.14",
+};
+
+#define PC_COMPAT_0_13 \
+do {
+        PC_COMPAT_0_14,\
+        {\
+            .driver   = TYPE_PCI_DEVICE,\
+            .property = "command_serr_enable",\
+            .value    = "off",\
+        },{\
+            .driver   = "AC97",\
+            .property = "use_broken_id",\
+            .value    = stringify(1),\
+        }
+} while (0)
+
+static QEMUMachine pc_machine_v0_13 = {
+    .name = "pc-0.13",
+    .desc = "Standard PC",
+    .init = pc_init_pci_no_kvmclock,
+    .max_cpus = 255,
+    .compat_props = (GlobalProperty[]) {
+        PC_COMPAT_0_13,
+        {
+            .driver   = "virtio-9p-pci",
+            .property = "vectors",
+            .value    = stringify(0),
+        },{
+            .driver   = "VGA",
+            .property = "rombar",
+            .value    = stringify(0),
+        },{
+            .driver   = "vmware-svga",
+            .property = "rombar",
+            .value    = stringify(0),
+        },
+        { /* end of list */ }
+    },
+    .hw_version = "0.13",
+};
+
+#define PC_COMPAT_0_12 \
+do {
+        PC_COMPAT_0_13,\
+        {\
+            .driver   = "virtio-serial-pci",\
+            .property = "max_ports",\
+            .value    = stringify(1),\
+        },{\
+            .driver   = "virtio-serial-pci",\
+            .property = "vectors",\
+            .value    = stringify(0),\
+        }
+} while (0)
+
+static QEMUMachine pc_machine_v0_12 = {
+    .name = "pc-0.12",
+    .desc = "Standard PC",
+    .init = pc_init_pci_no_kvmclock,
+    .max_cpus = 255,
+    .compat_props = (GlobalProperty[]) {
+        PC_COMPAT_0_12,
+        {
+            .driver   = "VGA",
+            .property = "rombar",
+            .value    = stringify(0),
+        },{
+            .driver   = "vmware-svga",
+            .property = "rombar",
+            .value    = stringify(0),
+        },
+        { /* end of list */ }
+    },
+    .hw_version = "0.12",
+};
+
+#define PC_COMPAT_0_11 \
+do {
+        PC_COMPAT_0_12,\
+        {\
+            .driver   = "virtio-blk-pci",\
+            .property = "vectors",\
+            .value    = stringify(0),\
+        },{\
+            .driver   = TYPE_PCI_DEVICE,\
+            .property = "rombar",\
+            .value    = stringify(0),\
+        }
+} while (0)
+
+static QEMUMachine pc_machine_v0_11 = {
+    .name = "pc-0.11",
+    .desc = "Standard PC, qemu 0.11",
+    .init = pc_init_pci_no_kvmclock,
+    .max_cpus = 255,
+    .compat_props = (GlobalProperty[]) {
+        PC_COMPAT_0_11,
+        {
+            .driver   = "ide-drive",
+            .property = "ver",
+            .value    = "0.11",
+        },{
+            .driver   = "scsi-disk",
+            .property = "ver",
+            .value    = "0.11",
+        },
+        { /* end of list */ }
+    },
+    .hw_version = "0.11",
+};
+
+static QEMUMachine pc_machine_v0_10 = {
+    .name = "pc-0.10",
+    .desc = "Standard PC, qemu 0.10",
+    .init = pc_init_pci_no_kvmclock,
+    .max_cpus = 255,
+    .compat_props = (GlobalProperty[]) {
+        PC_COMPAT_0_11,
+        {
+            .driver   = "virtio-blk-pci",
+            .property = "class",
+            .value    = stringify(PCI_CLASS_STORAGE_OTHER),
+        },{
+            .driver   = "virtio-serial-pci",
+            .property = "class",
+            .value    = stringify(PCI_CLASS_DISPLAY_OTHER),
+        },{
+            .driver   = "virtio-net-pci",
+            .property = "vectors",
+            .value    = stringify(0),
+        },{
+            .driver   = "ide-drive",
+            .property = "ver",
+            .value    = "0.10",
+        },{
+            .driver   = "scsi-disk",
+            .property = "ver",
+            .value    = "0.10",
+        },
+        { /* end of list */ }
+    },
+    .hw_version = "0.10",
+};
+
+static QEMUMachine isapc_machine = {
+    .name = "isapc",
+    .desc = "ISA-only PC",
+    .init = pc_init_isa,
+    .max_cpus = 1,
+    .compat_props = (GlobalProperty[]) {
+        {
+            .driver   = "pc-sysfw",
+            .property = "rom_only",
+            .value    = stringify(1),
+        },
+        { /* end of list */ }
+    },
+};
+
+#ifdef CONFIG_XEN
+static QEMUMachine xenfv_machine = {
+    .name = "xenfv",
+    .desc = "Xen Fully-virtualized PC",
+    .init = pc_xen_hvm_init,
+    .max_cpus = HVM_MAX_VCPUS,
+    .default_machine_opts = "accel=xen",
+};
+#endif
+
+static void pc_machine_init(void)
+{
+    qemu_register_machine(&pc_machine_v1_2);
+    qemu_register_machine(&pc_machine_v1_1);
+    qemu_register_machine(&pc_machine_v1_0);
+    qemu_register_machine(&pc_machine_v0_15);
+    qemu_register_machine(&pc_machine_v0_14);
+    qemu_register_machine(&pc_machine_v0_13);
+    qemu_register_machine(&pc_machine_v0_12);
+    qemu_register_machine(&pc_machine_v0_11);
+    qemu_register_machine(&pc_machine_v0_10);
+    qemu_register_machine(&isapc_machine);
+#ifdef CONFIG_XEN
+    qemu_register_machine(&xenfv_machine);
+#endif
+}
+
+machine_init(pc_machine_init);
diff --git a/hw/pc.h b/hw/pc.h
index 31ccb6f..7b56a1c 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -9,6 +9,7 @@ 
 #include "net.h"
 #include "memory.h"
 #include "ioapic.h"
+#include "i440fx.h"
 
 /* PC-style peripherals (also used by other machines).  */
 
@@ -79,8 +80,6 @@  typedef struct GSIState {
     qemu_irq ioapic_irq[IOAPIC_NUM_PINS];
 } GSIState;
 
-void gsi_handler(void *opaque, int n, int level);
-
 /* vmport.c */
 static inline void vmport_init(ISABus *bus)
 {
@@ -102,31 +101,6 @@  void i8042_setup_a20_line(ISADevice *dev, qemu_irq *a20_out);
 /* pc.c */
 extern int fd_bootchk;
 
-void pc_register_ferr_irq(qemu_irq irq);
-void pc_acpi_smi_interrupt(void *opaque, int irq, int level);
-
-void pc_cpus_init(const char *cpu_model);
-void *pc_memory_init(MemoryRegion *system_memory,
-                    const char *kernel_filename,
-                    const char *kernel_cmdline,
-                    const char *initrd_filename,
-                    ram_addr_t below_4g_mem_size,
-                    ram_addr_t above_4g_mem_size,
-                    MemoryRegion *rom_memory,
-                    MemoryRegion **ram_memory);
-qemu_irq *pc_allocate_cpu_irq(void);
-DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus);
-void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
-                          ISADevice **rtc_state,
-                          ISADevice **floppy,
-                          bool no_vmport);
-void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd);
-void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
-                  const char *boot_device,
-                  ISADevice *floppy, BusState *ide0, BusState *ide1,
-                  ISADevice *s);
-void pc_pci_device_init(PCIBus *pci_bus);
-
 typedef void (*cpu_set_smm_t)(int smm, void *arg);
 void cpu_smm_register(cpu_set_smm_t callback, void *arg);
 
@@ -148,21 +122,9 @@  void piix4_smbus_register_device(SMBusDevice *dev, uint8_t addr);
 /* hpet.c */
 extern int no_hpet;
 
-/* piix_pci.c */
-struct PCII440FXState;
-typedef struct PCII440FXState PCII440FXState;
-
-PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix_devfn,
-                    ISABus **isa_bus, qemu_irq *pic,
-                    MemoryRegion *address_space_mem,
-                    MemoryRegion *address_space_io,
-                    ram_addr_t ram_size,
-                    target_phys_addr_t pci_hole_start,
-                    target_phys_addr_t pci_hole_size,
-                    target_phys_addr_t pci_hole64_start,
-                    target_phys_addr_t pci_hole64_size,
-                    MemoryRegion *pci_memory,
-                    MemoryRegion *ram_memory);
+/* pcspk.c */
+void pcskp_init(ISADevice *pit);
+int pcskp_audio_init(qemu_irq *pic);
 
 /* piix4.c */
 extern PCIDevice *piix4_dev;
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
deleted file mode 100644
index 0c0096f..0000000
--- a/hw/pc_piix.c
+++ /dev/null
@@ -1,661 +0,0 @@ 
-/*
- * QEMU PC System Emulator
- *
- * Copyright (c) 2003-2004 Fabrice Bellard
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <glib.h>
-
-#include "hw.h"
-#include "pc.h"
-#include "apic.h"
-#include "pci.h"
-#include "pci_ids.h"
-#include "usb.h"
-#include "net.h"
-#include "boards.h"
-#include "ide.h"
-#include "kvm.h"
-#include "kvm/clock.h"
-#include "sysemu.h"
-#include "sysbus.h"
-#include "arch_init.h"
-#include "blockdev.h"
-#include "smbus.h"
-#include "xen.h"
-#include "memory.h"
-#include "exec-memory.h"
-#ifdef CONFIG_XEN
-#  include <xen/hvm/hvm_info_table.h>
-#endif
-
-#define MAX_IDE_BUS 2
-
-static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 };
-static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };
-static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
-
-static void kvm_piix3_setup_irq_routing(bool pci_enabled)
-{
-#ifdef CONFIG_KVM
-    KVMState *s = kvm_state;
-    int i;
-
-    if (kvm_check_extension(s, KVM_CAP_IRQ_ROUTING)) {
-        for (i = 0; i < 8; ++i) {
-            if (i == 2) {
-                continue;
-            }
-            kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_PIC_MASTER, i);
-        }
-        for (i = 8; i < 16; ++i) {
-            kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_PIC_SLAVE, i - 8);
-        }
-        if (pci_enabled) {
-            for (i = 0; i < 24; ++i) {
-                if (i == 0) {
-                    kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_IOAPIC, 2);
-                } else if (i != 2) {
-                    kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_IOAPIC, i);
-                }
-            }
-        }
-    }
-#endif /* CONFIG_KVM */
-}
-
-static void kvm_piix3_gsi_handler(void *opaque, int n, int level)
-{
-    GSIState *s = opaque;
-
-    if (n < ISA_NUM_IRQS) {
-        /* Kernel will forward to both PIC and IOAPIC */
-        qemu_set_irq(s->i8259_irq[n], level);
-    } else {
-        qemu_set_irq(s->ioapic_irq[n], level);
-    }
-}
-
-static void ioapic_init(GSIState *gsi_state)
-{
-    DeviceState *dev;
-    SysBusDevice *d;
-    unsigned int i;
-
-    if (kvm_irqchip_in_kernel()) {
-        dev = qdev_create(NULL, "kvm-ioapic");
-    } else {
-        dev = qdev_create(NULL, "ioapic");
-    }
-    /* FIXME: this should be under the piix3.  */
-    object_property_add_child(object_resolve_path("i440fx", NULL),
-                              "ioapic", OBJECT(dev), NULL);
-    qdev_init_nofail(dev);
-    d = sysbus_from_qdev(dev);
-    sysbus_mmio_map(d, 0, 0xfec00000);
-
-    for (i = 0; i < IOAPIC_NUM_PINS; i++) {
-        gsi_state->ioapic_irq[i] = qdev_get_gpio_in(dev, i);
-    }
-}
-
-/* PC hardware initialisation */
-static void pc_init1(MemoryRegion *system_memory,
-                     MemoryRegion *system_io,
-                     ram_addr_t ram_size,
-                     const char *boot_device,
-                     const char *kernel_filename,
-                     const char *kernel_cmdline,
-                     const char *initrd_filename,
-                     const char *cpu_model,
-                     int pci_enabled,
-                     int kvmclock_enabled)
-{
-    int i;
-    ram_addr_t below_4g_mem_size, above_4g_mem_size;
-    PCIBus *pci_bus;
-    ISABus *isa_bus;
-    PCII440FXState *i440fx_state;
-    int piix3_devfn = -1;
-    qemu_irq *cpu_irq;
-    qemu_irq *gsi;
-    qemu_irq *i8259;
-    qemu_irq *smi_irq;
-    GSIState *gsi_state;
-    DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
-    BusState *idebus[MAX_IDE_BUS];
-    ISADevice *rtc_state;
-    ISADevice *floppy;
-    MemoryRegion *ram_memory;
-    MemoryRegion *pci_memory;
-    MemoryRegion *rom_memory;
-    void *fw_cfg = NULL;
-
-    pc_cpus_init(cpu_model);
-
-    if (kvmclock_enabled) {
-        kvmclock_create();
-    }
-
-    if (ram_size >= 0xe0000000 ) {
-        above_4g_mem_size = ram_size - 0xe0000000;
-        below_4g_mem_size = 0xe0000000;
-    } else {
-        above_4g_mem_size = 0;
-        below_4g_mem_size = ram_size;
-    }
-
-    if (pci_enabled) {
-        pci_memory = g_new(MemoryRegion, 1);
-        memory_region_init(pci_memory, "pci", INT64_MAX);
-        rom_memory = pci_memory;
-    } else {
-        pci_memory = NULL;
-        rom_memory = system_memory;
-    }
-
-    /* allocate ram and load rom/bios */
-    if (!xen_enabled()) {
-        fw_cfg = pc_memory_init(system_memory,
-                       kernel_filename, kernel_cmdline, initrd_filename,
-                       below_4g_mem_size, above_4g_mem_size,
-                       pci_enabled ? rom_memory : system_memory, &ram_memory);
-    }
-
-    gsi_state = g_malloc0(sizeof(*gsi_state));
-    if (kvm_irqchip_in_kernel()) {
-        kvm_piix3_setup_irq_routing(pci_enabled);
-        gsi = qemu_allocate_irqs(kvm_piix3_gsi_handler, gsi_state,
-                                 GSI_NUM_PINS);
-    } else {
-        gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS);
-    }
-
-    if (pci_enabled) {
-        pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, &isa_bus, gsi,
-                              system_memory, system_io, ram_size,
-                              below_4g_mem_size,
-                              0x100000000ULL - below_4g_mem_size,
-                              0x100000000ULL + above_4g_mem_size,
-                              (sizeof(target_phys_addr_t) == 4
-                               ? 0
-                               : ((uint64_t)1 << 62)),
-                              pci_memory, ram_memory);
-    } else {
-        pci_bus = NULL;
-        i440fx_state = NULL;
-        isa_bus = isa_bus_new(NULL, system_io);
-        no_hpet = 1;
-    }
-    isa_bus_irqs(isa_bus, gsi);
-
-    if (kvm_irqchip_in_kernel()) {
-        i8259 = kvm_i8259_init(isa_bus);
-    } else if (xen_enabled()) {
-        i8259 = xen_interrupt_controller_init();
-    } else {
-        cpu_irq = pc_allocate_cpu_irq();
-        i8259 = i8259_init(isa_bus, cpu_irq[0]);
-    }
-
-    for (i = 0; i < ISA_NUM_IRQS; i++) {
-        gsi_state->i8259_irq[i] = i8259[i];
-    }
-    if (pci_enabled) {
-        ioapic_init(gsi_state);
-    }
-
-    pc_register_ferr_irq(gsi[13]);
-
-    pc_vga_init(isa_bus, pci_enabled ? pci_bus : NULL);
-    if (xen_enabled()) {
-        pci_create_simple(pci_bus, -1, "xen-platform");
-    }
-
-    /* init basic PC hardware */
-    pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, xen_enabled());
-
-    for(i = 0; i < nb_nics; i++) {
-        NICInfo *nd = &nd_table[i];
-
-        if (!pci_enabled || (nd->model && strcmp(nd->model, "ne2k_isa") == 0))
-            pc_init_ne2k_isa(isa_bus, nd);
-        else
-            pci_nic_init_nofail(nd, "e1000", NULL);
-    }
-
-    ide_drive_get(hd, MAX_IDE_BUS);
-    if (pci_enabled) {
-        PCIDevice *dev;
-        if (xen_enabled()) {
-            dev = pci_piix3_xen_ide_init(pci_bus, hd, piix3_devfn + 1);
-        } else {
-            dev = pci_piix3_ide_init(pci_bus, hd, piix3_devfn + 1);
-        }
-        idebus[0] = qdev_get_child_bus(&dev->qdev, "ide.0");
-        idebus[1] = qdev_get_child_bus(&dev->qdev, "ide.1");
-    } else {
-        for(i = 0; i < MAX_IDE_BUS; i++) {
-            ISADevice *dev;
-            dev = isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i],
-                               ide_irq[i],
-                               hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i + 1]);
-            idebus[i] = qdev_get_child_bus(&dev->qdev, "ide.0");
-        }
-    }
-
-    audio_init(isa_bus, pci_enabled ? pci_bus : NULL);
-
-    pc_cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device,
-                 floppy, idebus[0], idebus[1], rtc_state);
-
-    if (pci_enabled && usb_enabled) {
-        pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci");
-    }
-
-    if (pci_enabled && acpi_enabled) {
-        i2c_bus *smbus;
-
-        smi_irq = qemu_allocate_irqs(pc_acpi_smi_interrupt, first_cpu, 1);
-        /* TODO: Populate SPD eeprom data.  */
-        smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100,
-                              gsi[9], *smi_irq,
-                              kvm_enabled(), fw_cfg);
-        smbus_eeprom_init(smbus, 8, NULL, 0);
-    }
-
-    if (pci_enabled) {
-        pc_pci_device_init(pci_bus);
-    }
-}
-
-static void pc_init_pci(ram_addr_t ram_size,
-                        const char *boot_device,
-                        const char *kernel_filename,
-                        const char *kernel_cmdline,
-                        const char *initrd_filename,
-                        const char *cpu_model)
-{
-    pc_init1(get_system_memory(),
-             get_system_io(),
-             ram_size, boot_device,
-             kernel_filename, kernel_cmdline,
-             initrd_filename, cpu_model, 1, 1);
-}
-
-static void pc_init_pci_no_kvmclock(ram_addr_t ram_size,
-                                    const char *boot_device,
-                                    const char *kernel_filename,
-                                    const char *kernel_cmdline,
-                                    const char *initrd_filename,
-                                    const char *cpu_model)
-{
-    pc_init1(get_system_memory(),
-             get_system_io(),
-             ram_size, boot_device,
-             kernel_filename, kernel_cmdline,
-             initrd_filename, cpu_model, 1, 0);
-}
-
-static void pc_init_isa(ram_addr_t ram_size,
-                        const char *boot_device,
-                        const char *kernel_filename,
-                        const char *kernel_cmdline,
-                        const char *initrd_filename,
-                        const char *cpu_model)
-{
-    if (cpu_model == NULL)
-        cpu_model = "486";
-    pc_init1(get_system_memory(),
-             get_system_io(),
-             ram_size, boot_device,
-             kernel_filename, kernel_cmdline,
-             initrd_filename, cpu_model, 0, 1);
-}
-
-#ifdef CONFIG_XEN
-static void pc_xen_hvm_init(ram_addr_t ram_size,
-                            const char *boot_device,
-                            const char *kernel_filename,
-                            const char *kernel_cmdline,
-                            const char *initrd_filename,
-                            const char *cpu_model)
-{
-    if (xen_hvm_init() != 0) {
-        hw_error("xen hardware virtual machine initialisation failed");
-    }
-    pc_init_pci_no_kvmclock(ram_size, boot_device,
-                            kernel_filename, kernel_cmdline,
-                            initrd_filename, cpu_model);
-    xen_vcpu_init();
-}
-#endif
-
-static QEMUMachine pc_machine_v1_2 = {
-    .name = "pc-1.2",
-    .alias = "pc",
-    .desc = "Standard PC",
-    .init = pc_init_pci,
-    .max_cpus = 255,
-    .is_default = 1,
-};
-
-#define PC_COMPAT_1_1 \
-        {\
-            .driver   = "VGA",\
-            .property = "vgamem_mb",\
-            .value    = stringify(8),\
-        },{\
-            .driver   = "vmware-svga",\
-            .property = "vgamem_mb",\
-            .value    = stringify(8),\
-        },{\
-            .driver   = "qxl-vga",\
-            .property = "vgamem_mb",\
-            .value    = stringify(8),\
-        },{\
-            .driver   = "qxl",\
-            .property = "vgamem_mb",\
-            .value    = stringify(8),\
-        }
-
-static QEMUMachine pc_machine_v1_1 = {
-    .name = "pc-1.1",
-    .desc = "Standard PC",
-    .init = pc_init_pci,
-    .max_cpus = 255,
-    .compat_props = (GlobalProperty[]) {
-        PC_COMPAT_1_1,
-        { /* end of list */ }
-    },
-};
-
-#define PC_COMPAT_1_0 \
-        PC_COMPAT_1_1,\
-        {\
-            .driver   = "pc-sysfw",\
-            .property = "rom_only",\
-            .value    = stringify(1),\
-        }, {\
-            .driver   = "isa-fdc",\
-            .property = "check_media_rate",\
-            .value    = "off",\
-        }, {\
-            .driver   = "virtio-balloon-pci",\
-            .property = "class",\
-            .value    = stringify(PCI_CLASS_MEMORY_RAM),\
-        },{\
-            .driver   = "apic",\
-            .property = "vapic",\
-            .value    = "off",\
-        },{\
-            .driver   = TYPE_USB_DEVICE,\
-            .property = "full-path",\
-            .value    = "no",\
-        }
-
-static QEMUMachine pc_machine_v1_0 = {
-    .name = "pc-1.0",
-    .desc = "Standard PC",
-    .init = pc_init_pci,
-    .max_cpus = 255,
-    .compat_props = (GlobalProperty[]) {
-        PC_COMPAT_1_0,
-        { /* end of list */ }
-    },
-    .hw_version = "1.0",
-};
-
-#define PC_COMPAT_0_15 \
-        PC_COMPAT_1_0
-
-static QEMUMachine pc_machine_v0_15 = {
-    .name = "pc-0.15",
-    .desc = "Standard PC",
-    .init = pc_init_pci,
-    .max_cpus = 255,
-    .compat_props = (GlobalProperty[]) {
-        PC_COMPAT_0_15,
-        { /* end of list */ }
-    },
-    .hw_version = "0.15",
-};
-
-#define PC_COMPAT_0_14 \
-        PC_COMPAT_0_15,\
-        {\
-            .driver   = "virtio-blk-pci",\
-            .property = "event_idx",\
-            .value    = "off",\
-        },{\
-            .driver   = "virtio-serial-pci",\
-            .property = "event_idx",\
-            .value    = "off",\
-        },{\
-            .driver   = "virtio-net-pci",\
-            .property = "event_idx",\
-            .value    = "off",\
-        },{\
-            .driver   = "virtio-balloon-pci",\
-            .property = "event_idx",\
-            .value    = "off",\
-        }
-
-static QEMUMachine pc_machine_v0_14 = {
-    .name = "pc-0.14",
-    .desc = "Standard PC",
-    .init = pc_init_pci,
-    .max_cpus = 255,
-    .compat_props = (GlobalProperty[]) {
-        PC_COMPAT_0_14, 
-        {
-            .driver   = "qxl",
-            .property = "revision",
-            .value    = stringify(2),
-        },{
-            .driver   = "qxl-vga",
-            .property = "revision",
-            .value    = stringify(2),
-        },
-        { /* end of list */ }
-    },
-    .hw_version = "0.14",
-};
-
-#define PC_COMPAT_0_13 \
-        PC_COMPAT_0_14,\
-        {\
-            .driver   = TYPE_PCI_DEVICE,\
-            .property = "command_serr_enable",\
-            .value    = "off",\
-        },{\
-            .driver   = "AC97",\
-            .property = "use_broken_id",\
-            .value    = stringify(1),\
-        }
-
-static QEMUMachine pc_machine_v0_13 = {
-    .name = "pc-0.13",
-    .desc = "Standard PC",
-    .init = pc_init_pci_no_kvmclock,
-    .max_cpus = 255,
-    .compat_props = (GlobalProperty[]) {
-        PC_COMPAT_0_13,
-        {
-            .driver   = "virtio-9p-pci",
-            .property = "vectors",
-            .value    = stringify(0),
-        },{
-            .driver   = "VGA",
-            .property = "rombar",
-            .value    = stringify(0),
-        },{
-            .driver   = "vmware-svga",
-            .property = "rombar",
-            .value    = stringify(0),
-        },
-        { /* end of list */ }
-    },
-    .hw_version = "0.13",
-};
-
-#define PC_COMPAT_0_12 \
-        PC_COMPAT_0_13,\
-        {\
-            .driver   = "virtio-serial-pci",\
-            .property = "max_ports",\
-            .value    = stringify(1),\
-        },{\
-            .driver   = "virtio-serial-pci",\
-            .property = "vectors",\
-            .value    = stringify(0),\
-        }
-
-static QEMUMachine pc_machine_v0_12 = {
-    .name = "pc-0.12",
-    .desc = "Standard PC",
-    .init = pc_init_pci_no_kvmclock,
-    .max_cpus = 255,
-    .compat_props = (GlobalProperty[]) {
-        PC_COMPAT_0_12,
-        {
-            .driver   = "VGA",
-            .property = "rombar",
-            .value    = stringify(0),
-        },{
-            .driver   = "vmware-svga",
-            .property = "rombar",
-            .value    = stringify(0),
-        },
-        { /* end of list */ }
-    },
-    .hw_version = "0.12",
-};
-
-#define PC_COMPAT_0_11 \
-        PC_COMPAT_0_12,\
-        {\
-            .driver   = "virtio-blk-pci",\
-            .property = "vectors",\
-            .value    = stringify(0),\
-        },{\
-            .driver   = TYPE_PCI_DEVICE,\
-            .property = "rombar",\
-            .value    = stringify(0),\
-        }
-
-static QEMUMachine pc_machine_v0_11 = {
-    .name = "pc-0.11",
-    .desc = "Standard PC, qemu 0.11",
-    .init = pc_init_pci_no_kvmclock,
-    .max_cpus = 255,
-    .compat_props = (GlobalProperty[]) {
-        PC_COMPAT_0_11,
-        {
-            .driver   = "ide-drive",
-            .property = "ver",
-            .value    = "0.11",
-        },{
-            .driver   = "scsi-disk",
-            .property = "ver",
-            .value    = "0.11",
-        },
-        { /* end of list */ }
-    },
-    .hw_version = "0.11",
-};
-
-static QEMUMachine pc_machine_v0_10 = {
-    .name = "pc-0.10",
-    .desc = "Standard PC, qemu 0.10",
-    .init = pc_init_pci_no_kvmclock,
-    .max_cpus = 255,
-    .compat_props = (GlobalProperty[]) {
-        PC_COMPAT_0_11,
-        {
-            .driver   = "virtio-blk-pci",
-            .property = "class",
-            .value    = stringify(PCI_CLASS_STORAGE_OTHER),
-        },{
-            .driver   = "virtio-serial-pci",
-            .property = "class",
-            .value    = stringify(PCI_CLASS_DISPLAY_OTHER),
-        },{
-            .driver   = "virtio-net-pci",
-            .property = "vectors",
-            .value    = stringify(0),
-        },{
-            .driver   = "ide-drive",
-            .property = "ver",
-            .value    = "0.10",
-        },{
-            .driver   = "scsi-disk",
-            .property = "ver",
-            .value    = "0.10",
-        },
-        { /* end of list */ }
-    },
-    .hw_version = "0.10",
-};
-
-static QEMUMachine isapc_machine = {
-    .name = "isapc",
-    .desc = "ISA-only PC",
-    .init = pc_init_isa,
-    .max_cpus = 1,
-    .compat_props = (GlobalProperty[]) {
-        {
-            .driver   = "pc-sysfw",
-            .property = "rom_only",
-            .value    = stringify(1),
-        },
-        { /* end of list */ }
-    },
-};
-
-#ifdef CONFIG_XEN
-static QEMUMachine xenfv_machine = {
-    .name = "xenfv",
-    .desc = "Xen Fully-virtualized PC",
-    .init = pc_xen_hvm_init,
-    .max_cpus = HVM_MAX_VCPUS,
-    .default_machine_opts = "accel=xen",
-};
-#endif
-
-static void pc_machine_init(void)
-{
-    qemu_register_machine(&pc_machine_v1_2);
-    qemu_register_machine(&pc_machine_v1_1);
-    qemu_register_machine(&pc_machine_v1_0);
-    qemu_register_machine(&pc_machine_v0_15);
-    qemu_register_machine(&pc_machine_v0_14);
-    qemu_register_machine(&pc_machine_v0_13);
-    qemu_register_machine(&pc_machine_v0_12);
-    qemu_register_machine(&pc_machine_v0_11);
-    qemu_register_machine(&pc_machine_v0_10);
-    qemu_register_machine(&isapc_machine);
-#ifdef CONFIG_XEN
-    qemu_register_machine(&xenfv_machine);
-#endif
-}
-
-machine_init(pc_machine_init);