[Xen-changelog] [xen stable-4.2] Revert "hvmloader: always include HPET table"

[patchbot@xxxxxxx]

commit aca0217117922130140f422b6e1b74c76757f304
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon Jul 8 13:22:59 2013 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Jul 8 13:22:59 2013 +0200

    Revert "hvmloader: always include HPET table"
    
    This reverts commit e4fd0475a08fda414da27c4e57b568f147cfc07e.
    
    Conflicts:
        tools/firmware/hvmloader/acpi/build.c
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Keir Fraser <keir.xen@xxxxxxxxx>
    master commit: 4867685f7916bb594a67f2f64a28bbf5ecb4949c
    master date: 2013-07-08 13:20:20 +0200
---
 tools/firmware/hvmloader/acpi/build.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tools/firmware/hvmloader/acpi/build.c 
b/tools/firmware/hvmloader/acpi/build.c
index d09785d..3fd3d64 100644
--- a/tools/firmware/hvmloader/acpi/build.c
+++ b/tools/firmware/hvmloader/acpi/build.c
@@ -219,11 +219,13 @@ static int construct_secondary_tables(unsigned long 
*table_ptrs,
         table_ptrs[nr_tables++] = (unsigned long)madt;
     }
 
-    /* HPET. Always included in DSDT, so always include it here too. */
-    /* (And it's unconditionally required by Windows SVVP tests.) */
-    hpet = construct_hpet();
-    if (!hpet) return -1;
-    table_ptrs[nr_tables++] = (unsigned long)hpet;
+    /* HPET. */
+    if ( hpet_exists(ACPI_HPET_ADDRESS) )
+    {
+        hpet = construct_hpet();
+        if (!hpet) return -1;
+        table_ptrs[nr_tables++] = (unsigned long)hpet;
+    }
 
     /* WAET. */
     waet = construct_waet();
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.2

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