diff -r d2bf1a7cc131 tools/ioemu/hw/pc.c
--- a/tools/ioemu/hw/pc.c	Sat Jul 29 14:05:59 2006 +0100
+++ b/tools/ioemu/hw/pc.c	Wed Aug  2 13:57:32 2006 -0700
@@ -871,10 +871,12 @@
     cmos_init(ram_size, boot_device, bs_table, timeoffset);
 
     /* using PIIX4 acpi model */
-    if (pci_enabled)
+    if (pci_enabled && acpi_enabled){
         pci_piix4_acpi_init(pci_bus);
-
-    if (pci_enabled && usb_enabled) {
+    }
+//    fprintf(stderr, "acpi_enable: %x \n", acpi_enabled);
+
+     if (pci_enabled && usb_enabled) {
         usb_uhci_init(pci_bus, usb_root_ports);
         usb_attach(usb_root_ports[0], vm_usb_hub);
     }
diff -r d2bf1a7cc131 tools/ioemu/vl.c
--- a/tools/ioemu/vl.c	Sat Jul 29 14:05:59 2006 +0100
+++ b/tools/ioemu/vl.c	Wed Aug  2 13:57:32 2006 -0700
@@ -147,6 +147,7 @@
 #ifdef TARGET_I386
 int win2k_install_hack = 0;
 #endif
+int acpi_enabled = 0;
 int usb_enabled = 0;
 USBPort *vm_usb_ports[MAX_VM_USB_PORTS];
 USBDevice *vm_usb_hub;
@@ -4733,6 +4734,7 @@
 #ifdef TARGET_I386
            "-win2k-hack     use it when installing Windows 2000 to avoid a disk full bug\n"
 #endif
+           "-acpi           disable or enable ACPI of HVM domain \n"
            "-usb            enable the USB driver (will be the default soon)\n"
            "-usbdevice name add the host or guest USB device 'name'\n"
 #if defined(TARGET_PPC) || defined(TARGET_SPARC)
@@ -4897,6 +4899,8 @@
     QEMU_OPTION_d,
     QEMU_OPTION_vcpus,
     QEMU_OPTION_timeoffset,
+    QEMU_OPTION_acpi,
+
 };
 
 typedef struct QEMUOption {
@@ -4977,6 +4981,7 @@
     { "d", HAS_ARG, QEMU_OPTION_d },
     { "vcpus", 1, QEMU_OPTION_vcpus },
     { "timeoffset", HAS_ARG, QEMU_OPTION_timeoffset },
+    { "acpi", 0, QEMU_OPTION_acpi },
     { NULL },
 };
 
@@ -5641,6 +5646,9 @@
                 kqemu_allowed = 2;
                 break;
 #endif
+            case QEMU_OPTION_acpi:
+                acpi_enabled = 1;
+                break;
             case QEMU_OPTION_usb:
                 usb_enabled = 1;
                 break;
diff -r d2bf1a7cc131 tools/ioemu/vl.h
--- a/tools/ioemu/vl.h	Sat Jul 29 14:05:59 2006 +0100
+++ b/tools/ioemu/vl.h	Wed Aug  2 13:57:32 2006 -0700
@@ -159,6 +159,7 @@
 extern int kqemu_allowed;
 extern int win2k_install_hack;
 extern int usb_enabled;
+extern int acpi_enabled;
 extern int smp_cpus;
 
 /* XXX: make it dynamic */
diff -r d2bf1a7cc131 tools/python/xen/sv/CreateDomain.py
--- a/tools/python/xen/sv/CreateDomain.py	Sat Jul 29 14:05:59 2006 +0100
+++ b/tools/python/xen/sv/CreateDomain.py	Wed Aug  2 13:57:32 2006 -0700
@@ -180,7 +180,7 @@
         vals.ssidref = -1
         vals.bootloader = None
         vals.usb = []
-        
+        vals.acpi= [] 
         #setup vifs
         
         vals.vif = []
diff -r d2bf1a7cc131 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py	Sat Jul 29 14:05:59 2006 +0100
+++ b/tools/python/xen/xend/image.py	Wed Aug  2 13:57:32 2006 -0700
@@ -251,7 +251,7 @@
     def parseDeviceModelArgs(self, imageConfig, deviceConfig):
         dmargs = [ 'cdrom', 'boot', 'fda', 'fdb', 'audio',
                    'localtime', 'serial', 'stdvga', 'isa', 'vcpus',
-		   'usb', 'usbdevice']
+		   'acpi', 'usb', 'usbdevice']
         ret = []
         for a in dmargs:
             v = sxp.child_value(imageConfig, a)