From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:50159)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1TCQHh-0001fE-Au
	for qemu-devel@nongnu.org; Fri, 14 Sep 2012 03:25:58 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1TCQHd-00074U-CM
	for qemu-devel@nongnu.org; Fri, 14 Sep 2012 03:25:53 -0400
Received: from mx1.redhat.com ([209.132.183.28]:10355)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1TCQHd-00074L-47
	for qemu-devel@nongnu.org; Fri, 14 Sep 2012 03:25:49 -0400
Message-ID: <5052DBF4.1060307@redhat.com>
Date: Fri, 14 Sep 2012 09:25:40 +0200
From: Gerd Hoffmann <kraxel@redhat.com>
MIME-Version: 1.0
References: <cover.1347561356.git.jbaron@redhat.com>
	<98c6427441763d8673fcb33918945943e8396b05.1347561356.git.jbaron@redhat.com>
	<5052D7E0.6010508@redhat.com>
In-Reply-To: <5052D7E0.6010508@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 25/25] q35: automatically load the q35 dsdt
 table
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: aliguori@us.ibm.com, alex.williamson@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, Jason Baron <jbaron@redhat.com>, qemu-devel@nongnu.org, agraf@suse.de, yamahata@valinux.co.jp, juzhang@redhat.com, kevin@koconnor.net, avi@redhat.com, mkletzan@redhat.com, lcapitulino@redhat.com, afaerber@suse.de, armbru@redhat.com

On 09/14/12 09:08, Paolo Bonzini wrote:
> Il 13/09/2012 22:12, Jason Baron ha scritto:
>> 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.

>>  /* 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();
>>
> 
> Should we take the PIIX4 DSDT into the QEMU tree, and do the same thing
> for PIIX4?

We should surely have both at the same place.  Dunno what the best place
is, we have interactions with both seabios code and acpi tables and qemu
+ acpi tables.

I'd tend to put them into seabios.git, add a config option to select
piix/q35, then go build two bios binaries.

cheers,
  Gerd