From nobody Tue Nov 11 05:01:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=nvidia.com ARC-Seal: i=1; a=rsa-sha256; t=1561043708; cv=none; d=zoho.com; s=zohoarc; b=OPsGvXngq7EqT5R2ou7mNXSbPYylYXjbS6kxS3zdX4n28a4zll1dNSWljRcKeB1GgncWOXFvmZ0hLQLeQl5pQyr04AHbor/YYYBYsHy7UB1uOy5R5S9aYq0qrWrkWQRgh80JfgUY4NO7+iAgJ8JHdTpz3FQgMFcIc7rp/ylkBtI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561043708; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=ppqMB6UfbPIBKPvs9O0vDjVXpwPZivlPc7fIHiWjiVM=; b=Jhc0kcUtoFe3sfmgOZZaFkslkLRs7DfMQABIojy96sEXb0x1K/RRANMM/Wz0mt+a2DWP4l5ksKWXXYdhBf0vJ0AAwqIT84TJseJdJjsuga9LVKpPvcGILyqmkxxj2Q4xTV/SJ5tbEG2J0fHhrsSDFPFQL0ZuiP6OAAHvLMG7zVs= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1561043708225599.2624076941213; Thu, 20 Jun 2019 08:15:08 -0700 (PDT) Received: from localhost ([::1]:49064 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdymE-0004Bj-1w for importer@patchew.org; Thu, 20 Jun 2019 11:15:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38066) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdyKa-0006DL-2x for qemu-devel@nongnu.org; Thu, 20 Jun 2019 10:46:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdyKY-0006DK-SZ for qemu-devel@nongnu.org; Thu, 20 Jun 2019 10:46:27 -0400 Received: from hqemgate15.nvidia.com ([216.228.121.64]:6456) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hdyKY-0006Al-J7 for qemu-devel@nongnu.org; Thu, 20 Jun 2019 10:46:26 -0400 Received: from hqpgpgate102.nvidia.com (Not Verified[216.228.121.13]) by hqemgate15.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Thu, 20 Jun 2019 07:41:20 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate102.nvidia.com (PGP Universal service); Thu, 20 Jun 2019 07:41:18 -0700 Received: from HQMAIL106.nvidia.com (172.18.146.12) by HQMAIL103.nvidia.com (172.20.187.11) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Thu, 20 Jun 2019 14:41:18 +0000 Received: from kwankhede-dev.nvidia.com (172.20.13.39) by HQMAIL.nvidia.com (172.18.146.12) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Thu, 20 Jun 2019 14:41:12 +0000 X-PGP-Universal: processed; by hqpgpgate102.nvidia.com on Thu, 20 Jun 2019 07:41:18 -0700 From: Kirti Wankhede To: , Date: Thu, 20 Jun 2019 20:07:40 +0530 Message-ID: <1561041461-22326-13-git-send-email-kwankhede@nvidia.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1561041461-22326-1-git-send-email-kwankhede@nvidia.com> References: <1561041461-22326-1-git-send-email-kwankhede@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1561041680; bh=ppqMB6UfbPIBKPvs9O0vDjVXpwPZivlPc7fIHiWjiVM=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:X-NVConfidentiality:MIME-Version: Content-Type; b=X8Z09RjKoRqGKkpN+PGynLe4AKAuPaFecLTTuLg5XWFivMArbRnWqAA0RJJ8UHJob AF+jFtTPQbjxwYrWwFMResg0puXyZwRXDRP8l5LUv3uYjhmfhf6TI52Xs5ebzQ9gJ5 prhmkMfl9ApQqfZWZjlJh0D2EvBLDP5V3R6BUOD7iiUVLDiyI8r4SK+tzyebDXRkKK 9oWf/COY8lS8+6SEcz4bkTW+NlYT27WVMPL6A75uR0N/Hw+kITKz5RwahOVGttxhbZ boVEppw654g5R9kyw2BpIjH6tXbTyTg9/nxKLjQCb14q4yYsVX8iU0vDo+J1iUY4IG yQHRt+AICsBaQ== X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 216.228.121.64 Subject: [Qemu-devel] [PATCH v4 12/13] vfio: Make vfio-pci device migration capable. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kirti Wankhede , Zhengxiao.zx@Alibaba-inc.com, kevin.tian@intel.com, yi.l.liu@intel.com, yan.y.zhao@intel.com, eskultet@redhat.com, ziye.yang@intel.com, qemu-devel@nongnu.org, cohuck@redhat.com, shuangtai.tst@alibaba-inc.com, dgilbert@redhat.com, zhi.a.wang@intel.com, mlevitsk@redhat.com, pasic@linux.ibm.com, aik@ozlabs.ru, yulei.zhang@intel.com, eauger@redhat.com, felipe@nutanix.com, jonathan.davies@nutanix.com, changpeng.liu@intel.com, Ken.Xue@amd.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Call vfio_migration_probe() and vfio_migration_finalize() functions for vfio-pci device to enable migration for vfio PCI device. Removed vfio_pci_vmstate structure. Signed-off-by: Kirti Wankhede Reviewed-by: Neo Jia --- hw/vfio/pci.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 09a0821a5b1c..b230b0ab9282 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -2839,6 +2839,7 @@ static void vfio_realize(PCIDevice *pdev, Error **err= p) vdev->vbasedev.ops =3D &vfio_pci_ops; vdev->vbasedev.type =3D VFIO_DEVICE_TYPE_PCI; vdev->vbasedev.dev =3D DEVICE(vdev); + vdev->vbasedev.device_state =3D VFIO_DEVICE_STATE_STOPPED; =20 tmp =3D g_strdup_printf("%s/iommu_group", vdev->vbasedev.sysfsdev); len =3D readlink(tmp, group_path, sizeof(group_path)); @@ -3099,6 +3100,11 @@ static void vfio_realize(PCIDevice *pdev, Error **er= rp) } } =20 + ret =3D vfio_migration_probe(&vdev->vbasedev, errp); + if (ret) { + error_report("Failed to setup migration region"); + } + vfio_register_err_notifier(vdev); vfio_register_req_notifier(vdev); vfio_setup_resetfn_quirk(vdev); @@ -3118,6 +3124,7 @@ static void vfio_instance_finalize(Object *obj) VFIOPCIDevice *vdev =3D PCI_VFIO(obj); VFIOGroup *group =3D vdev->vbasedev.group; =20 + vdev->vbasedev.device_state =3D VFIO_DEVICE_STATE_STOPPED; vfio_display_finalize(vdev); vfio_bars_finalize(vdev); g_free(vdev->emulated_config_bits); @@ -3146,6 +3153,7 @@ static void vfio_exitfn(PCIDevice *pdev) } vfio_teardown_msi(vdev); vfio_bars_exit(vdev); + vfio_migration_finalize(&vdev->vbasedev); } =20 static void vfio_pci_reset(DeviceState *dev) @@ -3254,11 +3262,6 @@ static Property vfio_pci_dev_properties[] =3D { DEFINE_PROP_END_OF_LIST(), }; =20 -static const VMStateDescription vfio_pci_vmstate =3D { - .name =3D "vfio-pci", - .unmigratable =3D 1, -}; - static void vfio_pci_dev_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -3266,7 +3269,6 @@ static void vfio_pci_dev_class_init(ObjectClass *klas= s, void *data) =20 dc->reset =3D vfio_pci_reset; dc->props =3D vfio_pci_dev_properties; - dc->vmsd =3D &vfio_pci_vmstate; dc->desc =3D "VFIO-based PCI device assignment"; set_bit(DEVICE_CATEGORY_MISC, dc->categories); pdc->realize =3D vfio_realize; --=20 2.7.0