From nobody Wed Nov 27 07:29:07 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=1700038149; cv=none; d=zohomail.com; s=zohoarc; b=XS3rBeb2XYarMwBV7WlvmQCVEM9uBFpIp5cpoTG81P2bgiumPczdD4S+6TD3M5Cb/egoi0cSZk5BnSTqnvSUaIOnpjzfJgvPt0XZu3uOoNbrUK3i5h8CjT+xVkWq0/I5utRXklEinu65kpLU+uRti8mhWWrUsJnL47t4AlAYlJQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700038149; 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=JOfxMHcY13zKDiIB73OPJmSlihe28a7xoUrq0yIgp8o=; b=NWBRXnf3/qFGerTWaI238S6NTJSsjHOCoRCSdYmmX4lpAlCfEl2qlexMF3Aq6FwOjLOW2pCv6xCyDvkbHfxY8/o9/lVFYMezjJaZk+RfeM1NplbP7YAOAcB2VuNgwuJt/812JWGg4XlrkvjH8IIbe8cFXJ/cYBnortsqwvZ9Mw4= 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 1700038149503413.95132483263274; Wed, 15 Nov 2023 00:49:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3BZ5-0003Ha-GR; Wed, 15 Nov 2023 03:48:03 -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 1r3BZ3-0003HA-CV for qemu-devel@nongnu.org; Wed, 15 Nov 2023 03:48:01 -0500 Received: from mgamail.intel.com ([192.198.163.7]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3BZ1-0007nA-Pk for qemu-devel@nongnu.org; Wed, 15 Nov 2023 03:48:01 -0500 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2023 00:47:59 -0800 Received: from duan-server-s2600bt.bj.intel.com ([10.240.192.147]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2023 00:47:54 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700038080; x=1731574080; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WpnyEgYVlQhz4JkZ88KelgquTk6OuNRMC6HfJb5IWK4=; b=L5aVP8UD9jn8o5LkxVpXVtA7ohwUvhTuqpVkibOvJATNrKZYh15+hnEb 4u1nozjC1s0IOIrJ94SSYLFSg0UkTo5xxFeINX/w50SN8Xq3ufBxHgfJl Meuttsz8bS86LfObSTrq+UdkFmGsRtRcFjBbEwik4Lx4PGbhmUPGOOxKM BT2avit9obNTuSwoSe8Y3j/vp8rth9/fW8i9u4QMwB3iqVP+qP0wSkXE8 XqCJUK2NXSl9EdX1JnSf22Gx9R+0OsW35dI5wKf3r4La8g1DtL+JlyY0C 9srmQf0Kb++IpQeE7IcyYg6U++ucchZaHlS0+w9XCpdMBWWvQIkaqIRlS w==; X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="12385041" X-IronPort-AV: E=Sophos;i="6.03,304,1694761200"; d="scan'208";a="12385041" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="1012199413" X-IronPort-AV: E=Sophos;i="6.03,304,1694761200"; d="scan'208";a="1012199413" 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 Subject: [PATCH 1/4] vfio/pci: Move VFIODevice initializations in vfio_instance_init Date: Wed, 15 Nov 2023 16:32:15 +0800 Message-Id: <20231115083218.1973627-2-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231115083218.1973627-1-zhenzhong.duan@intel.com> References: <20231115083218.1973627-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.198.163.7; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: 1700038150128100003 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 07:29:07 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=1700038149; cv=none; d=zohomail.com; s=zohoarc; b=TLoTKCBvd1ab+fGfptCfqAUmdELbi9dPG8pjRmRBXIaC2C7hjLhvMKViAFsN+YOWK1Pt3bZVzHvPkNXk6RFz2W7v5cNqoMIEVMYHc70+Pkwhg8XT3sAnYjJZOyLsitqG5kXsA1pbLjjOg2IPI4aBuVu19+fTTNkt14586AvtoHs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700038149; 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=Jb8+AcgbG49Myvst0cmIhftre4ydln3Z5pk0dlJLwvM=; b=MGSqUVw6vMyDl9xJZHxETCvcxhU5B8rbpZPIur+bLcHDopoH7W3Bvr1hcTIfvaFasfKl5lNK/S0h7FP0W2x9IleUbyJ34bEYwvfNAPJTwhngTxxJ0Ipp7r6pyxFNApp8yOha3qlLX6oHnfkek4Cjt6c8yVJNkO3enM4e2eZJXNk= 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 1700038149391320.06230584292973; Wed, 15 Nov 2023 00:49:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3BZB-0003I6-Fc; Wed, 15 Nov 2023 03:48: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 1r3BZ9-0003Hy-CZ for qemu-devel@nongnu.org; Wed, 15 Nov 2023 03:48:07 -0500 Received: from mgamail.intel.com ([192.198.163.7]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3BZ7-0007nA-Ta for qemu-devel@nongnu.org; Wed, 15 Nov 2023 03:48:07 -0500 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2023 00:48:05 -0800 Received: from duan-server-s2600bt.bj.intel.com ([10.240.192.147]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2023 00:47:58 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700038086; x=1731574086; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DXZgRlcEsVhbTjmQcjBUO2mDr+hNClUzdVf9Lc2eios=; b=MZHUmAeZEory7vWPmgi0iZHB0SVBeX7SGFHbbz8ze8XJ/+fihqhM8ckP VxF1Lz2afkanlcVVDiNIZe/FOpSBxvXUGRVb9OUX7+CZi7V7P9/sCrQ6C fR02aqUuWF26prQLVQgUCMIIHmvJt6ExFnpBMBUYbQS+YGej/eG1x4b4O n/r3Co1xx1Kf63vH0xMbmO5/AWZ76nnhPZKRBXDTAxUjf6PfMd0IIgfLZ JMKJIcsOiw2YXD7lHAUopOUmIpnWIIyAOdXQJknavdg0hkLFuAksZeZUP xTPeobzZYPmF2gkpVlHIVWRCWB7IU3QaDlgSChBzzsES9a4vwcJe05YB1 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="12385050" X-IronPort-AV: E=Sophos;i="6.03,304,1694761200"; d="scan'208";a="12385050" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="1012199429" X-IronPort-AV: E=Sophos;i="6.03,304,1694761200"; d="scan'208";a="1012199429" 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 Subject: [PATCH 2/4] vfio/platform: Move VFIODevice initializations in vfio_platform_instance_init Date: Wed, 15 Nov 2023 16:32:16 +0800 Message-Id: <20231115083218.1973627-3-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231115083218.1973627-1-zhenzhong.duan@intel.com> References: <20231115083218.1973627-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.198.163.7; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: 1700038149910100001 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 07:29:07 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=1700038149; cv=none; d=zohomail.com; s=zohoarc; b=Z1UJ0ac6UC6KrLaXjRupeOO7Dl31rO882v8FoUChp8M7SD3f4hv+FqrkO6tjq1PbC+gaOTqGbV2ApQtv5xUZUqRalH49l+5VtozB3S8AGCO5G9jkoh1I8d+TXfayew1bUnwr0aNSv4fmjR/K7JkLDuxk04ESxvIdW8MXLVYW9dw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700038149; 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=FmMjGfwPj4FyutsOyFy7sy+GuqFyATpk2pgeJFTf1bU=; b=RORGZE+K9ucC2PSHiCIBp4uQD43HXgEhIfe1LRJdmc7Ma8mH7MNZy5Dm3VlcCf6TTX2/qq9+7ZwerI/taGNEWbdP358FhdmiWlG8jmMr5p4Ti43vVDoq+XklCLvCY+FDRBfYwOFmd0DhAdbSvFYy0Kl3jmY+vRKzuJs4tt7sDj4= 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 1700038149511199.795543620716; Wed, 15 Nov 2023 00:49:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3BZL-0003Iv-42; Wed, 15 Nov 2023 03:48:19 -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 1r3BZJ-0003IX-Ab; Wed, 15 Nov 2023 03:48:17 -0500 Received: from mgamail.intel.com ([192.198.163.7]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3BZH-0007uT-Mu; Wed, 15 Nov 2023 03:48:17 -0500 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2023 00:48:10 -0800 Received: from duan-server-s2600bt.bj.intel.com ([10.240.192.147]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2023 00:48:04 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700038096; x=1731574096; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Vnso+25nvjyRZ+a3ImY5eYjjdq0AgeyWNE86VlUd59Y=; b=VcdGfEMemTRpjfvQmI+9amFo91mj8bp3eox5lTuOAim8Dj22Ye3JIClO VA6ZwjXm+bFs+Oy5OENkqV+5RzyHvID5MVHBPYIltU5kXdMycTWqubygN 5kvqWyuVN4zCt1b+SahwvO6mniAwocVjm7IAbY8ESUWoRanqGOke46B/+ kJWroeI5EWKQMoT4uyiLlUNvpcEuur/ESTTrI5vJFfKN4+rSp9hS5Ilhe J1+ulRblL85YIYoxfg7l2ngnBh9x1KroHKEY/RXqxfCtQZmRJLLcFn9f/ st0tEiQgSh0BquyqOyFFmWpB+yyCpvLAeuLLnpyhBVwfwNQplp9q2+GoJ Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="12385059" X-IronPort-AV: E=Sophos;i="6.03,304,1694761200"; d="scan'208";a="12385059" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="1012199443" X-IronPort-AV: E=Sophos;i="6.03,304,1694761200"; d="scan'208";a="1012199443" 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 , Tony Krowiak , Halil Pasic , Jason Herne , Thomas Huth , qemu-s390x@nongnu.org (open list:vfio-ap) Subject: [PATCH 3/4] vfio/ap: Move VFIODevice initializations in vfio_ap_instance_init Date: Wed, 15 Nov 2023 16:32:17 +0800 Message-Id: <20231115083218.1973627-4-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231115083218.1973627-1-zhenzhong.duan@intel.com> References: <20231115083218.1973627-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.198.163.7; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: 1700038150128100004 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: Eric Farman Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 07:29:07 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=1700038176; cv=none; d=zohomail.com; s=zohoarc; b=cBR7o49bdcKcbK7vuc2hOarH50KaiTRPZD0dOQRT2P2UY4ZHZvmg8WvjzFe9xMn/OOTVkRw2r3PAzvUcwwS5RGv0H6RWWPQ98w/7L+UPEht8hiKkET3ErkO9QWRHEstf8h7Hb3mXTmYf9ki6XEj7ygUiUCU3FZGU8fqUiJKRJ/E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700038176; 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=6ZxQflOBx4a9NthEy3NzzWo/9tSJqeMO7VnV3btEB5o=; b=Cv2AMjjNxQOK2mfasaHh/H0fvhp+kjf9BJihFJdjcB/CBjZOmhErTJv0aNfhmcuwZ8MXfVt6aN/lCzDf6485weWbYsiC2YLVIQHcKG2/sXlXC9E8ZUBeDLuy6We5VKRO1PDKnP8rjAXMG3ky4o3myxbRc+pEpH+zTUYXqOfeVIU= 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 1700038176192506.30099535727527; Wed, 15 Nov 2023 00:49:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3BZL-0003JS-Op; Wed, 15 Nov 2023 03:48:19 -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 1r3BZK-0003Ik-A9; Wed, 15 Nov 2023 03:48:18 -0500 Received: from mgamail.intel.com ([192.198.163.7]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3BZI-0007ub-N3; Wed, 15 Nov 2023 03:48:18 -0500 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2023 00:48:15 -0800 Received: from duan-server-s2600bt.bj.intel.com ([10.240.192.147]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2023 00:48:09 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700038097; x=1731574097; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4T25mDurpLt8WQ4FJZmMzpzp4n1j01lUEeg9qooKvDg=; b=CFmHTP/5NjS1seAJl6SWSPmcrRmn1veg1htnmWxkrM6Wv1R2N5z10ubs xnA0NECR2WPVmqU9qgd3Vds3xYbEg6HHoWBKG5Pf081rUmLr18DnYADaO yrJgkP1TO2XwXs6EKQL07nwz+IRZg9oCGukVphGrrH1WjBq3D6YJvoyfB h3sjSSWpgNJHlUGkMk08qBh5de2HP+K6SXxgTYvwe1SBpF1kk/HWRnqfS r6DvE9WNe5NpxWNaKUhZvX5qKAP4nAYTPFdSsB6kcYlYs0IfQguniHm2V 5JnpgwUM2DJZoKb43DHt8iVJuR57rAqlMrbZgLQYJt+Disjdem/yFRn0Y A==; X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="12385068" X-IronPort-AV: E=Sophos;i="6.03,304,1694761200"; d="scan'208";a="12385068" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="1012199457" X-IronPort-AV: E=Sophos;i="6.03,304,1694761200"; d="scan'208";a="1012199457" 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 , Eric Farman , Matthew Rosato , Thomas Huth , qemu-s390x@nongnu.org (open list:vfio-ccw) Subject: [PATCH 4/4] vfio/ccw: Move VFIODevice initializations in vfio_ccw_instance_init Date: Wed, 15 Nov 2023 16:32:18 +0800 Message-Id: <20231115083218.1973627-5-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231115083218.1973627-1-zhenzhong.duan@intel.com> References: <20231115083218.1973627-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.198.163.7; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: 1700038177962100003 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: Eric Farman Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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