[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 11/13] q35: automatically load the q35 dsdt table
From: |
Jason Baron |
Subject: |
[Qemu-devel] [PATCH v1 11/13] q35: automatically load the q35 dsdt table |
Date: |
Mon, 29 Oct 2012 22:11:29 -0400 |
From: Jason Baron <address@hidden>
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 <address@hidden>
---
hw/pc.c | 19 +++++++++++++++++++
hw/pc.h | 2 ++
hw/pc_q35.c | 7 +++++++
3 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/hw/pc.c b/hw/pc.c
index af1a076..743d771 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1153,3 +1153,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 e1bf2fc..1a3db90 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -187,5 +187,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 1f31486..a9a7f6c 100644
--- a/hw/pc_q35.c
+++ b/hw/pc_q35.c
@@ -232,6 +232,13 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
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
- Re: [Qemu-devel] [PATCH v1 06/13] pc: Move ioapic_init() from pc_piix.c to pc.c, (continued)
[Qemu-devel] [PATCH v1 09/13] q35: Add kvmclock support, Jason Baron, 2012/10/29
[Qemu-devel] [PATCH v1 11/13] q35: automatically load the q35 dsdt table,
Jason Baron <=
[Qemu-devel] [PATCH v1 07/13] q35: Introduce q35 pc based chipset emulator, Jason Baron, 2012/10/29
[Qemu-devel] [PATCH v1 13/13] Fixup q35/ich9 Licenses, Jason Baron, 2012/10/29
Re: [Qemu-devel] [PATCH v1 00/13] q35 patches for pci tree, Anthony Liguori, 2012/10/30