At the moment this flag is unconditionally set for PVHv2 domains. Note that
using this boot flag requires that the FADT table revision is at least 5 (or any
later version), so bump the current FADT version from 4 to 5 and add two new
fields that will be unused.
Reported-by: Jan Beulich <jbeul...@suse.com>
Signed-off-by: Roger Pau Monné <roger....@citrix.com>
---
Cc: Jan Beulich <jbeul...@suse.com>
Cc: Andrew Cooper <andrew.coop...@citrix.com>
Cc: Ian Jackson <ian.jack...@eu.citrix.com>
Cc: Wei Liu <wei.l...@citrix.com>
Cc: boris.ostrov...@oracle.com
Cc: konrad.w...@oracle.com
---
Ideally this should be somehow fetched from the emulation_flags set of flags,
but sadly there's no way for hvmloader (which runs in guest context) to fetch
this information. If at some point a rtc option is added to libxl, we should see
about passing it through to init_acpi_config in libxl_x86_acpi.c so that we can
then appropriately set this flag for PVHv2 guests.
---
tools/firmware/hvmloader/util.c | 2 +-
tools/libacpi/acpi2_0.h | 5 ++++-
tools/libacpi/build.c | 2 ++
tools/libacpi/libacpi.h | 1 +
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c
index 3f86c88..cadfbd8 100644
--- a/tools/firmware/hvmloader/util.c
+++ b/tools/firmware/hvmloader/util.c
@@ -949,7 +949,7 @@ void hvmloader_acpi_build_tables(struct acpi_config *config,
config->table_flags |= ACPI_HAS_SSDT_S4;
config->table_flags |= (ACPI_HAS_TCPA | ACPI_HAS_IOAPIC | ACPI_HAS_WAET |
- ACPI_HAS_VGA | ACPI_HAS_8042);
+ ACPI_HAS_VGA | ACPI_HAS_8042 | ACPI_HAS_CMOS_RTC);
config->tis_hdr = (uint16_t *)ACPI_TIS_HDR_ADDRESS;
diff --git a/tools/libacpi/acpi2_0.h b/tools/libacpi/acpi2_0.h
index 500f95e..6db374b 100644
--- a/tools/libacpi/acpi2_0.h
+++ b/tools/libacpi/acpi2_0.h
@@ -222,6 +222,8 @@ struct acpi_20_fadt {
struct acpi_20_generic_address x_pm_tmr_blk;
struct acpi_20_generic_address x_gpe0_blk;
struct acpi_20_generic_address x_gpe1_blk;
+ struct acpi_20_generic_address sleep_control;
+ struct acpi_20_generic_address sleep_status;
};
/*
@@ -230,6 +232,7 @@ struct acpi_20_fadt {
#define ACPI_FADT_LEGACY_DEVICES (1 << 0)
#define ACPI_FADT_8042 (1 << 1)
#define ACPI_FADT_NO_VGA (1 << 2)
+#define ACPI_FADT_NO_CMOS_RTC (1 << 5)
/*
* FADT Fixed Feature Flags.
@@ -436,7 +439,7 @@ struct acpi_20_slit {
* Table revision numbers.
*/
#define ACPI_2_0_RSDP_REVISION 0x02
-#define ACPI_2_0_FADT_REVISION 0x04
+#define ACPI_2_0_FADT_REVISION 0x05
#define ACPI_2_0_MADT_REVISION 0x02
#define ACPI_2_0_RSDT_REVISION 0x01
#define ACPI_2_0_XSDT_REVISION 0x01
diff --git a/tools/libacpi/build.c b/tools/libacpi/build.c
index 844dea1..10f7cc2 100644
--- a/tools/libacpi/build.c
+++ b/tools/libacpi/build.c
@@ -583,6 +583,8 @@ int acpi_build_tables(struct acpi_ctxt *ctxt, struct
acpi_config *config)
fadt->iapc_boot_arch |= ACPI_FADT_NO_VGA;
if ( config->table_flags & ACPI_HAS_8042 )
fadt->iapc_boot_arch |= ACPI_FADT_8042;
+ if ( !(config->table_flags & ACPI_HAS_CMOS_RTC) )
+ fadt->iapc_boot_arch |= ACPI_FADT_NO_CMOS_RTC;
set_checksum(fadt,
offsetof(struct acpi_header, checksum),
sizeof(struct acpi_20_fadt));
diff --git a/tools/libacpi/libacpi.h b/tools/libacpi/libacpi.h
index e0f1537..5a0ec76 100644
--- a/tools/libacpi/libacpi.h
+++ b/tools/libacpi/libacpi.h
@@ -32,6 +32,7 @@
#define ACPI_HAS_WAET (1<<9)
#define ACPI_HAS_VGA (1<<10)
#define ACPI_HAS_8042 (1<<11)
+#define ACPI_HAS_CMOS_RTC (1<<12)
struct xen_vmemrange;
struct acpi_numa {
--
2.9.3 (Apple Git-75)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
