From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Edgar E. Iglesias" Subject: Re: [PATCH] lance: unbreak after memory API conversion Date: Tue, 9 Aug 2011 09:01:21 +0200 Message-ID: <20110809070121.GC3730@zapo> References: <1312872862-30933-1-git-send-email-avi@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org To: Avi Kivity Return-path: Content-Disposition: inline In-Reply-To: <1312872862-30933-1-git-send-email-avi@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org Sender: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org List-Id: kvm.vger.kernel.org On Tue, Aug 09, 2011 at 09:54:22AM +0300, Avi Kivity wrote: > The conversion passed the wrong opaque pointer, causing a crash on first use. > Pass the correct opaque. I've applied this, thanks. > > Signed-off-by: Avi Kivity > --- > hw/lance.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/hw/lance.c b/hw/lance.c > index 8e20360..d83e7f5 100644 > --- a/hw/lance.c > +++ b/hw/lance.c > @@ -116,7 +116,7 @@ static int lance_init(SysBusDevice *dev) > SysBusPCNetState *d = FROM_SYSBUS(SysBusPCNetState, dev); > PCNetState *s = &d->state; > > - memory_region_init_io(&s->mmio, &lance_mem_ops, s, "lance-mmio", 4); > + memory_region_init_io(&s->mmio, &lance_mem_ops, d, "lance-mmio", 4); > > qdev_init_gpio_in(&dev->qdev, parent_lance_reset, 1); > > -- > 1.7.5.3 > > From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:44235) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqgJc-00049c-4U for qemu-devel@nongnu.org; Tue, 09 Aug 2011 03:01:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QqgJa-0006Dk-W7 for qemu-devel@nongnu.org; Tue, 09 Aug 2011 03:01:28 -0400 Received: from mail-fx0-f45.google.com ([209.85.161.45]:34150) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqgJa-0006Dg-Re for qemu-devel@nongnu.org; Tue, 09 Aug 2011 03:01:26 -0400 Received: by fxbb27 with SMTP id b27so5136448fxb.4 for ; Tue, 09 Aug 2011 00:01:25 -0700 (PDT) Date: Tue, 9 Aug 2011 09:01:21 +0200 From: "Edgar E. Iglesias" Message-ID: <20110809070121.GC3730@zapo> References: <1312872862-30933-1-git-send-email-avi@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1312872862-30933-1-git-send-email-avi@redhat.com> Subject: Re: [Qemu-devel] [PATCH] lance: unbreak after memory API conversion List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org On Tue, Aug 09, 2011 at 09:54:22AM +0300, Avi Kivity wrote: > The conversion passed the wrong opaque pointer, causing a crash on first use. > Pass the correct opaque. I've applied this, thanks. > > Signed-off-by: Avi Kivity > --- > hw/lance.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/hw/lance.c b/hw/lance.c > index 8e20360..d83e7f5 100644 > --- a/hw/lance.c > +++ b/hw/lance.c > @@ -116,7 +116,7 @@ static int lance_init(SysBusDevice *dev) > SysBusPCNetState *d = FROM_SYSBUS(SysBusPCNetState, dev); > PCNetState *s = &d->state; > > - memory_region_init_io(&s->mmio, &lance_mem_ops, s, "lance-mmio", 4); > + memory_region_init_io(&s->mmio, &lance_mem_ops, d, "lance-mmio", 4); > > qdev_init_gpio_in(&dev->qdev, parent_lance_reset, 1); > > -- > 1.7.5.3 > >