From patchwork Thu Mar 10 08:53:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 86203 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 6B8D6B6F9C for ; Thu, 10 Mar 2011 19:55:15 +1100 (EST) Received: from localhost ([127.0.0.1]:47537 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PxbeK-0002Tn-7c for incoming@patchwork.ozlabs.org; Thu, 10 Mar 2011 03:55:12 -0500 Received: from [140.186.70.92] (port=47047 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pxbd8-0002FA-MS for qemu-devel@nongnu.org; Thu, 10 Mar 2011 03:53:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pxbd7-0000l5-H6 for qemu-devel@nongnu.org; Thu, 10 Mar 2011 03:53:58 -0500 Received: from mail-gx0-f173.google.com ([209.85.161.173]:35926) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pxbd7-0000l0-BU for qemu-devel@nongnu.org; Thu, 10 Mar 2011 03:53:57 -0500 Received: by gxk28 with SMTP id 28so667716gxk.4 for ; Thu, 10 Mar 2011 00:53:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:message-id:x-mailer; bh=zE+9IKlcvCKfOojFiXjRf+fbD/aAYzFDmKc1+pQhFwE=; b=XPtr+xAKzABNBbpzWMvrQVxBrrDC9NIsv/fXcQ5ckXl42eBqxgAyziHGF1rIK5SuAa c3wlb6nrwhxv1MsaxCA7fnsjB7IukknQPVpnSw94ABFuApUFDvCppSrqnemj8pLLR2P/ OpRUgD+MqOAQfzc17D4fgLFiVDpLge9uGTHZk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:x-mailer; b=CfZr/kKGbJQ8A4kbicN3Mw5U+/d9F4Uv7iiz72pWqhmAehnDwFIO69BGErvKxdAKP9 uFsNFfP7157/3HFsBIRtBkucbALcup67WfTaOKwPIvZyuzpj9lrB+uF5N5izsfjns21u QXGTxLSxLdFYHod6OnxQEfA4glKN5n53fehI8= Received: by 10.151.5.15 with SMTP id h15mr723581ybi.237.1299747236263; Thu, 10 Mar 2011 00:53:56 -0800 (PST) Received: from doriath.ww600.siemens.net ([91.213.169.4]) by mx.google.com with ESMTPS id w15sm3939858ybk.13.2011.03.10.00.53.54 (version=SSLv3 cipher=OTHER); Thu, 10 Mar 2011 00:53:55 -0800 (PST) From: Dmitry Eremin-Solenikov To: qemu-devel@nongnu.org Date: Thu, 10 Mar 2011 11:53:49 +0300 Message-Id: <1299747229-18141-1-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.7.2.3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.161.173 Subject: [Qemu-devel] [PATCH] Register only one qbus_reset_all_fn() for system bus 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 Currently reset handler is registered for System bus twice: once during bus creation and once in vl.c. Remove the second qemu_register_reset() invocation. Also while we are at it, remove incorrect check at qbus_create_inplace(): when system bus is created, main_system_bus is NULL (as it's not yet created, it cannot be set), so the check is just wrong. Signed-off-by: Dmitry Eremin-Solenikov --- hw/qdev.c | 2 +- vl.c | 3 --- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 1aa1ea0..0a3c8ce 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -762,7 +762,7 @@ 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) { + } else { /* 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); diff --git a/vl.c b/vl.c index 91be92e..24923db 100644 --- a/vl.c +++ b/vl.c @@ -3120,9 +3120,6 @@ int main(int argc, char **argv, char **envp) exit(1); } - /* 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();