From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:60609)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1WGVUY-0000uk-Ec
	for qemu-devel@nongnu.org; Thu, 20 Feb 2014 10:24:56 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1WGVUS-0001Kj-Eb
	for qemu-devel@nongnu.org; Thu, 20 Feb 2014 10:24:50 -0500
Received: from mx1.redhat.com ([209.132.183.28]:44950)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1WGVUS-0001Ka-6Q
	for qemu-devel@nongnu.org; Thu, 20 Feb 2014 10:24:44 -0500
Date: Thu, 20 Feb 2014 17:29:40 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20140220152940.GB31205@redhat.com>
References: <1392647087-23020-1-git-send-email-mst@redhat.com>
	<1392647087-23020-2-git-send-email-mst@redhat.com>
	<20140217145138.GJ29329@ERROL.INI.CMU.EDU>
	<20140219135022.GA17601@redhat.com>
	<20140219190215.GA24591@redhat.com>
	<20140219194528.GW29329@ERROL.INI.CMU.EDU>
	<20140220051346.GA28241@redhat.com>
	<20140220142245.GC25087@ERROL.INI.CMU.EDU>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20140220142245.GC25087@ERROL.INI.CMU.EDU>
Subject: Re: [Qemu-devel] [PULL 1/5] acpi-build: append description for
	non-hotplug
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: "Gabriel L. Somlo" <gsomlo@gmail.com>
Cc: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org, Anthony Liguori <aliguori@amazon.com>

On Thu, Feb 20, 2014 at 09:22:46AM -0500, Gabriel L. Somlo wrote:
> Hi Michael,
> 
> On Thu, Feb 20, 2014 at 07:13:46AM +0200, Michael S. Tsirkin wrote:
> > Oh yes, I forgot that Q35 has a separate DSDT.
> > Please add this on top:
> 
> Thanks, I can confirm that this patch
> (ceb36090bf2054c8ad5c8cf441b690fad5581f4f) on top of
> a0ad25b1e5d0eb21cbba001799341bd6b557e995, on top of
> the first patch you submitted ("acpi-build: append description for
> non-hotplug") fixes it for me !
> 
> Regards,
> --Gabriel

Yay!
Okay will let it go through some testing and push hopefully
early next week.
Thanks a lot for catching this in time!

> 
> > 
> > commit ceb36090bf2054c8ad5c8cf441b690fad5581f4f
> > Author: Michael S. Tsirkin <mst@redhat.com>
> > Date:   Thu Feb 20 07:10:56 2014 +0200
> > 
> >     q35: fix up dsdt as well
> > 
> > diff --git a/hw/i386/q35-acpi-dsdt.dsl b/hw/i386/q35-acpi-dsdt.dsl
> > index 8e522a5..f4d2a2d 100644
> > --- a/hw/i386/q35-acpi-dsdt.dsl
> > +++ b/hw/i386/q35-acpi-dsdt.dsl
> > @@ -72,7 +72,6 @@ DefinitionBlock (
> >              Name(_ADR, 0x00)
> >              Name(_UID, 1)
> >  
> > -#define ISA SF8_
> >              External(ISA, DeviceObj)
> >  
> >              // _OSC: based on sample of ACPI3.0b spec
> > @@ -140,8 +139,10 @@ DefinitionBlock (
> >   * LPC ISA bridge
> >   ****************************************************************/
> >  
> > -    Scope(\_SB.PCI0.ISA) {
> > +    Scope(\_SB.PCI0) {
> >          /* PCI D31:f0 LPC ISA bridge */
> > +        Device(ISA) {
> > +            Name (_ADR, 0x001F0000)  // _ADR: Address
> >  
> >              /* ICH9 PCI to ISA irq remapping */
> >              OperationRegion(PIRQ, PCI_Config, 0x60, 0x0C)
> > @@ -164,6 +165,7 @@ DefinitionBlock (
> >                  LPEN,   1,
> >                  FDEN,   1
> >              }
> > +        }
> >      }
> >  
> >  #define DSDT_APPLESMC_STA q35_dsdt_applesmc_sta