Patchwork [v4,14/14] q35: automatically load the q35 dsdt table

login
register
mail settings
Submitter Jason Baron
Date Nov. 14, 2012, 8:54 p.m.
Message ID <c1f944953484ada898db2a81998d95b50483cea3.1352922993.git.jbaron@redhat.com>
Download mbox | patch
Permalink /patch/199028/
State New
Headers show

Comments

Jason Baron - Nov. 14, 2012, 8:54 p.m.
From: Jason Baron <jbaron@redhat.com>

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 <jbaron@redhat.com>
---
 hw/pc.c     |   19 +++++++++++++++++++
 hw/pc.h     |    2 ++
 hw/pc_q35.c |    7 +++++++
 3 files changed, 28 insertions(+), 0 deletions(-)

Patch

diff --git a/hw/pc.c b/hw/pc.c
index 2b5bbbf..35760f0 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1107,3 +1107,22 @@  void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name)
         gsi_state->ioapic_irq[i] = qdev_get_gpio_in(dev, i);
     }
 }
+
+int find_and_load_dsdt(const char *dsdt_name)
+{
+    char *filename;
+    char buf[1024];
+
+    filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, dsdt_name);
+    if (!filename) {
+        return -1;
+    }
+    snprintf(buf, sizeof(buf), "file=%s", filename);
+    g_free(filename);
+    if (acpi_table_add(buf) < 0) {
+        fprintf(stderr, "Wrong acpi table provided\n");
+        return -1;
+    }
+
+    return 0;
+}
diff --git a/hw/pc.h b/hw/pc.h
index 2237e86..990882d 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -185,5 +185,7 @@  void pc_system_firmware_init(MemoryRegion *rom_memory);
 #define E820_UNUSABLE   5
 
 int e820_add_entry(uint64_t, uint64_t, uint32_t);
+int find_and_load_dsdt(const char *dsdt_name);
+
 
 #endif
diff --git a/hw/pc_q35.c b/hw/pc_q35.c
index 3429a9a..e577ec7 100644
--- a/hw/pc_q35.c
+++ b/hw/pc_q35.c
@@ -86,6 +86,13 @@  static void pc_q35_init(QEMUMachineInitArgs *args)
     PCIDevice *ahci;
     qemu_irq *cmos_s3;
 
+    /* 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();