[Xen-changelog] [xen-unstable] hvmloader: always include HPET table

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Paolo Bonzini <pbonzini@xxxxxxxxxx>
# Date 1305879340 -3600
# Node ID 50e1d0d0bbee9a2ef782840dd8650ff26ce13055
# Parent  c8f00ee51e1529d99220cdd12f8b6bc96f82d14a
hvmloader: always include HPET table

Windows SVVP tests require an HPET table even if the HPET is disabled.
This makes sense since the HPET _is_ in the DSDT and, while the OS
does not know that, in principle it's status may change.

(For what it's worth SeaBIOS, in addition to doing this, totally
ignores QEMU's -no-hpet flag and always reports 0x0f for the HPET's
_STA method).

Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
Signed-off-by: Keir Fraser <keir@xxxxxxx>
---


diff -r c8f00ee51e15 -r 50e1d0d0bbee tools/firmware/hvmloader/acpi/build.c
--- a/tools/firmware/hvmloader/acpi/build.c     Fri May 20 09:11:54 2011 +0100
+++ b/tools/firmware/hvmloader/acpi/build.c     Fri May 20 09:15:40 2011 +0100
@@ -189,13 +189,11 @@
         table_ptrs[nr_tables++] = (unsigned long)madt;
     }
 
-    /* HPET. */
-    if ( hpet_exists(ACPI_HPET_ADDRESS) )
-    {
-        hpet = (struct acpi_20_hpet *)&buf[offset];
-        offset += construct_hpet(hpet);
-        table_ptrs[nr_tables++] = (unsigned long)hpet;
-    }
+    /* HPET. Always included in DSDT, so always include it here too. */
+    /* (And it's unconditionally required by Windows SVVP tests.) */
+    hpet = (struct acpi_20_hpet *)&buf[offset];
+    offset += construct_hpet(hpet);
+    table_ptrs[nr_tables++] = (unsigned long)hpet;
 
     if ( battery_port_exists() ) 
     {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog