From nobody Wed Nov 27 04:36:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1700122598; cv=none; d=zohomail.com; s=zohoarc; b=hY7PbF6eeMp5L4bU7/nGbHh2MCD7FYESNq6M6GOnyf31vYX+PiVECCtHO/9BsGYKbJ/hEXbS036WC6JezrLSMb/+erxjd5GIIl0jNe2pfm8spvts1VebygjNHsxSf9X4thHoXVNXUG6fr551m1PI0vA0tydfRHWsZjvf01NLdpQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700122598; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pPNzsRyp/BF79I68v0mV+AJ/8hfjkJ69g9J6jONthlw=; b=I54sO9bX6pY6OPX6Pcmm40mEAv3PCzZIBQdShNEueNG9QcVUq4qRDKE+lsvgKpzQ9CrlctsUmaab6Z/dEsl2rO7RbCRDcGxrFB7pprLiJDHppV8csq0qMxhoc3Y62Y2bg0A0g4LlJ2dg+XwwYof7Zc/f1pIL4xZLyUhmJM5ER6k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1700122598567349.1212183287947; Thu, 16 Nov 2023 00:16:38 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3XWR-0004i4-HN; Thu, 16 Nov 2023 03:14:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3XWP-0004gO-OQ for qemu-devel@nongnu.org; Thu, 16 Nov 2023 03:14:45 -0500 Received: from mgamail.intel.com ([192.55.52.120]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3XWO-0008VS-6t for qemu-devel@nongnu.org; Thu, 16 Nov 2023 03:14:45 -0500 Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2023 00:14:42 -0800 Received: from duan-server-s2600bt.bj.intel.com ([10.240.192.147]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2023 00:14:38 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700122484; x=1731658484; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=i0WRFPY0nft2rrBA8QHFvgJt46uOSg6b8AHmKK37QzI=; b=RqmFP65I0p41CBvnKpaIHr2tcMu44fnxbhiEQeXGxTwdVWC6GV51wZmz 6bPbU9npYwdeK1BSQlMBKze9axrUs4dlIc6Hjo6O0DiVi6pKCrRWTmjUf 5KKJGp2eGbFg33F0bDSLIaAIF+80o+m1fGhZuznIvjgXJyty1p6ExgF4P CVzXSAF2+6ZDIuc85oniTfuKZ9OwoMlB45us3K67/W/QRY5haZmP9V34N NQAbK7/Ha62zpB8CkvX1V4T8c995wVwAJadv3sb2Kym3kOqCgBxAskXvm fhxRb2W/gOjgq1qfmJx/VQMuMkO7YqevuWdOE4qqOFQUMEVPU1cx4oQ/+ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10895"; a="389898200" X-IronPort-AV: E=Sophos;i="6.03,307,1694761200"; d="scan'208";a="389898200" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10895"; a="768846134" X-IronPort-AV: E=Sophos;i="6.03,307,1694761200"; d="scan'208";a="768846134" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, jgg@nvidia.com, nicolinc@nvidia.com, joao.m.martins@oracle.com, eric.auger@redhat.com, peterx@redhat.com, jasowang@redhat.com, kevin.tian@intel.com, yi.l.liu@intel.com, yi.y.sun@intel.com, chao.p.peng@intel.com, Zhenzhong Duan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/5] vfio/pci: Move VFIODevice initializations in vfio_instance_init Date: Thu, 16 Nov 2023 15:59:05 +0800 Message-Id: <20231116075909.1987656-2-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231116075909.1987656-1-zhenzhong.duan@intel.com> References: <20231116075909.1987656-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=192.55.52.120; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -44 X-Spam_score: -4.5 X-Spam_bar: ---- X-Spam_report: (-4.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.099, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1700122598927100001 Some of the VFIODevice initializations is in vfio_realize, move all of them in vfio_instance_init. No functional change intended. Suggested-by: C=C3=A9dric Le Goater Signed-off-by: Zhenzhong Duan Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/vfio/pci.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index b23b492cce..5a2b7a2d6b 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -2969,9 +2969,6 @@ static void vfio_realize(PCIDevice *pdev, Error **err= p) if (vfio_device_get_name(vbasedev, errp)) { return; } - vbasedev->ops =3D &vfio_pci_ops; - vbasedev->type =3D VFIO_DEVICE_TYPE_PCI; - vbasedev->dev =3D DEVICE(vdev); =20 /* * Mediated devices *might* operate compatibly with discarding of RAM,= but @@ -3320,6 +3317,7 @@ static void vfio_instance_init(Object *obj) { PCIDevice *pci_dev =3D PCI_DEVICE(obj); VFIOPCIDevice *vdev =3D VFIO_PCI(obj); + VFIODevice *vbasedev =3D &vdev->vbasedev; =20 device_add_bootindex_property(obj, &vdev->bootindex, "bootindex", NULL, @@ -3328,7 +3326,11 @@ static void vfio_instance_init(Object *obj) vdev->host.bus =3D ~0U; vdev->host.slot =3D ~0U; vdev->host.function =3D ~0U; - vdev->vbasedev.fd =3D -1; + + vbasedev->type =3D VFIO_DEVICE_TYPE_PCI; + vbasedev->ops =3D &vfio_pci_ops; + vbasedev->dev =3D DEVICE(vdev); + vbasedev->fd =3D -1; =20 vdev->nv_gpudirect_clique =3D 0xFF; =20 --=20 2.34.1 From nobody Wed Nov 27 04:36:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1700122533; cv=none; d=zohomail.com; s=zohoarc; b=XhXb/WjSiyXYNGrUs54db/DEpB6ARFz89A2CObVZnhuwnkloBa7lJ9OD5nQ2nnO8qWh3BHG2cc0IBMelVUpJzOg65zkJTKo6vxIVm7EDiIPHEle3OAul/wNQJN79gF/KoCm5VTVvp9z4jjAWsZ+FgzZqj4EJnNdxMCjaNEKpZ84= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700122533; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fqKPGfZbMk/COBj4eOjHc4qOUUlmSbxVwDUFO+D3EPQ=; b=C8anRdm4S8nIJg/JeMC7oupKyOAtTMWiML9oKSUuqDM+qCmx/P86whg7iCOrKQOjheFlMcm7lolufpHvzycdYyEJGq5XKgtDtQY0oEpz3pDDxCT4Kj9GnCQI5Uu2w5tChhP7ibAvpRyNjcLt/F3nqzKUObU8z4i8ehMWnHKWH7E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1700122533311700.3412039242454; Thu, 16 Nov 2023 00:15:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3XWV-0004lN-4i; Thu, 16 Nov 2023 03:14:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3XWU-0004lA-CW for qemu-devel@nongnu.org; Thu, 16 Nov 2023 03:14:50 -0500 Received: from mgamail.intel.com ([192.55.52.120]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3XWS-0008Vt-Ku for qemu-devel@nongnu.org; Thu, 16 Nov 2023 03:14:50 -0500 Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2023 00:14:46 -0800 Received: from duan-server-s2600bt.bj.intel.com ([10.240.192.147]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2023 00:14:42 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700122488; x=1731658488; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vBzP3WlnfEWRiydsgFq9tEsSz3B2gVoYx0Pa8U2lpLY=; b=IJXPdHd68ty43K2OMXh5kQXugMtEiYAg8V5nL7MhP18Lgk6zLo7McayE 6Em9O94nB4uCtJqariPKqB5iv/I9AsQtH4fEYYI39nBf3KdSTHo22DeM1 lyXeO4jZxkR80Ok6xG/yFtI01ydilzg81fNE3iK4Ndt6Gx3KAQX9WX0bH sC+Gev1PuvsG3X0Vrph6cMXYGsztk/jIz0pFZ4fLzhKimIOeafkxvdsVe bFotEsv3KuVk/9a2F4UxmyO/QxQTLFPo9Gd5e6EImRVwz2DWrQaQhefqS 220z2QyR2gQGelhQF+urb4PvtCWJwDNP45Q9H7aDhve9BfkWeTA4WkAkL w==; X-IronPort-AV: E=McAfee;i="6600,9927,10895"; a="389898233" X-IronPort-AV: E=Sophos;i="6.03,307,1694761200"; d="scan'208";a="389898233" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10895"; a="768846138" X-IronPort-AV: E=Sophos;i="6.03,307,1694761200"; d="scan'208";a="768846138" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, jgg@nvidia.com, nicolinc@nvidia.com, joao.m.martins@oracle.com, eric.auger@redhat.com, peterx@redhat.com, jasowang@redhat.com, kevin.tian@intel.com, yi.l.liu@intel.com, yi.y.sun@intel.com, chao.p.peng@intel.com, Zhenzhong Duan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/5] vfio/platform: Move VFIODevice initializations in vfio_platform_instance_init Date: Thu, 16 Nov 2023 15:59:06 +0800 Message-Id: <20231116075909.1987656-3-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231116075909.1987656-1-zhenzhong.duan@intel.com> References: <20231116075909.1987656-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=192.55.52.120; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -44 X-Spam_score: -4.5 X-Spam_bar: ---- X-Spam_report: (-4.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.099, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1700122534691100001 Some of the VFIODevice initializations is in vfio_platform_realize, move all of them in vfio_platform_instance_init. No functional change intended. Suggested-by: C=C3=A9dric Le Goater Signed-off-by: Zhenzhong Duan Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/vfio/platform.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index a97d9c6234..506eb8193f 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -581,10 +581,6 @@ static void vfio_platform_realize(DeviceState *dev, Er= ror **errp) VFIODevice *vbasedev =3D &vdev->vbasedev; int i, ret; =20 - vbasedev->type =3D VFIO_DEVICE_TYPE_PLATFORM; - vbasedev->dev =3D dev; - vbasedev->ops =3D &vfio_platform_ops; - qemu_mutex_init(&vdev->intp_mutex); =20 trace_vfio_platform_realize(vbasedev->sysfsdev ? @@ -659,8 +655,12 @@ static Property vfio_platform_dev_properties[] =3D { static void vfio_platform_instance_init(Object *obj) { VFIOPlatformDevice *vdev =3D VFIO_PLATFORM_DEVICE(obj); + VFIODevice *vbasedev =3D &vdev->vbasedev; =20 - vdev->vbasedev.fd =3D -1; + vbasedev->type =3D VFIO_DEVICE_TYPE_PLATFORM; + vbasedev->ops =3D &vfio_platform_ops; + vbasedev->dev =3D DEVICE(vdev); + vbasedev->fd =3D -1; } =20 #ifdef CONFIG_IOMMUFD --=20 2.34.1 From nobody Wed Nov 27 04:36:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1700122582; cv=none; d=zohomail.com; s=zohoarc; b=MyO45W6+8+q12wrFgyIEAJ+n5lxcOGd9T62djUgp8JU+pxtEu+jCPGZGAk9tduI3EhcTVe0tAPinN46UvtDuKTyGbcSkph8aqMvt2voDtfRoFjVDD+zgfMvIQlbydKOtODF6C3Q13bUPMk7YTdhHA68HD9IA+ZCokePW0vEgt5k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700122582; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qVvDM3L556GbyLW5Xhbr7su4hYz57bUAEF7+j5TADhQ=; b=nzrpp6kG2RqtrX1we825rZC54QtXEW4oW7j5CLPfq5tqvk5AiEgar5ySJIByG62mITc/8lk278M0yvSjeOImoG9BkOL0Ap9dQBM13KOAwvwC6KebsXYap+DJMtRJwgYyClaMG8yTJXjiF9VQaA9VDHmPiRiuIoOg5O3tHdjTYvY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1700122582160878.2734127860997; Thu, 16 Nov 2023 00:16:22 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3XWZ-0004qP-Vp; Thu, 16 Nov 2023 03:14:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3XWZ-0004pt-3s; Thu, 16 Nov 2023 03:14:55 -0500 Received: from mgamail.intel.com ([192.55.52.120]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3XWX-0008Vt-DP; Thu, 16 Nov 2023 03:14:54 -0500 Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2023 00:14:52 -0800 Received: from duan-server-s2600bt.bj.intel.com ([10.240.192.147]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2023 00:14:46 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700122493; x=1731658493; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YVbEKZd66Jom2GOiFJWFfBxG+jh9Pn412EcUVdE1mx8=; b=Y36fugL+C+pCHTripXAVWBwXTeNEexlW0aLfgbyY2rOP5loY2M9avKgc csi0zTx6x8oP6TkbJjX5hDSxi+C/iUskB5E+5p3/I5I7ojqWVgHJJ4vAP kOG/bC9NyNZZ9Zugovsw/DIdtMIj9Da+lelpHw2+NWBNxkFmwXY9otb5T qAah66VfdgmUrEEaWYlz7N4nf/PhtpBagnSmNrdYF4Ezi+gjgu8VBGk2t V6mtTnw8asBinpQm6vSiiLK0lUr7+jyR/ocCbbI8DU1HOmgcgYGXDW2q6 v8eLo6nrbOZQ35QAorCWwXI2VMQnYT6RuhfDyShQzPyu9/jt4j7l5S/U2 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10895"; a="389898265" X-IronPort-AV: E=Sophos;i="6.03,307,1694761200"; d="scan'208";a="389898265" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10895"; a="768846144" X-IronPort-AV: E=Sophos;i="6.03,307,1694761200"; d="scan'208";a="768846144" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, jgg@nvidia.com, nicolinc@nvidia.com, joao.m.martins@oracle.com, eric.auger@redhat.com, peterx@redhat.com, jasowang@redhat.com, kevin.tian@intel.com, yi.l.liu@intel.com, yi.y.sun@intel.com, chao.p.peng@intel.com, Zhenzhong Duan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eric Farman , Tony Krowiak , Halil Pasic , Jason Herne , Thomas Huth , qemu-s390x@nongnu.org (open list:vfio-ap) Subject: [PATCH v2 3/5] vfio/ap: Move VFIODevice initializations in vfio_ap_instance_init Date: Thu, 16 Nov 2023 15:59:07 +0800 Message-Id: <20231116075909.1987656-4-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231116075909.1987656-1-zhenzhong.duan@intel.com> References: <20231116075909.1987656-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=192.55.52.120; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -44 X-Spam_score: -4.5 X-Spam_bar: ---- X-Spam_report: (-4.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.099, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1700122582746100001 Some of the VFIODevice initializations is in vfio_ap_realize, move all of them in vfio_ap_instance_init. No functional change intended. Suggested-by: C=C3=A9dric Le Goater Signed-off-by: Zhenzhong Duan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Eric Farman --- hw/vfio/ap.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index b21f92291e..31ea9644c5 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -164,18 +164,6 @@ static void vfio_ap_realize(DeviceState *dev, Error **= errp) return; } =20 - vbasedev->ops =3D &vfio_ap_ops; - vbasedev->type =3D VFIO_DEVICE_TYPE_AP; - vbasedev->dev =3D dev; - - /* - * vfio-ap devices operate in a way compatible with discarding of - * memory in RAM blocks, as no pages are pinned in the host. - * This needs to be set before vfio_get_device() for vfio common to - * handle ram_block_discard_disable(). - */ - vapdev->vdev.ram_block_discard_allowed =3D true; - ret =3D vfio_attach_device(vbasedev->name, vbasedev, &address_space_memory, errp); if (ret) { @@ -236,8 +224,20 @@ static const VMStateDescription vfio_ap_vmstate =3D { static void vfio_ap_instance_init(Object *obj) { VFIOAPDevice *vapdev =3D VFIO_AP_DEVICE(obj); + VFIODevice *vbasedev =3D &vapdev->vdev; =20 - vapdev->vdev.fd =3D -1; + vbasedev->type =3D VFIO_DEVICE_TYPE_AP; + vbasedev->ops =3D &vfio_ap_ops; + vbasedev->dev =3D DEVICE(vapdev); + vbasedev->fd =3D -1; + + /* + * vfio-ap devices operate in a way compatible with discarding of + * memory in RAM blocks, as no pages are pinned in the host. + * This needs to be set before vfio_get_device() for vfio common to + * handle ram_block_discard_disable(). + */ + vbasedev->ram_block_discard_allowed =3D true; } =20 #ifdef CONFIG_IOMMUFD --=20 2.34.1 From nobody Wed Nov 27 04:36:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1700122574; cv=none; d=zohomail.com; s=zohoarc; b=Jl9f8I+jsLvPQ0ySDbfZ4kPJgtMaTktD7mTxp3+nhY33CVjSbVuS0wKlBYOjpoC4ESUb0u3eeN5HglU/qBnKO1oS1IFiYNvPinKKRcQJ7iRpXWwlDXBPyQyWVI6Q5/3rAcVPTJyLQh2zPk/A0EWXR7GYyPZsxmfWHbEKZ00gjfE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700122574; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=1U5CnOcXnZIeAGaj9sm2jdE23GuPlNghAY0Ippjvz7o=; b=eWuiMbLhu11ZA4k6letvqWQTub5KhQR+xPoNGkT8Kk7M/Q6VxNnBJ/y1FfqlMOKqCN3HpNInfdwD+ZHVwyado7TeHv4A1AC9v8TVseGPFI4XjkwWzEQI1iz5ziEExJ89ojLpzEry8aSvzX2TVZI1lUiPwCa8xudHej0SyIYir/Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1700122574899906.7727744797828; Thu, 16 Nov 2023 00:16:14 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3XWf-0004sp-LE; Thu, 16 Nov 2023 03:15:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3XWe-0004rY-7S; Thu, 16 Nov 2023 03:15:00 -0500 Received: from mgamail.intel.com ([192.55.52.120]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3XWc-0008Vt-GR; Thu, 16 Nov 2023 03:14:59 -0500 Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2023 00:14:57 -0800 Received: from duan-server-s2600bt.bj.intel.com ([10.240.192.147]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2023 00:14:52 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700122498; x=1731658498; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=mtpU9U5e0BZsP1c49Kv+4m9qYFT54eLujobXloeLEXI=; b=C4Eb9wZyVcxxN9IgiEi0PI2jTOlTEz8XALzxBHNW9UegLaCvI5r5f2kw z6S6oD1AuHjOTctD3CN7Ubd2QOcW92kVkbHhdCfv45OxYHoO5Aha0wDka ds5zgTrv6pHymuelQuyLph+QLB+1Y5Hz7f1ojPFVTGDYPz+UqY1HraO2O WB6WYOnNB949hetqpML8MY/YRhaakgsSwr+C9pKiNgVS6Cz46cjgjJsHh kJqwhT6L5ZfKn7oPW5OLEONOFXoPeQa5lGAhYrLGVrNvRdZb2PC7KwFYz 4yp1Xf4XURiMMPs/4cJRXTSbypuyyHdjNJC6hdIf//CQnHERxoXFWBCCB w==; X-IronPort-AV: E=McAfee;i="6600,9927,10895"; a="389898302" X-IronPort-AV: E=Sophos;i="6.03,307,1694761200"; d="scan'208";a="389898302" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10895"; a="768846149" X-IronPort-AV: E=Sophos;i="6.03,307,1694761200"; d="scan'208";a="768846149" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, jgg@nvidia.com, nicolinc@nvidia.com, joao.m.martins@oracle.com, eric.auger@redhat.com, peterx@redhat.com, jasowang@redhat.com, kevin.tian@intel.com, yi.l.liu@intel.com, yi.y.sun@intel.com, chao.p.peng@intel.com, Zhenzhong Duan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eric Farman , Thomas Huth , Matthew Rosato , qemu-s390x@nongnu.org (open list:S390 general arch...) Subject: [PATCH v2 4/5] vfio/ccw: Move VFIODevice initializations in vfio_ccw_instance_init Date: Thu, 16 Nov 2023 15:59:08 +0800 Message-Id: <20231116075909.1987656-5-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231116075909.1987656-1-zhenzhong.duan@intel.com> References: <20231116075909.1987656-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=192.55.52.120; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -44 X-Spam_score: -4.5 X-Spam_bar: ---- X-Spam_report: (-4.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.099, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1700122576731100003 Some of the VFIODevice initializations is in vfio_ccw_realize, move all of them in vfio_ccw_instance_init. No functional change intended. Suggested-by: C=C3=A9dric Le Goater Signed-off-by: Zhenzhong Duan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Eric Farman --- hw/vfio/ccw.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index b116b10fe7..8de2fd809b 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -594,20 +594,6 @@ static void vfio_ccw_realize(DeviceState *dev, Error *= *errp) return; } =20 - vbasedev->ops =3D &vfio_ccw_ops; - vbasedev->type =3D VFIO_DEVICE_TYPE_CCW; - vbasedev->dev =3D dev; - - /* - * All vfio-ccw devices are believed to operate in a way compatible wi= th - * discarding of memory in RAM blocks, ie. pages pinned in the host are - * in the current working set of the guest driver and therefore never - * overlap e.g., with pages available to the guest balloon driver. Th= is - * needs to be set before vfio_get_device() for vfio common to handle - * ram_block_discard_disable(). - */ - vbasedev->ram_block_discard_allowed =3D true; - ret =3D vfio_attach_device(cdev->mdevid, vbasedev, &address_space_memory, errp); if (ret) { @@ -695,8 +681,22 @@ static const VMStateDescription vfio_ccw_vmstate =3D { static void vfio_ccw_instance_init(Object *obj) { VFIOCCWDevice *vcdev =3D VFIO_CCW(obj); + VFIODevice *vbasedev =3D &vcdev->vdev; + + vbasedev->type =3D VFIO_DEVICE_TYPE_CCW; + vbasedev->ops =3D &vfio_ccw_ops; + vbasedev->dev =3D DEVICE(vcdev); + vbasedev->fd =3D -1; =20 - vcdev->vdev.fd =3D -1; + /* + * All vfio-ccw devices are believed to operate in a way compatible wi= th + * discarding of memory in RAM blocks, ie. pages pinned in the host are + * in the current working set of the guest driver and therefore never + * overlap e.g., with pages available to the guest balloon driver. Th= is + * needs to be set before vfio_get_device() for vfio common to handle + * ram_block_discard_disable(). + */ + vbasedev->ram_block_discard_allowed =3D true; } =20 #ifdef CONFIG_IOMMUFD --=20 2.34.1 From nobody Wed Nov 27 04:36:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1700122534; cv=none; d=zohomail.com; s=zohoarc; b=nT1fgXWCiGJQxaMK+vSPsjUxWidbV576Z+hjUr7ytO9wvSER8cSwLA4WIou9HJn7m83vYa4qE1xOGb1tNZcPbgJJHRY1gT+D+hhi9hgBeOgVYVZTi6chgT918boKRXfon/L/1dE/fzKCrrKwLBm3VAnI+KjhRkmgBJlfXocdBBM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700122534; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=HhqoV2wSF8sLA33tx2yyrrJEMCIJSVYRp9C5FAHAPwU=; b=mfhtPRE9v1lzcrNwKlcjfv09ndMkWwUbPZAekm9R/MTYzkRaBaMgICoegm1gday+yp36vt4XV+Uf8HrmEVPnsbGG6UzKENqCae6gwgerXHJ5p+9mfOAnZv7fg2G1JIhtFKFNBDQDeG11IWPnEE26AEy+HCC/rlytwadDKms4zOw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1700122534855966.641912494485; Thu, 16 Nov 2023 00:15:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3XWn-0004wk-Aw; Thu, 16 Nov 2023 03:15:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3XWl-0004ur-4E; Thu, 16 Nov 2023 03:15:07 -0500 Received: from mgamail.intel.com ([192.55.52.120]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3XWh-0008Vt-T1; Thu, 16 Nov 2023 03:15:06 -0500 Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2023 00:15:02 -0800 Received: from duan-server-s2600bt.bj.intel.com ([10.240.192.147]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2023 00:14:57 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700122503; x=1731658503; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7ulUb8BDAYNNaq8Q6Oq4m/NU6hhquqsc+3+9P7+Z1W4=; b=azJpgXFfEnG9uDOoh5nkOvlCa3DWewp/1ynSC/tSptZVp2Zho0WiP+1J jptC3zQXb45KUqwsEUk6uaLc9hO1bQ3G40r/4eHnPaJYXvZyhjDW5SlMZ TqnPF55v7z2ScFrqYjLo3Mbe7UrRlJesgQ3ui/mwog0nhrUiMAtaE3BXw Pp8E5Ut8JrhZe99ObHJI91gVENHAFbysWSASxrooBN3vQTv5l1x/XJbiH MHKwMRTNgd59xU62cqt8voGestuuax5hhwPczfpxZATmgtXlhogNu0XAO 3PfYiYZ9UE21sPSzsLXGDM3tsOqynge2FIGW7yJH/8HbedCqEm7Q765pG w==; X-IronPort-AV: E=McAfee;i="6600,9927,10895"; a="389898337" X-IronPort-AV: E=Sophos;i="6.03,307,1694761200"; d="scan'208";a="389898337" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10895"; a="768846157" X-IronPort-AV: E=Sophos;i="6.03,307,1694761200"; d="scan'208";a="768846157" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, jgg@nvidia.com, nicolinc@nvidia.com, joao.m.martins@oracle.com, eric.auger@redhat.com, peterx@redhat.com, jasowang@redhat.com, kevin.tian@intel.com, yi.l.liu@intel.com, yi.y.sun@intel.com, chao.p.peng@intel.com, Zhenzhong Duan , Thomas Huth , Tony Krowiak , Halil Pasic , Jason Herne , Eric Farman , Matthew Rosato , qemu-s390x@nongnu.org (open list:S390 general arch...) Subject: [PATCH v2 5/5] vfio: Introduce a helper function to initialize VFIODevice Date: Thu, 16 Nov 2023 15:59:09 +0800 Message-Id: <20231116075909.1987656-6-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231116075909.1987656-1-zhenzhong.duan@intel.com> References: <20231116075909.1987656-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=192.55.52.120; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -44 X-Spam_score: -4.5 X-Spam_bar: ---- X-Spam_report: (-4.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.099, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1700122536619100009 Introduce a helper function to replace the common code to initialize VFIODevice in pci, platform, ap and ccw VFIO device. No functional change intended. Suggested-by: C=C3=A9dric Le Goater Signed-off-by: Zhenzhong Duan --- include/hw/vfio/vfio-common.h | 2 ++ hw/vfio/ap.c | 8 ++------ hw/vfio/ccw.c | 8 ++------ hw/vfio/helpers.c | 11 +++++++++++ hw/vfio/pci.c | 6 ++---- hw/vfio/platform.c | 6 ++---- 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index 7954531d05..fa430cb288 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -256,4 +256,6 @@ int vfio_get_dirty_bitmap(const VFIOContainerBase *bcon= tainer, uint64_t iova, =20 int vfio_device_get_name(VFIODevice *vbasedev, Error **errp); void vfio_device_set_fd(VFIODevice *vbasedev, const char *str, Error **err= p); +void vfio_device_init(VFIODevice *vbasedev, int type, VFIODeviceOps *ops, + DeviceState *dev, bool ram_discard); #endif /* HW_VFIO_VFIO_COMMON_H */ diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index 31ea9644c5..84c83f66fe 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -226,18 +226,14 @@ static void vfio_ap_instance_init(Object *obj) VFIOAPDevice *vapdev =3D VFIO_AP_DEVICE(obj); VFIODevice *vbasedev =3D &vapdev->vdev; =20 - vbasedev->type =3D VFIO_DEVICE_TYPE_AP; - vbasedev->ops =3D &vfio_ap_ops; - vbasedev->dev =3D DEVICE(vapdev); - vbasedev->fd =3D -1; - /* * vfio-ap devices operate in a way compatible with discarding of * memory in RAM blocks, as no pages are pinned in the host. * This needs to be set before vfio_get_device() for vfio common to * handle ram_block_discard_disable(). */ - vbasedev->ram_block_discard_allowed =3D true; + vfio_device_init(vbasedev, VFIO_DEVICE_TYPE_AP, &vfio_ap_ops, + DEVICE(vapdev), true); } =20 #ifdef CONFIG_IOMMUFD diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index 8de2fd809b..0b1873e922 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -683,11 +683,6 @@ static void vfio_ccw_instance_init(Object *obj) VFIOCCWDevice *vcdev =3D VFIO_CCW(obj); VFIODevice *vbasedev =3D &vcdev->vdev; =20 - vbasedev->type =3D VFIO_DEVICE_TYPE_CCW; - vbasedev->ops =3D &vfio_ccw_ops; - vbasedev->dev =3D DEVICE(vcdev); - vbasedev->fd =3D -1; - /* * All vfio-ccw devices are believed to operate in a way compatible wi= th * discarding of memory in RAM blocks, ie. pages pinned in the host are @@ -696,7 +691,8 @@ static void vfio_ccw_instance_init(Object *obj) * needs to be set before vfio_get_device() for vfio common to handle * ram_block_discard_disable(). */ - vbasedev->ram_block_discard_allowed =3D true; + vfio_device_init(vbasedev, VFIO_DEVICE_TYPE_CCW, &vfio_ccw_ops, + DEVICE(vcdev), true); } =20 #ifdef CONFIG_IOMMUFD diff --git a/hw/vfio/helpers.c b/hw/vfio/helpers.c index 3592c3d54e..6789870802 100644 --- a/hw/vfio/helpers.c +++ b/hw/vfio/helpers.c @@ -652,3 +652,14 @@ void vfio_device_set_fd(VFIODevice *vbasedev, const ch= ar *str, Error **errp) } vbasedev->fd =3D fd; } + +void vfio_device_init(VFIODevice *vbasedev, int type, VFIODeviceOps *ops, + DeviceState *dev, bool ram_discard) +{ + vbasedev->type =3D type; + vbasedev->ops =3D ops; + vbasedev->dev =3D dev; + vbasedev->fd =3D -1; + + vbasedev->ram_block_discard_allowed =3D ram_discard; +} diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 5a2b7a2d6b..31ad27d716 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -3327,10 +3327,8 @@ static void vfio_instance_init(Object *obj) vdev->host.slot =3D ~0U; vdev->host.function =3D ~0U; =20 - vbasedev->type =3D VFIO_DEVICE_TYPE_PCI; - vbasedev->ops =3D &vfio_pci_ops; - vbasedev->dev =3D DEVICE(vdev); - vbasedev->fd =3D -1; + vfio_device_init(vbasedev, VFIO_DEVICE_TYPE_PCI, &vfio_pci_ops, + DEVICE(vdev), false); =20 vdev->nv_gpudirect_clique =3D 0xFF; =20 diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index 506eb8193f..a8d9b7da63 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -657,10 +657,8 @@ static void vfio_platform_instance_init(Object *obj) VFIOPlatformDevice *vdev =3D VFIO_PLATFORM_DEVICE(obj); VFIODevice *vbasedev =3D &vdev->vbasedev; =20 - vbasedev->type =3D VFIO_DEVICE_TYPE_PLATFORM; - vbasedev->ops =3D &vfio_platform_ops; - vbasedev->dev =3D DEVICE(vdev); - vbasedev->fd =3D -1; + vfio_device_init(vbasedev, VFIO_DEVICE_TYPE_PLATFORM, &vfio_platform_o= ps, + DEVICE(vdev), false); } =20 #ifdef CONFIG_IOMMUFD --=20 2.34.1