From patchwork Mon Dec 17 16:24:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 206925 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B89F72C0093 for ; Tue, 18 Dec 2012 04:03:05 +1100 (EST) Received: from localhost ([::1]:46979 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkdW0-0001Ao-Dn for incoming@patchwork.ozlabs.org; Mon, 17 Dec 2012 11:26:04 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52807) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkdVT-0000aI-ER for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:25:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TkdVO-0008If-5b for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:25:31 -0500 Received: from mail-ia0-f173.google.com ([209.85.210.173]:35712) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkdVO-0008Ib-0W for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:25:26 -0500 Received: by mail-ia0-f173.google.com with SMTP id w21so5709966iac.4 for ; Mon, 17 Dec 2012 08:25:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=2irr2xpqjQ3b2mMYy2WIBAq8QOJB+6Er51B6UwyIfSU=; b=brkLinoJ25hktOip4OodQjKBm/PCxGqeP8hXgtdrg5ij/UVhyo+OwCT0JuZJkJ4Vwy eYTYmKsWH7ZZwKkAIMjL4wC9j4qhW6o/TO9QBOxEzsKpEuRqHGcVtrKBCSA6h9nhkUpk r+gr26cFta7Bgb/JxeD7iQ8C6ckGrCi2+C9nMX9Q8+ecZ3cn/m8meRN6648z8dS7OQiU +xTMSvMSERIQbCS97tShSgrVGKH2nY8VkZFsJ5s5QYWAfobHOnxhasUpSKpbdRBBm0X3 dKeFLvKE2CRC2qxkQfEbEs2ov6nuUSFLfp8FQPBMowyhpbCJ8fVgF04Oys0IJjmuOqfX CNoQ== Received: by 10.50.184.226 with SMTP id ex2mr9698204igc.6.1355761525253; Mon, 17 Dec 2012 08:25:25 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-219-150.ip51.fastwebnet.it. [93.34.219.150]) by mx.google.com with ESMTPS id bh3sm5950327igc.0.2012.12.17.08.25.22 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Dec 2012 08:25:24 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 17 Dec 2012 17:24:42 +0100 Message-Id: <1355761490-10073-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.0.2 In-Reply-To: <1355761490-10073-1-git-send-email-pbonzini@redhat.com> References: <1355761490-10073-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.210.173 Cc: aliguori@us.ibm.com, mst@redhat.com Subject: [Qemu-devel] [PATCH 07/15] pci: do not export pci_bus_reset X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org qbus_reset_all can be used instead. There is no semantic change because pcibus_reset returns 1 and takes care of the device tree traversal. Signed-off-by: Paolo Bonzini --- hw/pci.c | 10 +++------- hw/pci.h | 1 - hw/pci_bridge.c | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index ace9368..436982e 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -209,8 +209,9 @@ void pci_device_reset(PCIDevice *dev) * Trigger pci bus reset under a given bus. * To be called on RST# assert. */ -void pci_bus_reset(PCIBus *bus) +static int pcibus_reset(BusState *qbus) { + PCIBus *bus = DO_UPCAST(PCIBus, qbus, qbus); int i; for (i = 0; i < ARRAY_SIZE(bus->devices); ++i) { @@ -221,13 +222,8 @@ void pci_bus_reset(PCIBus *bus) for (i = 0; i < bus->nirq; i++) { assert(bus->irq_count[i] == 0); } -} - -static int pcibus_reset(BusState *qbus) -{ - pci_bus_reset(DO_UPCAST(PCIBus, qbus, qbus)); - /* topology traverse is done by pci_bus_reset(). + /* topology traverse is done in the pci_device_reset() loop above. Tell qbus/qdev walker not to traverse the tree */ return 1; } diff --git a/hw/pci.h b/hw/pci.h index 4da0c2a..88fd4a3 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -334,7 +334,6 @@ void pci_bus_fire_intx_routing_notifier(PCIBus *bus); void pci_device_set_intx_routing_notifier(PCIDevice *dev, PCIINTxRoutingNotifier notifier); void pci_device_reset(PCIDevice *dev); -void pci_bus_reset(PCIBus *bus); PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model, const char *default_devaddr); diff --git a/hw/pci_bridge.c b/hw/pci_bridge.c index 4680501..30ed34e 100644 --- a/hw/pci_bridge.c +++ b/hw/pci_bridge.c @@ -234,7 +234,7 @@ void pci_bridge_write_config(PCIDevice *d, newctl = pci_get_word(d->config + PCI_BRIDGE_CONTROL); if (~oldctl & newctl & PCI_BRIDGE_CTL_BUS_RESET) { /* Trigger hot reset on 0->1 transition. */ - pci_bus_reset(&s->sec_bus); + qbus_reset_all(&s->sec_bus.qbus); } }