From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=45126 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PJNhT-0007Xi-HF for qemu-devel@nongnu.org; Fri, 19 Nov 2010 04:56:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PJNhP-0004SJ-Hw for qemu-devel@nongnu.org; Fri, 19 Nov 2010 04:56:11 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:52274) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PJNhO-0004Rl-V7 for qemu-devel@nongnu.org; Fri, 19 Nov 2010 04:56:07 -0500 From: Isaku Yamahata Date: Fri, 19 Nov 2010 18:56:02 +0900 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH v2 5/6] pci: make use of qdev reset frame work to pci bus reset. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: skandasa@cisco.com, Anthony Liguori , etmartin@cisco.com, wexu2@cisco.com, mst@redhat.com, yamahata@valinux.co.jp, pbonzini@redhat.com Signed-off-by: Isaku Yamahata Signed-off-by: Anthony Liguori --- hw/pci.c | 33 +++++++++++++++++++++++++++++---- hw/pci.h | 3 +++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 962886e..51b7857 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -43,12 +43,14 @@ static void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent); static char *pcibus_get_dev_path(DeviceState *dev); +static int pcibus_reset(BusState *qbus); struct BusInfo pci_bus_info = { .name = "PCI", .size = sizeof(PCIBus), .print_dev = pcibus_dev_print, .get_dev_path = pcibus_get_dev_path, + .reset = pcibus_reset, .props = (Property[]) { DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1), DEFINE_PROP_STRING("romfile", PCIDevice, romfile), @@ -133,7 +135,7 @@ static void pci_update_irq_status(PCIDevice *dev) } } -static void pci_device_reset(PCIDevice *dev) +void pci_device_reset_default(PCIDevice *dev) { int r; @@ -161,9 +163,24 @@ static void pci_device_reset(PCIDevice *dev) pci_update_mappings(dev); } -static void pci_bus_reset(void *opaque) +static void pci_device_reset(PCIDevice *dev) +{ + if (!dev->qdev.info) { + /* not all pci devices haven't been qdev'fied yet + TODO: remove this when all pci devices are qdev'fied. */ + pci_device_reset_default(dev); + } else { + qdev_reset_all(&dev->qdev); + pci_device_reset_default(dev); + } +} + +/* + * Trigger pci bus reset under a given bus. + * This functions emulates RST#. + */ +void pci_bus_reset(PCIBus *bus) { - PCIBus *bus = opaque; int i; for (i = 0; i < bus->nirq; i++) { @@ -176,6 +193,15 @@ static void pci_bus_reset(void *opaque) } } +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 */ + return 1; +} + static void pci_host_bus_register(int domain, PCIBus *bus) { struct PCIHostBus *host; @@ -230,7 +256,6 @@ void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent, pci_host_bus_register(0, bus); /* for now only pci domain 0 is supported */ vmstate_register(NULL, -1, &vmstate_pcibus, bus); - qemu_register_reset(pci_bus_reset, bus); } PCIBus *pci_bus_new(DeviceState *parent, const char *name, int devfn_min) diff --git a/hw/pci.h b/hw/pci.h index 7100804..280a2f8 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -225,6 +225,9 @@ PCIBus *pci_register_bus(DeviceState *parent, const char *name, pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, void *irq_opaque, int devfn_min, int nirq); +void pci_bus_reset(PCIBus *bus); +void pci_device_reset_default(PCIDevice *dev); + void pci_bus_set_mem_base(PCIBus *bus, target_phys_addr_t base); PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model, -- 1.7.1.1