[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC v6 08/11] vfio: extract vfio_get_hot_reset_info
From: |
Chen Fan |
Subject: |
[Qemu-devel] [PATCH RFC v6 08/11] vfio: extract vfio_get_hot_reset_info as a single function |
Date: |
Wed, 29 Apr 2015 16:48:36 +0800 |
the function is used to get affected devices by bus reset.
so here extract it, and can used for aer soon.
Signed-off-by: Chen Fan <address@hidden>
---
hw/vfio/pci.c | 69 ++++++++++++++++++++++++++++++++++++++++-------------------
1 file changed, 47 insertions(+), 22 deletions(-)
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index c306efc..b42c2a4 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -2657,6 +2657,51 @@ static void vfio_check_af_flr(VFIOPCIDevice *vdev,
uint8_t pos)
}
}
+/*
+ * return error with negative, return devices count with positive,
+ * return the ret_info fill with the affected device reset info.
+ *
+ */
+static int vfio_get_hot_reset_info(VFIOPCIDevice *vdev,
+ struct vfio_pci_hot_reset_info **ret_info)
+{
+ struct vfio_pci_hot_reset_info *info;
+ int ret, count;
+
+ *ret_info = NULL;
+
+ info = g_malloc0(sizeof(*info));
+ info->argsz = sizeof(*info);
+
+ ret = ioctl(vdev->vbasedev.fd, VFIO_DEVICE_GET_PCI_HOT_RESET_INFO, info);
+ if (ret && errno != ENOSPC) {
+ ret = -errno;
+ if (!vdev->has_pm_reset) {
+ error_report("vfio: Cannot reset device %04x:%02x:%02x.%x, "
+ "no available reset mechanism.", vdev->host.domain,
+ vdev->host.bus, vdev->host.slot, vdev->host.function);
+ }
+ return ret;
+ }
+
+ count = info->count;
+
+ info = g_realloc(info, sizeof(*info) +
+ (count * sizeof(struct vfio_pci_dependent_device)));
+ info->argsz = sizeof(*info) +
+ (count * sizeof(struct vfio_pci_dependent_device));
+
+ ret = ioctl(vdev->vbasedev.fd, VFIO_DEVICE_GET_PCI_HOT_RESET_INFO, info);
+ if (ret) {
+ ret = -errno;
+ error_report("vfio: hot reset info failed: %m");
+ return ret;
+ }
+
+ *ret_info = info;
+ return count;
+}
+
static int vfio_add_std_cap(VFIOPCIDevice *vdev, uint8_t pos)
{
PCIDevice *pdev = &vdev->pdev;
@@ -2913,32 +2958,12 @@ static int vfio_pci_hot_reset(VFIOPCIDevice *vdev, bool
single)
vfio_pci_pre_reset(vdev);
vdev->vbasedev.needs_reset = false;
- info = g_malloc0(sizeof(*info));
- info->argsz = sizeof(*info);
-
- ret = ioctl(vdev->vbasedev.fd, VFIO_DEVICE_GET_PCI_HOT_RESET_INFO, info);
- if (ret && errno != ENOSPC) {
- ret = -errno;
- if (!vdev->has_pm_reset) {
- error_report("vfio: Cannot reset device %04x:%02x:%02x.%x, "
- "no available reset mechanism.", vdev->host.domain,
- vdev->host.bus, vdev->host.slot, vdev->host.function);
- }
+ ret = vfio_get_hot_reset_info(vdev, &info);
+ if (ret < 0) {
goto out_single;
}
- count = info->count;
- info = g_realloc(info, sizeof(*info) + (count * sizeof(*devices)));
- info->argsz = sizeof(*info) + (count * sizeof(*devices));
devices = &info->devices[0];
-
- ret = ioctl(vdev->vbasedev.fd, VFIO_DEVICE_GET_PCI_HOT_RESET_INFO, info);
- if (ret) {
- ret = -errno;
- error_report("vfio: hot reset info failed: %m");
- goto out_single;
- }
-
trace_vfio_pci_hot_reset_has_dep_devices(vdev->vbasedev.name);
/* Verify that we have all the groups required */
--
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 <=
- [Qemu-devel] [PATCH RFC v6 09/11] qdev: add bus reset_notifiers callbacks for host bus reset, Chen Fan, 2015/04/29
- [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