From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9bju-0002g1-8x for qemu-devel@nongnu.org; Thu, 17 Dec 2015 11:49:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9bjp-0007EW-A3 for qemu-devel@nongnu.org; Thu, 17 Dec 2015 11:49:14 -0500 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:33909) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9bjp-0007EL-4b for qemu-devel@nongnu.org; Thu, 17 Dec 2015 11:49:09 -0500 Received: by mail-wm0-x231.google.com with SMTP id l126so31830235wml.1 for ; Thu, 17 Dec 2015 08:49:08 -0800 (PST) References: <1450348849-21204-1-git-send-email-kraxel@redhat.com> <1450348849-21204-7-git-send-email-kraxel@redhat.com> From: Marcel Apfelbaum Message-ID: <5672E781.1010802@gmail.com> Date: Thu, 17 Dec 2015 18:49:05 +0200 MIME-Version: 1.0 In-Reply-To: <1450348849-21204-7-git-send-email-kraxel@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 6/6] q35: skip q35-acpi-dsdt.aml load if not needed Reply-To: marcel@redhat.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann , qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , seabios@seabios.org, Eduardo Habkost , "Michael S. Tsirkin" M On 12/17/2015 12:40 PM, Gerd Hoffmann wrote: > Only old machine types which don't use the acpi builder (qemu 1.7 + older) > have to load that file for proper acpi support. > > Signed-off-by: Gerd Hoffmann > --- > hw/i386/pc_q35.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 133bc68..727269e 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -129,7 +129,10 @@ static void pc_q35_init(MachineState *machine) > } > > pc_cpus_init(pcms); > - pc_acpi_init("q35-acpi-dsdt.aml"); > + if (!has_acpi_build) { > + /* only machine types 1.7 & older need this */ Actually 1.6 and older, right? (I might be wrong) > + pc_acpi_init("q35-acpi-dsdt.aml"); > + } > > kvmclock_create(); > > It looks OK to me. Reviewed-by: Marcel Apfelbaum Thanks, Marcel