[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC v6 09/11] qdev: add bus reset_notifiers callback
From: |
Chen Fan |
Subject: |
[Qemu-devel] [PATCH RFC v6 09/11] qdev: add bus reset_notifiers callbacks for host bus reset |
Date: |
Wed, 29 Apr 2015 16:48:37 +0800 |
when recovery AER, we always need to reset the host bus to recovery
the devices under the bus, so add pci bus callbacks to reset host bus
when vfio support AER.
Signed-off-by: Chen Fan <address@hidden>
---
hw/pci/pci.c | 6 ++++++
hw/pci/pci_bridge.c | 3 +++
include/hw/pci/pci.h | 2 ++
include/hw/pci/pci_bus.h | 2 ++
4 files changed, 13 insertions(+)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index b3d5100..427d4d6 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -74,11 +74,17 @@ static const VMStateDescription vmstate_pcibus = {
}
};
+void pci_bus_add_reset_notifier(PCIBus *bus, Notifier *notify)
+{
+ notifier_list_add(&bus->reset_notifiers, notify);
+}
+
static void pci_bus_realize(BusState *qbus, Error **errp)
{
PCIBus *bus = PCI_BUS(qbus);
vmstate_register(NULL, -1, &vmstate_pcibus, bus);
+ notifier_list_init(&bus->reset_notifiers);
}
static void pci_bus_unrealize(BusState *qbus, Error **errp)
diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c
index 40c97b1..24fee8b 100644
--- a/hw/pci/pci_bridge.c
+++ b/hw/pci/pci_bridge.c
@@ -267,6 +267,9 @@ void pci_bridge_write_config(PCIDevice *d,
newctl = pci_get_word(d->config + PCI_BRIDGE_CONTROL);
if (~oldctl & newctl & PCI_BRIDGE_CTL_BUS_RESET) {
+ /* do host secondary bus reset for passthrough devices */
+ notifier_list_notify(&s->sec_bus.reset_notifiers, NULL);
+
/* Trigger hot reset on 0->1 transition. */
qbus_reset_all(&s->sec_bus.qbus);
}
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index d4ffead..79ae725 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -7,6 +7,7 @@
#include "exec/memory.h"
#include "sysemu/dma.h"
#include "qapi/error.h"
+#include "qemu/notify.h"
/* PCI includes legacy ISA access. */
#include "hw/isa/isa.h"
@@ -370,6 +371,7 @@ 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_add_reset_notifier(PCIBus *bus, Notifier *notify);
PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus,
const char *default_model,
diff --git a/include/hw/pci/pci_bus.h b/include/hw/pci/pci_bus.h
index fabaeee..3b551d7 100644
--- a/include/hw/pci/pci_bus.h
+++ b/include/hw/pci/pci_bus.h
@@ -29,6 +29,8 @@ struct PCIBus {
Keep a count of the number of devices with raised IRQs. */
int nirq;
int *irq_count;
+
+ NotifierList reset_notifiers;
};
typedef struct PCIBridgeWindows PCIBridgeWindows;
--
1.9.3
- [Qemu-devel] [PATCH RFC v6 00/11] vfio-pci: pass the aer error to guest, Chen Fan, 2015/04/29
- [Qemu-devel] [PATCH RFC v6 04/11] pcie_aer: expose pcie_aer_msg() interface, Chen Fan, 2015/04/29
- [Qemu-devel] [PATCH RFC v6 02/11] aer: impove pcie_aer_init to support vfio device, Chen Fan, 2015/04/29
- [Qemu-devel] [PATCH RFC v6 03/11] vfio: add aer support for vfio device, Chen Fan, 2015/04/29
- [Qemu-devel] [PATCH RFC v6 01/11] vfio: add pcie extanded capability support, Chen Fan, 2015/04/29
- [Qemu-devel] [PATCH RFC v6 05/11] vfio-pci: pass the aer error to guest, Chen Fan, 2015/04/29
- [Qemu-devel] [PATCH RFC v6 06/11] vfio: add 'aer' property to expose aercap, Chen Fan, 2015/04/29
- [Qemu-devel] [PATCH RFC v6 07/11] pc: add HW_COMPAT_2_2 to disable aercap for vifo device, Chen Fan, 2015/04/29
- [Qemu-devel] [PATCH RFC v6 08/11] vfio: extract vfio_get_hot_reset_info as a single function, Chen Fan, 2015/04/29
- [Qemu-devel] [PATCH RFC v6 09/11] qdev: add bus reset_notifiers callbacks for host bus reset,
Chen Fan <=
- [Qemu-devel] [PATCH RFC v6 10/11] vfio: squeeze out vfio_pci_do_hot_reset for support bus reset, Chen Fan, 2015/04/29
- [Qemu-devel] [PATCH RFC v6 11/11] vfio: add bus reset notifier for host bus reset, Chen Fan, 2015/04/29