1.1 --- a/tools/ioemu/patches/acpi-support	Wed Aug 09 20:07:01 2006 +0100
     1.2 +++ b/tools/ioemu/patches/acpi-support	Wed Aug 09 20:08:20 2006 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  Index: ioemu/Makefile.target
     1.5  ===================================================================
     1.6 ---- ioemu.orig/Makefile.target	2006-08-06 02:23:23.000000000 +0100
     1.7 -+++ ioemu/Makefile.target	2006-08-07 17:38:47.698306442 +0100
     1.8 +--- ioemu.orig/Makefile.target	2006-08-09 19:54:26.055548240 +0100
     1.9 ++++ ioemu/Makefile.target	2006-08-09 19:59:49.537686802 +0100
    1.10  @@ -357,6 +357,7 @@
    1.11   VL_OBJS+= fdc.o mc146818rtc.o serial.o pc.o
    1.12   VL_OBJS+= cirrus_vga.o mixeng.o parallel.o acpi.o piix_pci.o
    1.13 @@ -12,8 +12,8 @@ Index: ioemu/Makefile.target
    1.14   ifeq ($(TARGET_BASE_ARCH), ppc)
    1.15  Index: ioemu/hw/pc.c
    1.16  ===================================================================
    1.17 ---- ioemu.orig/hw/pc.c	2006-08-06 02:23:45.000000000 +0100
    1.18 -+++ ioemu/hw/pc.c	2006-08-07 17:42:00.939426374 +0100
    1.19 +--- ioemu.orig/hw/pc.c	2006-08-09 19:54:26.133539447 +0100
    1.20 ++++ ioemu/hw/pc.c	2006-08-09 20:04:32.767826231 +0100
    1.21  @@ -572,6 +572,9 @@
    1.22   static int parallel_io[MAX_PARALLEL_PORTS] = { 0x378, 0x278, 0x3bc };
    1.23   static int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 };
    1.24 @@ -24,27 +24,37 @@ Index: ioemu/hw/pc.c
    1.25   #ifdef HAS_AUDIO
    1.26   static void audio_init (PCIBus *pci_bus)
    1.27   {
    1.28 -@@ -874,11 +877,15 @@
    1.29 - 
    1.30 -     cmos_init(ram_size, boot_device, bs_table, timeoffset);
    1.31 +@@ -878,9 +881,15 @@
    1.32 +         usb_uhci_init(pci_bus, piix3_devfn + 2);
    1.33 +     }
    1.34   
    1.35  +    /* using PIIX4 acpi model */
    1.36  +    if (pci_enabled && acpi_enabled)
    1.37 -+        pci_piix4_acpi_init(pci_bus, piix3_devfn + 3);
    1.38 ++        pci_piix4_acpi_init(pci_bus, piix3_devfn + (usb_enabled ? 3 : 2));
    1.39  +
    1.40 -     if (pci_enabled && usb_enabled) {
    1.41 -         usb_uhci_init(pci_bus, piix3_devfn + 2);
    1.42 -     }
    1.43 - 
    1.44 --    if (pci_enabled && acpi_enabled) {
    1.45 -+    if (pci_enabled && acpi_enabled && 0) {
    1.46 ++#ifndef CONFIG_DM
    1.47 +     if (pci_enabled && acpi_enabled) {
    1.48           piix4_pm_init(pci_bus, piix3_devfn + 3);
    1.49       }
    1.50 ++#endif /* !CONFIG_DM */
    1.51 + 
    1.52 + #if 0
    1.53 +     /* ??? Need to figure out some way for the user to
    1.54 +@@ -903,8 +912,10 @@
    1.55 +     /* XXX: should be done in the Bochs BIOS */
    1.56 +     if (pci_enabled) {
    1.57 +         pci_bios_init();
    1.58 ++#ifndef CONFIG_DM
    1.59 +         if (acpi_enabled)
    1.60 +             acpi_bios_init();
    1.61 ++#endif /* !CONFIG_DM */
    1.62 +     }
    1.63 + }
    1.64   
    1.65  Index: ioemu/hw/piix4acpi.c
    1.66  ===================================================================
    1.67  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
    1.68 -+++ ioemu/hw/piix4acpi.c	2006-08-07 17:41:41.932577728 +0100
    1.69 ++++ ioemu/hw/piix4acpi.c	2006-08-09 20:00:56.118008198 +0100
    1.70  @@ -0,0 +1,388 @@
    1.71  +/*
    1.72  + * PIIX4 ACPI controller emulation
    1.73 @@ -411,7 +421,7 @@ Index: ioemu/hw/piix4acpi.c
    1.74  +    PCIAcpiState *d;
    1.75  +    uint8_t *pci_conf;
    1.76  +
    1.77 -+    /* register a function 3 of PIIX4 */
    1.78 ++    /* register a function devfn of PIIX4 */
    1.79  +    d = (PCIAcpiState *)pci_register_device(
    1.80  +        bus, "PIIX4 ACPI", sizeof(PCIAcpiState),
    1.81  +        devfn, NULL, NULL);
    1.82 @@ -436,8 +446,8 @@ Index: ioemu/hw/piix4acpi.c
    1.83  +}
    1.84  Index: ioemu/vl.c
    1.85  ===================================================================
    1.86 ---- ioemu.orig/vl.c	2006-08-06 02:23:45.000000000 +0100
    1.87 -+++ ioemu/vl.c	2006-08-07 17:41:40.613727012 +0100
    1.88 +--- ioemu.orig/vl.c	2006-08-09 19:54:26.135539222 +0100
    1.89 ++++ ioemu/vl.c	2006-08-09 19:59:49.772659756 +0100
    1.90  @@ -156,7 +156,7 @@
    1.91   #else
    1.92   #define MAX_CPUS 1
    1.93 @@ -483,8 +493,8 @@ Index: ioemu/vl.c
    1.94       }
    1.95  Index: ioemu/vl.h
    1.96  ===================================================================
    1.97 ---- ioemu.orig/vl.h	2006-08-06 02:23:45.000000000 +0100
    1.98 -+++ ioemu/vl.h	2006-08-07 17:38:47.847289567 +0100
    1.99 +--- ioemu.orig/vl.h	2006-08-09 19:54:26.136539109 +0100
   1.100 ++++ ioemu/vl.h	2006-08-09 19:59:49.734664129 +0100
   1.101  @@ -167,6 +167,7 @@
   1.102   extern int kqemu_allowed;
   1.103   extern int win2k_install_hack;
   1.104 @@ -495,8 +505,8 @@ Index: ioemu/vl.h
   1.105   /* XXX: make it dynamic */
   1.106  Index: ioemu/hw/piix_pci.c
   1.107  ===================================================================
   1.108 ---- ioemu.orig/hw/piix_pci.c	2006-08-06 02:29:41.000000000 +0100
   1.109 -+++ ioemu/hw/piix_pci.c	2006-08-07 17:38:57.480198468 +0100
   1.110 +--- ioemu.orig/hw/piix_pci.c	2006-08-09 19:54:19.636318228 +0100
   1.111 ++++ ioemu/hw/piix_pci.c	2006-08-09 19:54:26.152537305 +0100
   1.112  @@ -241,7 +241,7 @@
   1.113   static uint32_t pci_bios_io_addr;
   1.114   static uint32_t pci_bios_mem_addr;

     2.1 --- a/tools/ioemu/patches/acpi-timer-support	Wed Aug 09 20:07:01 2006 +0100
     2.2 +++ b/tools/ioemu/patches/acpi-timer-support	Wed Aug 09 20:08:20 2006 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  Index: ioemu/hw/piix4acpi.c
     2.5  ===================================================================
     2.6 ---- ioemu.orig/hw/piix4acpi.c	2006-08-06 02:24:54.262068457 +0100
     2.7 -+++ ioemu/hw/piix4acpi.c	2006-08-06 02:30:29.288761563 +0100
     2.8 +--- ioemu.orig/hw/piix4acpi.c	2006-08-09 20:00:56.118008198 +0100
     2.9 ++++ ioemu/hw/piix4acpi.c	2006-08-09 20:04:54.375299065 +0100
    2.10  @@ -24,31 +24,30 @@
    2.11    */
    2.12   
    2.13 @@ -185,7 +185,7 @@ Index: ioemu/hw/piix4acpi.c
    2.14  -													
    2.15   
    2.16   /* PIIX4 acpi pci configuration space, func 3 */
    2.17 - void pci_piix4_acpi_init(PCIBus *bus)
    2.18 + void pci_piix4_acpi_init(PCIBus *bus, int devfn)
    2.19  @@ -384,5 +383,5 @@
    2.20       pci_register_io_region((PCIDevice *)d, 4, 0x10,
    2.21                              PCI_ADDRESS_SPACE_IO, acpi_map);