Revert "hvmloader: always include HPET table"

This reverts commit e4fd0475a08fda414da27c4e57b568f147cfc07e.

Conflicts:
	tools/firmware/hvmloader/acpi/build.c

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir.xen@gmail.com>

diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c
index 7281b972fc7c44e8331956aa51a59ab2df67b4b8..f1dd3f0e690e462ffb53584dbad70a397c18e2ca 100644 (file)
--- a/tools/firmware/hvmloader/acpi/build.c
+++ b/tools/firmware/hvmloader/acpi/build.c
@@ -268,11 +268,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();