From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFaUv-0006we-B8 for qemu-devel@nongnu.org; Thu, 16 Jul 2015 00:10:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZFaUr-0005Us-EH for qemu-devel@nongnu.org; Thu, 16 Jul 2015 00:10:13 -0400 Received: from [59.151.112.132] (port=4208 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFaUo-00057f-MH for qemu-devel@nongnu.org; Thu, 16 Jul 2015 00:10:09 -0400 From: Chen Hanxiao Date: Thu, 16 Jul 2015 12:00:50 +0800 Message-ID: <1437019253-17630-13-git-send-email-chenhanxiao@cn.fujitsu.com> In-Reply-To: <1437019253-17630-1-git-send-email-chenhanxiao@cn.fujitsu.com> References: <1437019253-17630-1-git-send-email-chenhanxiao@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v12 12/15] vfio: do hot bus reset when do virtual secondary bus reset List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex Williamson , qemu-devel@nongnu.org Cc: Chen Fan From: Chen Fan 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 Signed-off-by: Chen Hanxiao --- hw/vfio/pci.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index c52456b..bd67608 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -4134,6 +4134,27 @@ static void vfio_exitfn(PCIDevice *pdev) vfio_unregister_bars(vdev); } +static int vfio_pci_is_single_function(VFIOPCIDevice *vdev) +{ + struct vfio_pci_hot_reset_info *info = NULL; + int ret; + + ret = vfio_get_hot_reset_info(vdev, &info); + if (ret) { + goto out; + } + + if (info->count > 1) { + ret = 0; + goto out; + } + + ret = 1; +out: + g_free(info); + return ret; +} + static void vfio_pci_reset(DeviceState *dev) { PCIDevice *pdev = DO_UPCAST(PCIDevice, qdev, dev); @@ -4141,6 +4162,16 @@ static void vfio_pci_reset(DeviceState *dev) trace_vfio_pci_reset(vdev->vbasedev.name); + if (vdev->needs_bus_reset) { + vdev->needs_bus_reset = false; + /* Avoid duplicate bus reset */ + if (vdev->vbasedev.needs_reset) { + vfio_pci_hot_reset(vdev, + vfio_pci_is_single_function(vdev) ? true : false); + } + return; + } + vfio_pci_pre_reset(vdev); if (vdev->resetfn && !vdev->resetfn(vdev)) { -- 2.1.0