From patchwork Wed Nov 14 20:54:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Baron X-Patchwork-Id: 199028 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B674B2C00B5 for ; Thu, 15 Nov 2012 08:41:04 +1100 (EST) Received: from localhost ([::1]:52028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYjzS-0000es-28 for incoming@patchwork.ozlabs.org; Wed, 14 Nov 2012 15:55:18 -0500 Received: from eggs.gnu.org ([208.118.235.92]:53143) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYjyS-00070f-SX for qemu-devel@nongnu.org; Wed, 14 Nov 2012 15:54:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TYjyP-0004Sd-MJ for qemu-devel@nongnu.org; Wed, 14 Nov 2012 15:54:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5310) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYjyP-0004SQ-Ew for qemu-devel@nongnu.org; Wed, 14 Nov 2012 15:54:13 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAEKsATW018530 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 14 Nov 2012 15:54:10 -0500 Received: from redhat.com (dhcp-185-114.bos.redhat.com [10.16.185.114]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qAEKsAd5031761; Wed, 14 Nov 2012 15:54:10 -0500 Date: Wed, 14 Nov 2012 15:54:10 -0500 From: Jason Baron To: anthony@codemonkey.ws, qemu-devel@nongnu.org Message-Id: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: alex.williamson@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, armbru@redhat.com, agraf@suse.de, blauwirbel@gmail.com, yamahata@valinux.co.jp, juzhang@redhat.com, kevin@koconnor.net, kraxel@redhat.com, gsomlo@gmail.com, mkletzan@redhat.com, pbonzini@redhat.com, lcapitulino@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH v4 14/14] q35: automatically load the q35 dsdt table X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jason Baron 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 --- 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 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();