1.1 --- a/tools/ioemu/patches/acpi-support	Fri Aug 04 10:41:27 2006 +0100
     1.2 +++ b/tools/ioemu/patches/acpi-support	Fri Aug 04 10:42:02 2006 +0100
     1.3 @@ -1,7 +1,8 @@
     1.4 -diff -r 2612be97caad Makefile.target
     1.5 ---- a/Makefile.target	Mon Jun 26 16:07:22 2006 +0100
     1.6 -+++ b/Makefile.target	Mon Jun 26 18:38:49 2006 +0100
     1.7 -@@ -335,6 +335,7 @@ VL_OBJS+= ide.o pckbd.o ps2.o vga.o $(SO
     1.8 +Index: ioemu/Makefile.target
     1.9 +===================================================================
    1.10 +--- ioemu.orig/Makefile.target	2006-08-03 19:19:39.000000000 +0100
    1.11 ++++ ioemu/Makefile.target	2006-08-04 10:35:36.445703379 +0100
    1.12 +@@ -335,6 +335,7 @@
    1.13   VL_OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o $(AUDIODRV)
    1.14   VL_OBJS+= fdc.o mc146818rtc.o serial.o pc.o
    1.15   VL_OBJS+= cirrus_vga.o mixeng.o parallel.o
    1.16 @@ -9,10 +10,11 @@ diff -r 2612be97caad Makefile.target
    1.17   DEFINES += -DHAS_AUDIO
    1.18   endif
    1.19   ifeq ($(TARGET_BASE_ARCH), ppc)
    1.20 -diff -r 2612be97caad hw/pc.c
    1.21 ---- a/hw/pc.c	Mon Jun 26 16:07:22 2006 +0100
    1.22 -+++ b/hw/pc.c	Mon Jun 26 18:38:49 2006 +0100
    1.23 -@@ -566,6 +566,9 @@ static int parallel_io[MAX_PARALLEL_PORT
    1.24 +Index: ioemu/hw/pc.c
    1.25 +===================================================================
    1.26 +--- ioemu.orig/hw/pc.c	2006-08-03 19:19:39.000000000 +0100
    1.27 ++++ ioemu/hw/pc.c	2006-08-04 10:38:05.559415853 +0100
    1.28 +@@ -566,6 +566,9 @@
    1.29   static int parallel_io[MAX_PARALLEL_PORTS] = { 0x378, 0x278, 0x3bc };
    1.30   static int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 };
    1.31   
    1.32 @@ -22,21 +24,22 @@ diff -r 2612be97caad hw/pc.c
    1.33   #ifdef HAS_AUDIO
    1.34   static void audio_init (PCIBus *pci_bus)
    1.35   {
    1.36 -@@ -867,6 +870,10 @@ static void pc_init1(uint64_t ram_size, 
    1.37 +@@ -867,6 +870,10 @@
    1.38   
    1.39       cmos_init(ram_size, boot_device, bs_table, timeoffset);
    1.40   
    1.41  +    /* using PIIX4 acpi model */
    1.42 -+    if (pci_enabled)
    1.43 ++    if (pci_enabled && acpi_enabled)
    1.44  +        pci_piix4_acpi_init(pci_bus);
    1.45  +
    1.46       if (pci_enabled && usb_enabled) {
    1.47           usb_uhci_init(pci_bus, usb_root_ports);
    1.48           usb_attach(usb_root_ports[0], vm_usb_hub);
    1.49 -diff -r 2612be97caad hw/pci.c
    1.50 ---- a/hw/pci.c	Mon Jun 26 16:07:22 2006 +0100
    1.51 -+++ b/hw/pci.c	Mon Jun 26 18:38:49 2006 +0100
    1.52 -@@ -1697,7 +1697,7 @@ static uint32_t pci_bios_io_addr;
    1.53 +Index: ioemu/hw/pci.c
    1.54 +===================================================================
    1.55 +--- ioemu.orig/hw/pci.c	2006-08-03 19:19:35.000000000 +0100
    1.56 ++++ ioemu/hw/pci.c	2006-08-03 19:19:39.000000000 +0100
    1.57 +@@ -1697,7 +1697,7 @@
    1.58   static uint32_t pci_bios_io_addr;
    1.59   static uint32_t pci_bios_mem_addr;
    1.60   /* host irqs corresponding to PCI irqs A-D */
    1.61 @@ -45,7 +48,7 @@ diff -r 2612be97caad hw/pci.c
    1.62   
    1.63   static void pci_set_io_region_addr(PCIDevice *d, int region_num, uint32_t addr)
    1.64   {
    1.65 -@@ -1750,12 +1750,22 @@ static void pci_bios_init_device(PCIDevi
    1.66 +@@ -1750,12 +1750,22 @@
    1.67               pci_set_io_region_addr(d, 3, 0x374);
    1.68           }
    1.69           break;
    1.70 @@ -68,7 +71,7 @@ diff -r 2612be97caad hw/pci.c
    1.71       case 0x0800:
    1.72           /* PIC */
    1.73           vendor_id = pci_config_readw(d, PCI_VENDOR_ID);
    1.74 -@@ -1800,6 +1810,13 @@ static void pci_bios_init_device(PCIDevi
    1.75 +@@ -1800,6 +1810,13 @@
    1.76           pic_irq = pci_irqs[pin];
    1.77           pci_config_writeb(d, PCI_INTERRUPT_LINE, pic_irq);
    1.78       }
    1.79 @@ -82,9 +85,10 @@ diff -r 2612be97caad hw/pci.c
    1.80   }
    1.81   
    1.82   /*
    1.83 -diff -r 2612be97caad hw/piix4acpi.c
    1.84 ---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    1.85 -+++ b/hw/piix4acpi.c	Mon Jun 26 18:38:49 2006 +0100
    1.86 +Index: ioemu/hw/piix4acpi.c
    1.87 +===================================================================
    1.88 +--- /dev/null	1970-01-01 00:00:00.000000000 +0000
    1.89 ++++ ioemu/hw/piix4acpi.c	2006-08-04 10:35:36.762666604 +0100
    1.90  @@ -0,0 +1,388 @@
    1.91  +/*
    1.92  + * PIIX4 ACPI controller emulation
    1.93 @@ -474,3 +478,62 @@ diff -r 2612be97caad hw/piix4acpi.c
    1.94  +
    1.95  +    acpi_reset (d);
    1.96  +}
    1.97 +Index: ioemu/vl.c
    1.98 +===================================================================
    1.99 +--- ioemu.orig/vl.c	2006-08-04 10:35:36.697674145 +0100
   1.100 ++++ ioemu/vl.c	2006-08-04 10:37:38.001608828 +0100
   1.101 +@@ -166,6 +166,8 @@
   1.102 + 
   1.103 + time_t timeoffset = 0;
   1.104 + 
   1.105 ++int acpi_enabled = 0;
   1.106 ++
   1.107 + char domain_name[1024] = { 'H','V', 'M', 'X', 'E', 'N', '-'};
   1.108 + extern int domid;
   1.109 + 
   1.110 +@@ -4803,6 +4805,7 @@
   1.111 +            "-loadvm file    start right away with a saved state (loadvm in monitor)\n"
   1.112 + 	   "-vnc display    start a VNC server on display\n"
   1.113 +            "-timeoffset     time offset (in seconds) from local time\n"
   1.114 ++           "-acpi           disable or enable ACPI of HVM domain \n"
   1.115 +            "\n"
   1.116 +            "During emulation, the following keys are useful:\n"
   1.117 +            "ctrl-alt-f      toggle full screen\n"
   1.118 +@@ -4894,6 +4897,7 @@
   1.119 +     QEMU_OPTION_d,
   1.120 +     QEMU_OPTION_vcpus,
   1.121 +     QEMU_OPTION_timeoffset,
   1.122 ++    QEMU_OPTION_acpi,
   1.123 + };
   1.124 + 
   1.125 + typedef struct QEMUOption {
   1.126 +@@ -4973,6 +4977,7 @@
   1.127 +     { "d", HAS_ARG, QEMU_OPTION_d },
   1.128 +     { "vcpus", 1, QEMU_OPTION_vcpus },
   1.129 +     { "timeoffset", HAS_ARG, QEMU_OPTION_timeoffset },
   1.130 ++    { "acpi", 0, QEMU_OPTION_acpi },
   1.131 +     { NULL },
   1.132 + };
   1.133 + 
   1.134 +@@ -5678,6 +5683,9 @@
   1.135 +             case QEMU_OPTION_timeoffset:
   1.136 +                 timeoffset = strtol(optarg, NULL, 0);
   1.137 +                 break;
   1.138 ++            case QEMU_OPTION_acpi:
   1.139 ++                acpi_enabled = 1;
   1.140 ++                break;
   1.141 +             }
   1.142 +         }
   1.143 +     }
   1.144 +Index: ioemu/vl.h
   1.145 +===================================================================
   1.146 +--- ioemu.orig/vl.h	2006-08-04 10:35:36.629682033 +0100
   1.147 ++++ ioemu/vl.h	2006-08-04 10:36:21.513475699 +0100
   1.148 +@@ -159,6 +159,7 @@
   1.149 + extern int kqemu_allowed;
   1.150 + extern int win2k_install_hack;
   1.151 + extern int usb_enabled;
   1.152 ++extern int acpi_enabled;
   1.153 + extern int smp_cpus;
   1.154 + 
   1.155 + /* XXX: make it dynamic */