Automatically, locate the required q35 dsdt table on load. Otherwise we error
out. This could be done in the bios, but its harder to produce a good error
message.
Signed-off-by: Jason Baron <jba...@redhat.com>
---
hw/pc_q35.c | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/hw/pc_q35.c b/hw/pc_q35.c
index b8c1196..08ae62b 100644
--- a/hw/pc_q35.c
+++ b/hw/pc_q35.c
@@ -329,6 +329,25 @@ static void pc_q35_init_late(BusState **idebus, ISADevice
*rtc_state,
8, NULL, 0);
}
+static int find_and_load_dsdt(const char *dsdt_name)
+{
+ char *filename;
+ char buf[256];
+
+ filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, dsdt_name);
+ if (!filename) {
+ return -1;
+ }
+
+ snprintf(buf, 256, "file=%s", filename);
+ if (acpi_table_add(buf) < 0) {
+ fprintf(stderr, "Wrong acpi table provided\n");
+ return -1;
+ }
+
+ return 0;
+}
+
/* PC hardware initialisation */
static void pc_q35_init(ram_addr_t ram_size,
const char *boot_device,
@@ -356,6 +375,13 @@ static void pc_q35_init(ram_addr_t ram_size,
qemu_irq *i8259;
int i;
+ /* let's first see if we can find the proper dsdt */
+ if (find_and_load_dsdt("q35-acpi-dsdt.aml")) {
+ fprintf(stderr, "Couldn't find q35 dsdt table!\n"
+ "Try updating your bios.\n");
+ exit(1);
+ }
+
pc_cpus_init(cpu_model);
kvmclock_create();
--
1.7.1
