diff options
| author | Jan Beulich <jbeulich@suse.com> | 2013-07-08 13:22:59 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-07-08 13:22:59 +0200 |
| commit | aca0217117922130140f422b6e1b74c76757f304 (patch) | |
| tree | 4de13991f2c0939aa7708e3a6e5890adfc5d20b1 | |
| parent | 650ec8e1241dc0953285731c8b65f41db7d63027 (diff) | |
| download | xen-aca0217117922130140f422b6e1b74c76757f304.tar.gz xen-aca0217117922130140f422b6e1b74c76757f304.tar.bz2 xen-aca0217117922130140f422b6e1b74c76757f304.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
| -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 d09785d0a1..3fd3d64b13 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(); |