Index: xen-4.0.1-testing/tools/firmware/hvmloader/acpi/dsdt.asl
===================================================================
--- xen-4.0.1-testing.orig/tools/firmware/hvmloader/acpi/dsdt.asl
+++ xen-4.0.1-testing/tools/firmware/hvmloader/acpi/dsdt.asl
@@ -30,21 +30,9 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2,
     /*
      * S3 (suspend-to-ram), S4 (suspend-to-disc) and S5 (power-off) type codes:
      * must match piix4 emulation.
+     * Turn off support for s3 and s4 sleep states to deal with SVVP tests.
+     * This is what MSFT does on HyperV.
      */
-    Name (\_S3, Package (0x04)
-    {
-        0x05,  /* PM1a_CNT.SLP_TYP */
-        0x05,  /* PM1b_CNT.SLP_TYP */
-        0x0,   /* reserved */
-        0x0    /* reserved */
-    })
-    Name (\_S4, Package (0x04)
-    {
-        0x06,  /* PM1a_CNT.SLP_TYP */
-        0x06,  /* PM1b_CNT.SLP_TYP */
-        0x00,  /* reserved */
-        0x00   /* reserved */
-    })
     Name (\_S5, Package (0x04)
     {
         0x07,  /* PM1a_CNT.SLP_TYP */