diff options
| author | Jan Beulich <jbeulich@suse.com> | 2013-07-15 13:10:57 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-07-15 13:10:57 +0200 |
| commit | ee38571a76e03840d400fc2b2859d92f3f657fd7 (patch) | |
| tree | a6c2ac66d199b953d813861215254d95d23eef67 /tools | |
| parent | b408c9c201ef958cc72f6ad58cfe0fd11517cb74 (diff) | |
| download | xen-ee38571a76e03840d400fc2b2859d92f3f657fd7.tar.gz xen-ee38571a76e03840d400fc2b2859d92f3f657fd7.tar.bz2 xen-ee38571a76e03840d400fc2b2859d92f3f657fd7.zip | |
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>
master commit: 4867685f7916bb594a67f2f64a28bbf5ecb4949c
master date: 2013-07-08 13:20:20 +0200
Diffstat (limited to 'tools')
| -rw-r--r-- | 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 7281b972fc..f1dd3f0e69 100644 --- 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(); |