From patchwork Tue Aug 9 06:54:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 1047632 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p796sTwE020069 for ; Tue, 9 Aug 2011 06:54:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751278Ab1HIGy1 (ORCPT ); Tue, 9 Aug 2011 02:54:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60689 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751140Ab1HIGy0 (ORCPT ); Tue, 9 Aug 2011 02:54:26 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p796sPHK023798 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 9 Aug 2011 02:54:25 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p796sPWk013231; Tue, 9 Aug 2011 02:54:25 -0400 Received: from s01.tlv.redhat.com (s01.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 1912F250B44; Tue, 9 Aug 2011 09:54:24 +0300 (IDT) From: Avi Kivity To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org Subject: [PATCH] lance: unbreak after memory API conversion Date: Tue, 9 Aug 2011 09:54:22 +0300 Message-Id: <1312872862-30933-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 09 Aug 2011 06:54:29 +0000 (UTC) The conversion passed the wrong opaque pointer, causing a crash on first use. Pass the correct opaque. 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);