From patchwork Sun Dec 19 13:19:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 76125 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E6F86B708B for ; Mon, 20 Dec 2010 00:21:13 +1100 (EST) Received: from localhost ([127.0.0.1]:37604 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PUJCI-0000Nz-9S for incoming@patchwork.ozlabs.org; Sun, 19 Dec 2010 08:21:10 -0500 Received: from [140.186.70.92] (port=59066 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PUJBA-0008Sp-9E for qemu-devel@nongnu.org; Sun, 19 Dec 2010 08:20:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PUJB8-0000mh-SS for qemu-devel@nongnu.org; Sun, 19 Dec 2010 08:20:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42497) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PUJB8-0000md-Hm for qemu-devel@nongnu.org; Sun, 19 Dec 2010 08:19:58 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oBJDJiOA005247 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 19 Dec 2010 08:19:44 -0500 Received: from redhat.com (vpn-200-18.tlv.redhat.com [10.35.200.18]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id oBJDJerN020281; Sun, 19 Dec 2010 08:19:41 -0500 Date: Sun, 19 Dec 2010 15:19:22 +0200 From: "Michael S. Tsirkin" To: Isaku Yamahata Message-ID: <20101219131922.GA19158@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, qemu-devel@nongnu.org, aurelien@aurel32.net Subject: [Qemu-devel] Re: [PATCH] qbus: register reset handler for qbus whose parent is NULL X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On Sun, Dec 19, 2010 at 10:22:50AM +0900, Isaku Yamahata wrote: > Stefan Weil reported the regression caused by > ec990eb622ad46df5ddcb1e94c418c271894d416 as follows > > > The second regression also occurs with MIPS malta. > > Networking no longer works with the default pcnet nic. > > > > This is caused because the reset function for pcnet is no > > longer called during system boot. The result in an invalid > > mac address (all zero) and a non-working nic. > > > > For this second regression I still have no simple solution. > > Of course mips_malta.c should be converted to qdev which > > would fix both problems (but only for malta system emulation). > > The issue is, it is assumed that all qbuses, qdeves are under > main_system_bus. But there are qbuses whose parent is NULL. So it > is necessary to trigger reset for those qbuses. > (On the other hand, if NULL is passed to qdev_create(), its parent bus > is main_system_bus.) > Ideally those buses should be moved under bus controller > device which is qdev. But it's not done yet. > So register qbus reset handler for qbus whose parent is NULL. > > Reported-by: Stefan Weil > Signed-off-by: Isaku Yamahata > Tested-by: Stefan Weil So - I think the following on top addresses the issues. Comments? Compile-tested only. diff --git a/hw/qdev.c b/hw/qdev.c index 5dc20c8..e04bd4c 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -328,8 +328,9 @@ void qdev_reset_all(DeviceState *dev) qdev_walk_children(dev, qdev_reset_one, qbus_reset_one, NULL); } -void qbus_reset_all(BusState *bus) +void qbus_reset_all(void *opaque) { + BusState *bus = opaque; qbus_walk_children(bus, qdev_reset_one, qbus_reset_one, NULL); } @@ -755,9 +756,9 @@ void qbus_create_inplace(BusState *bus, BusInfo *info, QLIST_INSERT_HEAD(&parent->child_bus, bus, sibling); parent->num_child_bus++; } else if (bus != main_system_bus) { - /* TODO: once all device is qdevified, - reset handler for main_system_bus should also be registered here */ - qemu_register_reset((void *)qbus_reset_all, bus); + /* TODO: once all bus devices are qdevified, + only reset handler for main_system_bus should be registered here. */ + qemu_register_reset(qbus_reset_all, bus); } } @@ -781,6 +782,10 @@ void qbus_free(BusState *bus) if (bus->parent) { QLIST_REMOVE(bus, sibling); bus->parent->num_child_bus--; + } else { + /* TODO: once all bus devices are qdevified, only reset handler for + * main_system_bus should be unregistered here. */ + qemu_unregister_reset(qbus_reset_all, bus); } qemu_free((void*)bus->name); if (bus->qdev_allocated) { diff --git a/hw/qdev.h b/hw/qdev.h index aaaf55a..1f0e02a 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -198,7 +198,7 @@ int qbus_walk_children(BusState *bus, qdev_walkerfn *devfn, int qdev_walk_children(DeviceState *dev, qdev_walkerfn *devfn, qbus_walkerfn *busfn, void *opaque); void qdev_reset_all(DeviceState *dev); -void qbus_reset_all(BusState *bus); +void qbus_reset_all(void *opaque); void qbus_free(BusState *bus); #define FROM_QBUS(type, dev) DO_UPCAST(type, qbus, dev) diff --git a/vl.c b/vl.c index 2ec3989..d5f094b 100644 --- a/vl.c +++ b/vl.c @@ -3088,9 +3088,9 @@ int main(int argc, char **argv, char **envp) exit(1); } - /* TODO: once all device is qdevified, this should be done by - qbus_create_inplace() */ - qemu_register_reset((void *)qbus_reset_all, sysbus_get_default()); + /* TODO: once all bus devices are qdevified, this should be done + * when bus is created by qdev.c */ + qemu_register_reset(qbus_reset_all, sysbus_get_default()); qemu_run_machine_init_done_notifiers(); qemu_system_reset();