From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:43478)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1UIcCE-00068i-HG
	for qemu-devel@nongnu.org; Thu, 21 Mar 2013 05:54:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1UIcCA-0004Wt-Hh
	for qemu-devel@nongnu.org; Thu, 21 Mar 2013 05:54:06 -0400
Received: from mx1.redhat.com ([209.132.183.28]:47083)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1UIcCA-0004Wp-A7
	for qemu-devel@nongnu.org; Thu, 21 Mar 2013 05:54:02 -0400
Date: Thu, 21 Mar 2013 11:54:25 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20130321095425.GA30456@redhat.com>
References: <cover.1363847789.git.hutao@cn.fujitsu.com>
	<1363856914-23399-2-git-send-email-hutao@cn.fujitsu.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1363856914-23399-2-git-send-email-hutao@cn.fujitsu.com>
Subject: Re: [Qemu-devel] [PATCH v15 2/2] patch dsdt to use passed-in
	pvpanic ioport
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: Hu Tao <hutao@cn.fujitsu.com>
Cc: Peter Maydell <peter.maydell@linaro.org>, Gleb Natapov <gleb@redhat.com>, Jan Kiszka <jan.kiszka@siemens.com>, seabios@seabios.org, qemu-devel <qemu-devel@nongnu.org>, Markus Armbruster <armbru@redhat.com>, Blue Swirl <blauwirbel@gmail.com>, Orit Wasserman <owasserm@redhat.com>, Juan Quintela <quintela@redhat.com>, Alexander Graf <agraf@suse.de>, Christian Borntraeger <borntraeger@de.ibm.com>, Andrew Jones <drjones@redhat.com>, Alex Williamson <alex.williamson@redhat.com>, Sasha Levin <levinsasha928@gmail.com>, Stefan Hajnoczi <stefanha@redhat.com>, Luiz Capitulino <lcapitulino@redhat.com>, KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>, Anthony Liguori <aliguori@us.ibm.com>, Marcelo Tosatti <mtosatti@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>

On Thu, Mar 21, 2013 at 05:08:34PM +0800, Hu Tao wrote:
> Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>

OK now you need to ACK GPLv2+ relicensing too :)

Could you please review that message "make acpi bits GPLv2 compatible"
and respond?

> ---
>  src/acpi-dsdt-isa.dsl | 14 ++++++++++++--
>  src/acpi.c            |  9 +++++++++
>  2 files changed, 21 insertions(+), 2 deletions(-)
> 
> diff --git a/src/acpi-dsdt-isa.dsl b/src/acpi-dsdt-isa.dsl
> index 87a31b9..43fe719 100644
> --- a/src/acpi-dsdt-isa.dsl
> +++ b/src/acpi-dsdt-isa.dsl
> @@ -102,7 +102,9 @@ Scope(\_SB.PCI0.ISA) {
>  
>      Device(PEVT) {
>          Name(_HID, "QEMU0001")
> -        OperationRegion(PEOR, SystemIO, 0x0505, 0x01)
> +        ACPI_EXTRACT_NAME_WORD_CONST dsdt_isa_pest
> +        Name(PEST, 0x505)
> +        OperationRegion(PEOR, SystemIO, PEST, 0x01)
>          Field(PEOR, ByteAcc, NoLock, Preserve) {
>              PEPT,   8,
>          }
> @@ -126,7 +128,15 @@ Scope(\_SB.PCI0.ISA) {
>          }
>  
>          Name(_CRS, ResourceTemplate() {
> -            IO(Decode16, 0x0505, 0x0505, 0x01, 0x01)
> +            IO(Decode16, 0x0505, 0x0505, 0x01, 0x01, IO)
>          })
> +
> +        CreateWordField(_CRS, IO._MIN, IOMN)
> +        CreateWordField(_CRS, IO._MAX, IOMX)
> +
> +        Method(_INI, 0, NotSerialized) {
> +            Store(PEST, IOMN)
> +            Store(PEST, IOMX)
> +        }
>      }
>  }
> diff --git a/src/acpi.c b/src/acpi.c
> index 119d1c1..42fa06e 100644
> --- a/src/acpi.c
> +++ b/src/acpi.c
> @@ -286,11 +286,20 @@ static const struct pci_device_id fadt_init_tbl[] = {
>      PCI_DEVICE_END
>  };
>  
> +static void patch_dsdt(void *dsdt)
> +{
> +    u8 *dsdt_ptr = dsdt;
> +    int pvpanic_port = romfile_loadint("etc/pvpanic-port", 0x505);
> +
> +    *(u16 *)(dsdt_ptr + *dsdt_isa_pest) = pvpanic_port;
> +}
> +
>  static void fill_dsdt(struct fadt_descriptor_rev1 *fadt, void *dsdt)
>  {
>      if (fadt->dsdt) {
>          free((void *)le32_to_cpu(fadt->dsdt));
>      }
> +    patch_dsdt(dsdt);
>      fadt->dsdt = cpu_to_le32((u32)dsdt);
>      fadt->checksum -= checksum(fadt, sizeof(*fadt));
>      dprintf(1, "ACPI DSDT=%p\n", dsdt);
> -- 
> 1.8.1.4