From patchwork Mon Dec 20 05:33:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 76165 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 66721B7063 for ; Mon, 20 Dec 2010 16:34:34 +1100 (EST) Received: from localhost ([127.0.0.1]:49777 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PUYOF-0007l9-2m for incoming@patchwork.ozlabs.org; Mon, 20 Dec 2010 00:34:31 -0500 Received: from [140.186.70.92] (port=38296 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PUYNQ-0007kt-DU for qemu-devel@nongnu.org; Mon, 20 Dec 2010 00:33:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PUYNO-0008EN-V0 for qemu-devel@nongnu.org; Mon, 20 Dec 2010 00:33:40 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:41797) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PUYNO-0008Dh-G4 for qemu-devel@nongnu.org; Mon, 20 Dec 2010 00:33:38 -0500 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 6FC3027F87; Mon, 20 Dec 2010 14:33:35 +0900 (JST) Received: (nullmailer pid 17375 invoked by uid 1000); Mon, 20 Dec 2010 05:33:35 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Mon, 20 Dec 2010 14:33:35 +0900 Message-Id: X-Mailer: git-send-email 1.7.1.1 X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: aliguori@us.ibm.com, yamahata@valinux.co.jp, aurelien@aurel32.net, mst@redhat.com Subject: [Qemu-devel] [PATCH v2] 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 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: "Michael S. Tsirkin" Signed-off-by: Isaku Yamahata --- Changes v1 -> v2: - unregister reset handler in qbus_free() - update the comment - remove ugly void* cast with wrapper - assert() in qbus_free() because main_system_bus is never freed --- hw/qdev.c | 14 +++++++++++++- hw/qdev.h | 2 ++ vl.c | 4 +++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 6fc9b02..d93a6c4 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -333,6 +333,12 @@ void qbus_reset_all(BusState *bus) qbus_walk_children(bus, qdev_reset_one, qbus_reset_one, NULL); } +void qbus_reset_all_fn(void *opaque) +{ + BusState *bus = opaque; + qbus_reset_all(bus); +} + /* can be used as ->unplug() callback for the simple cases */ int qdev_simple_unplug_cb(DeviceState *dev) { @@ -754,8 +760,11 @@ void qbus_create_inplace(BusState *bus, BusInfo *info, if (parent) { QLIST_INSERT_HEAD(&parent->child_bus, bus, sibling); parent->num_child_bus++; + } else if (bus != main_system_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_fn, bus); } - } BusState *qbus_create(BusInfo *info, DeviceState *parent, const char *name) @@ -778,6 +787,9 @@ void qbus_free(BusState *bus) if (bus->parent) { QLIST_REMOVE(bus, sibling); bus->parent->num_child_bus--; + } else { + assert(bus != main_system_bus); /* main_system_bus is never freed */ + qemu_unregister_reset(qbus_reset_all_fn, bus); } qemu_free((void*)bus->name); if (bus->qdev_allocated) { diff --git a/hw/qdev.h b/hw/qdev.h index aaaf55a..b239bb4 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -199,6 +199,8 @@ 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_fn(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 c4d3fc0..8d6bab4 100644 --- a/vl.c +++ b/vl.c @@ -3088,7 +3088,9 @@ int main(int argc, char **argv, char **envp) exit(1); } - 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_fn, sysbus_get_default()); qemu_run_machine_init_done_notifiers(); qemu_system_reset();