From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4lzO-0004Aq-VX for qemu-devel@nongnu.org; Tue, 16 Jun 2015 04:13:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4lzL-0004ao-MP for qemu-devel@nongnu.org; Tue, 16 Jun 2015 04:12:58 -0400 Received: from [59.151.112.132] (port=41971 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4lzK-0004Xn-6V for qemu-devel@nongnu.org; Tue, 16 Jun 2015 04:12:55 -0400 From: Chen Fan Date: Tue, 16 Jun 2015 16:10:45 +0800 Message-ID: <4c334c63f61bc33e0dbdf5797875036b75a47f35.1434356309.git.chen.fan.fnst@cn.fujitsu.com> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [RFC v10 01/19] vfio: extract vfio_get_hot_reset_info as a single function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: izumi.taku@jp.fujitsu.com, alex.williamson@redhat.com 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 --- hw/vfio/pci.c | 66 +++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 18 deletions(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index e0e339a..4a97ccc 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -2641,6 +2641,51 @@ 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; + error_report("vfio: hot reset info failed: %m"); + goto error; + } + + *ret_info = info; + info = NULL; + + return 0; +error: + g_free(info); + return ret; +} + static int vfio_add_std_cap(VFIOPCIDevice *vdev, uint8_t pos) { PCIDevice *pdev = &vdev->pdev; @@ -2780,7 +2825,7 @@ static bool vfio_pci_host_match(PCIHostDeviceAddress *host1, static int vfio_pci_hot_reset(VFIOPCIDevice *vdev, bool single) { VFIOGroup *group; - struct vfio_pci_hot_reset_info *info; + struct vfio_pci_hot_reset_info *info = NULL; struct vfio_pci_dependent_device *devices; struct vfio_pci_hot_reset *reset; int32_t *fds; @@ -2792,12 +2837,8 @@ 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, @@ -2806,18 +2847,7 @@ static int vfio_pci_hot_reset(VFIOPCIDevice *vdev, bool single) 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