From patchwork Fri Dec 6 16:54:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 298100 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9AA702C00A8 for ; Sat, 7 Dec 2013 04:01:58 +1100 (EST) Received: from localhost ([::1]:60231 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Voymq-0006E6-2r for incoming@patchwork.ozlabs.org; Fri, 06 Dec 2013 12:01:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36775) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Voyfy-0005vk-RZ for qemu-devel@nongnu.org; Fri, 06 Dec 2013 11:54:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Voyfp-0000c1-NI for qemu-devel@nongnu.org; Fri, 06 Dec 2013 11:54:50 -0500 Received: from mail-ea0-x233.google.com ([2a00:1450:4013:c01::233]:63907) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Voyfp-0000bx-G8 for qemu-devel@nongnu.org; Fri, 06 Dec 2013 11:54:41 -0500 Received: by mail-ea0-f179.google.com with SMTP id r15so426720ead.38 for ; Fri, 06 Dec 2013 08:54:40 -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:in-reply-to:references; bh=jhT8RRGkM3FeidzSkA96BCH9yrXpifZNvUlvp6KJ/3w=; b=qy5jgFTXU+CfXZEEzAEhBWujZ1raVryoqg8DT2CH2B4q2qfaR2Q7Q2nmtYquGdcxN1 dkzixmjUxyascaPf0mPCixMsysLBh67Qh1pdTaMI0xgxOk3fbYnXE01j2sgzOeMKTGGW fVdGjMf0r3WZYt5GvBmuKXsV1MAxtcuMj3bvIdmLRIvC2j7xA9Y3dKfG3OjQ4CXutPCw 2vv3NHdMK7S2Q2/VqyJtCsrxtspvSqgnQH0rwfnqFUkQqhzNn+4RrmNNAwoXA6EFsMnx fsg2D3XNJ0X4FKqfDKsmGPEx06Y9V7IWKoZOqn03m+xTJ8ITObcB/9g2O1nRFO8b3TWT GYeg== X-Received: by 10.15.52.73 with SMTP id o49mr3367110eew.60.1386348880620; Fri, 06 Dec 2013 08:54:40 -0800 (PST) Received: from localhost.localdomain (net-2-35-202-54.cust.dsl.vodafone.it. [2.35.202.54]) by mx.google.com with ESMTPSA id z42sm47261952eeo.17.2013.12.06.08.54.38 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 06 Dec 2013 08:54:39 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 6 Dec 2013 17:54:24 +0100 Message-Id: <1386348867-25038-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1386348867-25038-1-git-send-email-pbonzini@redhat.com> References: <1386348867-25038-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::233 Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH 1/4] 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/pci.c | 8 ++------ hw/pci/pci_bridge.c | 2 +- include/hw/pci/pci.h | 1 - 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index bd084c7..ac3244b 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -210,8 +210,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 < bus->nirq; i++) { @@ -222,11 +223,6 @@ void pci_bus_reset(PCIBus *bus) pci_device_reset(bus->devices[i]); } } -} - -static int pcibus_reset(BusState *qbus) -{ - pci_bus_reset(DO_UPCAST(PCIBus, qbus, qbus)); /* topology traverse is done by pci_bus_reset(). Tell qbus/qdev walker not to traverse the tree */ diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c index 307e076..06831a2 100644 --- a/hw/pci/pci_bridge.c +++ b/hw/pci/pci_bridge.c @@ -268,7 +268,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); } } diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index ccec2ba..32f1419 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -376,7 +376,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, PCIBus *rootbus, const char *default_model,