Message ID | 1bfcb9f3c55f8a4e5652c4bd1c57d3681a45b22e.1432008287.git.chen.fan.fnst@cn.fujitsu.com |
---|---|
State | New |
Headers | show |
On Tue, 2015-05-19 at 12:42 +0800, Chen Fan wrote: > 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 <chen.fan.fnst@cn.fujitsu.com> > --- > hw/vfio/pci.c | 63 +++++++++++++++++++++++++++++++++++++++++++---------------- > 1 file changed, 46 insertions(+), 17 deletions(-) > > diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c > index e0e339a..fe4963f 100644 > --- a/hw/vfio/pci.c > +++ b/hw/vfio/pci.c > @@ -2641,6 +2641,48 @@ static void vfio_check_af_flr(VFIOPCIDevice *vdev, uint8_t pos) > } > } > > +/* > + * return negative with errno, return 0 on success. > + * if success, the point of 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; > + goto error; info is leaked > + } > + > + 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; > + goto error; info is leaked > + } > + > + *ret_info = info; > + > + ret = 0; > +error: > + return ret; > +} > + > static int vfio_add_std_cap(VFIOPCIDevice *vdev, uint8_t pos) > { > PCIDevice *pdev = &vdev->pdev; > @@ -2792,32 +2834,19 @@ 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; > + ret = vfio_get_hot_reset_info(vdev, &info); > + if (ret) { > 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); > + } else { > + error_report("vfio: hot reset info failed: %m"); > } > 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 */
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index e0e339a..fe4963f 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -2641,6 +2641,48 @@ static void vfio_check_af_flr(VFIOPCIDevice *vdev, uint8_t pos) } } +/* + * return negative with errno, return 0 on success. + * if success, the point of 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; + goto error; + } + + 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; + goto error; + } + + *ret_info = info; + + ret = 0; +error: + return ret; +} + static int vfio_add_std_cap(VFIOPCIDevice *vdev, uint8_t pos) { PCIDevice *pdev = &vdev->pdev; @@ -2792,32 +2834,19 @@ 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; + ret = vfio_get_hot_reset_info(vdev, &info); + if (ret) { 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); + } else { + error_report("vfio: hot reset info failed: %m"); } 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 */
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 <chen.fan.fnst@cn.fujitsu.com> --- hw/vfio/pci.c | 63 +++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 17 deletions(-)