diff options
| author | Paul Durrant <paul.durrant@citrix.com> | 2011-11-18 13:31:43 +0000 |
|---|---|---|
| committer | Paul Durrant <paul.durrant@citrix.com> | 2011-11-18 13:31:43 +0000 |
| commit | 93073357470ec76aa1e07672934719d5542b24ad (patch) | |
| tree | 5708da9acf9fef41eba01ccd832145e37aabdd39 /tools/firmware/hvmloader | |
| parent | 04678eb8f30a83620fa2c960431dfe4fb40d86f2 (diff) | |
| download | xen-93073357470ec76aa1e07672934719d5542b24ad.tar.gz xen-93073357470ec76aa1e07672934719d5542b24ad.tar.bz2 xen-93073357470ec76aa1e07672934719d5542b24ad.zip | |
hvmloader: Move acpi_enabled out of hvm_info_table into xenstore
Since hvmloader has a xentore client, use a platform key in xenstore
to indicate whether ACPI is enabled or not rather than the shared
hvm_info_table structure.
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Committed-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'tools/firmware/hvmloader')
| -rw-r--r-- | tools/firmware/hvmloader/hvmloader.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c index f5817b31ff..f120ffea1b 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/tools/firmware/hvmloader/hvmloader.c @@ -423,6 +423,7 @@ int main(void) const struct bios_config *bios; int option_rom_sz = 0, vgabios_sz = 0, etherboot_sz = 0; uint32_t etherboot_phys_addr = 0, option_rom_phys_addr = 0; + int acpi_enabled; /* Initialise hypercall stubs with RET, rendering them no-ops. */ memset((void *)HYPERCALL_PHYSICAL_ADDRESS, 0xc3 /* RET */, PAGE_SIZE); @@ -506,7 +507,9 @@ int main(void) option_rom_phys_addr); } - if ( hvm_info->acpi_enabled ) + acpi_enabled = !strncmp(xenstore_read("platform/acpi", "1"), "1", 1); + + if ( acpi_enabled ) { struct xen_hvm_param p = { .domid = DOMID_SELF, |