From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:32963)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1QvXRa-0003aa-RO
	for qemu-devel@nongnu.org; Mon, 22 Aug 2011 12:33:47 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1QvXRZ-0003Wt-TA
	for qemu-devel@nongnu.org; Mon, 22 Aug 2011 12:33:46 -0400
Received: from mail-yw0-f45.google.com ([209.85.213.45]:40921)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1QvXRZ-0003Vo-Qe
	for qemu-devel@nongnu.org; Mon, 22 Aug 2011 12:33:45 -0400
Received: by ywf9 with SMTP id 9so4302343ywf.4
	for <qemu-devel@nongnu.org>; Mon, 22 Aug 2011 09:33:45 -0700 (PDT)
Message-ID: <4E5284E7.90401@codemonkey.ws>
Date: Mon, 22 Aug 2011 11:33:43 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
References: <1313850590-20247-1-git-send-email-hpoussin@reactos.org>
In-Reply-To: <1313850590-20247-1-git-send-email-hpoussin@reactos.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Subject: Re: [Qemu-devel] [PATCH] pcnet: fix wrong opaque (broken by
	bd8d6f7cadb6ace98c779135217a4ed7b5fccc23)
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: =?UTF-8?B?SGVydsOpIFBvdXNzaW5lYXU=?= <hpoussin@reactos.org>
Cc: qemu-devel@nongnu.org

On 08/20/2011 09:29 AM, Hervé Poussineau wrote:
>
> Signed-off-by: Hervé Poussineau<hpoussin@reactos.org>

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
>   hw/pcnet-pci.c |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c
> index 13d9380..51e1320 100644
> --- a/hw/pcnet-pci.c
> +++ b/hw/pcnet-pci.c
> @@ -290,10 +290,10 @@ static int pci_pcnet_init(PCIDevice *pci_dev)
>       pci_conf[PCI_MAX_LAT] = 0xff;
>
>       /* Handler for memory-mapped I/O */
> -    memory_region_init_io(&d->state.mmio,&pcnet_mmio_ops, d, "pcnet-mmio",
> +    memory_region_init_io(&d->state.mmio,&pcnet_mmio_ops, s, "pcnet-mmio",
>                             PCNET_PNPMMIO_SIZE);
>
> -    memory_region_init_io(&d->io_bar,&pcnet_io_ops, d, "pcnet-io",
> +    memory_region_init_io(&d->io_bar,&pcnet_io_ops, s, "pcnet-io",
>                             PCNET_IOPORT_SIZE);
>       pci_register_bar(pci_dev, 0, PCI_BASE_ADDRESS_SPACE_IO,&d->io_bar);
>