From nobody Wed Jan 15 10:58:10 2025 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1700556548; cv=none; d=zohomail.com; s=zohoarc; b=g+HWuI3yJ0VTiwAkbZd0DE5TuZKQQH5vhsuiDswaYgtzTOEIWYuHiUvTij3Fp2qVhilvcVyuH+DLj7TJyh2OOL6kCQOCroHy6Eg5lUksFqGH4b9yBxn2vfBScM/J6hLhfGa3yqj06tmIqmFMZ8BmDZ5R1Y0gic5mmXJl0KvNays= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700556548; 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=EHVl/CPEx1tfKp5nXiog8wCt+WlGuLoOzA8CwAA+pF0=; b=hSptAd7x+5Ck2L+FgxiaqRop9NP7fqZkzglYnclFKznIUDUwWX7e3PXSNPMOniTgvEAdJMIulHNVGZQgk4N4YYJ6uo6+sAIsRWYAAYbIXZ6Nce+3fo6OnYuxpYu7+vTjPlikYhISVFu51YxgX58geRmQZggvcT9l7ZpGqacz72w= 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+importer2=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 1700556548077397.3126744480285; Tue, 21 Nov 2023 00:49:08 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r5MQh-0001a1-Ga; Tue, 21 Nov 2023 03:48:24 -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 1r5MQd-0000zb-Cr for qemu-devel@nongnu.org; Tue, 21 Nov 2023 03:48:19 -0500 Received: from mgamail.intel.com ([134.134.136.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r5MQZ-0002Dl-SC for qemu-devel@nongnu.org; Tue, 21 Nov 2023 03:48:17 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2023 00:47:49 -0800 Received: from spr-s2600bt.bj.intel.com ([10.240.192.124]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2023 00:47:46 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700556495; x=1732092495; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sAeaLlOpv+KZAzUVgMMu6EKWOeoJE+9x1mOXczPlT4c=; b=ba/aWyKdWjOunImT6o5QlR/xuEsInx1QOXSADVdEb3ueyo4avISIUOoY d4m29bYTY+mLql23jH6PmbNQTXUnHeo8y/BkhQY98A5WOkS/xHXVTRkm/ /QhYeyEJQgjonWDQKIDRzOyesTQ6SrUG5OgSlsY8mhuic3UxArsRN8iS/ qETwPkkAe1qzZbV8xk5AWhxIiHwUs2oTiVOOUbD3CYAUnQ5Tq9SYUyJih nPvNABC/ZU409sWRVzfQfjTLtdVwnRvl351miZOc67MOagFQoediHz72C 6/JUYEH38NLqkgWA7HKSnLuKtCApb5gMaiS09LY9SczznGQuG8Elzl/c8 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10900"; a="395722304" X-IronPort-AV: E=Sophos;i="6.04,215,1695711600"; d="scan'208";a="395722304" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10900"; a="884125170" X-IronPort-AV: E=Sophos;i="6.04,215,1695711600"; d="scan'208";a="884125170" 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 Subject: [PATCH v7 22/27] vfio/pci: Move VFIODevice initializations in vfio_instance_init Date: Tue, 21 Nov 2023 16:44:21 +0800 Message-Id: <20231121084426.1286987-23-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231121084426.1286987-1-zhenzhong.duan@intel.com> References: <20231121084426.1286987-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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=134.134.136.65; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.035, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1700556548697100008 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 445d58c8e5..87405584d7 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) < 0) { 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