[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v7 05/11] vfio: do hot bus reset when do virtual secon
From: |
Chen Fan |
Subject: |
[Qemu-devel] [RFC v7 05/11] vfio: do hot bus reset when do virtual secondary bus reset |
Date: |
Tue, 19 May 2015 12:42:47 +0800 |
when do virtual secondary bus reset, the vfio device under
this bus need to do host bus reset to reset the device.
so add this case.
Signed-off-by: Chen Fan <address@hidden>
---
hw/vfio/pci.c | 12 +++++++++++-
include/hw/vfio/vfio-common.h | 1 -
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index ff639db..cc169ea 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -169,6 +169,7 @@ typedef struct VFIOPCIDevice {
bool has_flr;
bool has_pm_reset;
bool has_bus_reset;
+ bool needs_bus_reset;
bool rom_read_failed;
} VFIOPCIDevice;
@@ -3531,7 +3532,8 @@ static void vfio_pci_host_needs_bus_reset(Notifier *n,
void *opaque)
VFIOPCIDevice *vdev = container_of(n, VFIOPCIDevice,
sec_bus_reset_notifier);
VFIODevice *vbasedev = &vdev->vbasedev;
- vbasedev->needs_bus_reset = true;
+ vdev->needs_bus_reset = true;
+ vbasedev->needs_reset = true;
}
static void vfio_check_host_bus_reset(VFIODevice *vbasedev)
@@ -3807,6 +3809,14 @@ static void vfio_pci_reset(DeviceState *dev)
trace_vfio_pci_reset(vdev->vbasedev.name);
+ if (vdev->has_bus_reset && vdev->needs_bus_reset) {
+ vdev->needs_bus_reset = false;
+ if (vdev->vbasedev.needs_reset) {
+ vfio_pci_hot_reset(vdev, false);
+ }
+ return;
+ }
+
vfio_pci_pre_reset(vdev);
if (vdev->resetfn && !vdev->resetfn(vdev)) {
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index 5f5691a..0d1fb80 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -102,7 +102,6 @@ typedef struct VFIODevice {
bool reset_works;
bool needs_reset;
bool allow_mmap;
- bool needs_bus_reset;
VFIODeviceOps *ops;
unsigned int num_irqs;
unsigned int num_regions;
--
1.9.3
- [Qemu-devel] [RFC v7 04/11] vfio: add check host bus reset is support or not, (continued)
- [Qemu-devel] [RFC v7 03/11] qdev: add bus reset_notifiers callbacks for host bus reset, Chen Fan, 2015/05/19
- [Qemu-devel] [RFC v7 08/11] vfio: add aer support for vfio device, Chen Fan, 2015/05/19
- [Qemu-devel] [RFC v7 06/11] vfio: add pcie extanded capability support, Chen Fan, 2015/05/19
- [Qemu-devel] [RFC v7 07/11] aer: impove pcie_aer_init to support vfio device, Chen Fan, 2015/05/19
- [Qemu-devel] [RFC v7 09/11] pcie_aer: expose pcie_aer_msg() interface, Chen Fan, 2015/05/19
- [Qemu-devel] [RFC v7 05/11] vfio: do hot bus reset when do virtual secondary bus reset,
Chen Fan <=
[Qemu-devel] [RFC v7 10/11] vfio-pci: pass the aer error to guest, Chen Fan, 2015/05/19
[Qemu-devel] [RFC v7 11/11] vfio: add 'aer' property to expose aercap, Chen Fan, 2015/05/19