From nobody Fri Apr 4 09:15:51 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
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=quarantine dis=none) header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1742975883; cv=none;
d=zohomail.com; s=zohoarc;
b=etHaPyddp0aIbdcKaITRrtZskYZteidVxvXNGg8+rZMqWwfqYS9gV1vwltSSEZ12QMAEvKbJsETgVI8d3cgsy4ek+kXRvhB415T8Wj1WBVjvhkr0z6jsIgeETEtKKxvF9T7Zw0Y2mpP4wYrst/tS1D6kI1TfflynZXUlO1EWxHo=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1742975883;
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=sAWrR38/JV9FJlStgGQGNi2QY9KAVYrhhNSJ/lySp/Q=;
b=EBRnZhAcmHB2pIPo5RMyE1dntOP77d+nBGgTuThCA0HiiahT/l9pwbSGdiMEKTMtWAVb7XqbFXSaWSYQXFOUX47MKvgGnLYTe847n5TfZCRe/fJ+yQ48RaCUqxKCW6jFj1PKMQgaPftquFOAFm8CVaq2ZroacEsoGpmZ2AYq3WA=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
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=<clg@redhat.com> (p=quarantine dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1742975883617337.3511617573886;
Wed, 26 Mar 2025 00:58:03 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1txLZS-00014j-HU; Wed, 26 Mar 2025 03:53:06 -0400
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 <clg@redhat.com>) id 1txLZG-0000Cd-NA
for qemu-devel@nongnu.org; Wed, 26 Mar 2025 03:52:56 -0400
Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <clg@redhat.com>) id 1txLZD-0006JY-L6
for qemu-devel@nongnu.org; Wed, 26 Mar 2025 03:52:53 -0400
Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com
(ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by
relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,
cipher=TLS_AES_256_GCM_SHA384) id us-mta-675-7XWaZxsLPPWtQFNfX7UO6Q-1; Wed,
26 Mar 2025 03:52:47 -0400
Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com
(mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest
SHA256)
(No client certificate requested)
by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS
id 5B76C1809CA3; Wed, 26 Mar 2025 07:52:46 +0000 (UTC)
Received: from corto.redhat.com (unknown [10.45.226.180])
by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP
id 732A919560AB; Wed, 26 Mar 2025 07:52:42 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1742975570;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=sAWrR38/JV9FJlStgGQGNi2QY9KAVYrhhNSJ/lySp/Q=;
b=R+hPB3YuiVvdiB75N7JhFG/1eeein1ezHuxuUyu0v9777zMnMhFwqnSoiu+uc7ETdRr4EV
qSRFh08ehIuZ+vUNDr6/b/FjWrGEEB6Ne4/wpjL8Pp5x7IxXcngwhD9LBTIKzCHXu8LtFK
rbLjRWUbQZqujf4ylLeJaMUjbFCe8fM=
X-MC-Unique: 7XWaZxsLPPWtQFNfX7UO6Q-1
X-Mimecast-MFC-AGG-ID: 7XWaZxsLPPWtQFNfX7UO6Q_1742975566
From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
To: qemu-devel@nongnu.org,
Alex Williamson <alex.williamson@redhat.com>
Cc: Avihai Horon <avihaih@nvidia.com>, Eric Auger <eric.auger@redhat.com>,
Zhenzhong Duan <zhenzhong.duan@intel.com>,
John Levon <john.levon@nutanix.com>,
Joao Martins <joao.m.martins@oracle.com>,
=?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
Subject: [PATCH for-10.1 v2 19/37] vfio: Move vfio_get_device_info() to
helpers.c
Date: Wed, 26 Mar 2025 08:51:04 +0100
Message-ID: <20250326075122.1299361-20-clg@redhat.com>
In-Reply-To: <20250326075122.1299361-1-clg@redhat.com>
References: <20250326075122.1299361-1-clg@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40
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=170.10.129.124; envelope-from=clg@redhat.com;
helo=us-smtp-delivery-124.mimecast.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,
RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001,
RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=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 @redhat.com)
X-ZM-MESSAGEID: 1742975885842019000
vfio_get_device_info() is a low level routine. Move it with the other
helpers.
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: John Levon <john.levon@nutanix.com>
Link: https://lore.kernel.org/qemu-devel/20250318095415.670319-19-clg@redha=
t.com
Signed-off-by: C=C3=A9dric Le Goater <clg@redhat.com>
---
hw/vfio/vfio-helpers.h | 1 +
include/hw/vfio/vfio-common.h | 1 -
hw/vfio/common.c | 24 ------------------------
hw/vfio/helpers.c | 24 ++++++++++++++++++++++++
4 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/hw/vfio/vfio-helpers.h b/hw/vfio/vfio-helpers.h
index 5d91e33d27be1bdd8eb9b3ce74c39a4ac1991adc..dbcb68bbb0e12607f5ccf15f114=
530966c2cbcb2 100644
--- a/hw/vfio/vfio-helpers.h
+++ b/hw/vfio/vfio-helpers.h
@@ -25,6 +25,7 @@ bool vfio_get_info_dma_avail(struct vfio_iommu_type1_info=
*info,
#endif
=20
int vfio_bitmap_alloc(VFIOBitmap *vbmap, hwaddr size);
+struct vfio_device_info *vfio_get_device_info(int fd);
=20
int vfio_kvm_device_add_fd(int fd, Error **errp);
int vfio_kvm_device_del_fd(int fd, Error **errp);
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index 5cf7ae617371a2f8a09e52b1b438fa23703c6dd8..75c48ebf5c21ea93aa8ac4c3aec=
c63172b633f0e 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -122,7 +122,6 @@ bool vfio_set_irq_signaling(VFIODevice *vbasedev, int i=
ndex, int subindex,
int action, int fd, Error **errp);
=20
void vfio_reset_handler(void *opaque);
-struct vfio_device_info *vfio_get_device_info(int fd);
bool vfio_device_is_mdev(VFIODevice *vbasedev);
bool vfio_device_hiod_realize(VFIODevice *vbasedev, Error **errp);
bool vfio_attach_device(char *name, VFIODevice *vbasedev,
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index cbe69fb3225f7d30fbded348acea597b26f98651..2dcf70c66e81dddffb35a152da5=
a18d27a05c6f1 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -1334,30 +1334,6 @@ void vfio_reset_handler(void *opaque)
}
}
=20
-struct vfio_device_info *vfio_get_device_info(int fd)
-{
- struct vfio_device_info *info;
- uint32_t argsz =3D sizeof(*info);
-
- info =3D g_malloc0(argsz);
-
-retry:
- info->argsz =3D argsz;
-
- if (ioctl(fd, VFIO_DEVICE_GET_INFO, info)) {
- g_free(info);
- return NULL;
- }
-
- if (info->argsz > argsz) {
- argsz =3D info->argsz;
- info =3D g_realloc(info, argsz);
- goto retry;
- }
-
- return info;
-}
-
bool vfio_attach_device(char *name, VFIODevice *vbasedev,
AddressSpace *as, Error **errp)
{
diff --git a/hw/vfio/helpers.c b/hw/vfio/helpers.c
index e6b75baa805241b4df28769338b15a6fe9b99501..b7f75b47af3a5d066eb51890383=
1214df6c3755a 100644
--- a/hw/vfio/helpers.c
+++ b/hw/vfio/helpers.c
@@ -312,6 +312,30 @@ int vfio_kvm_device_del_fd(int fd, Error **errp)
return 0;
}
=20
+struct vfio_device_info *vfio_get_device_info(int fd)
+{
+ struct vfio_device_info *info;
+ uint32_t argsz =3D sizeof(*info);
+
+ info =3D g_malloc0(argsz);
+
+retry:
+ info->argsz =3D argsz;
+
+ if (ioctl(fd, VFIO_DEVICE_GET_INFO, info)) {
+ g_free(info);
+ return NULL;
+ }
+
+ if (info->argsz > argsz) {
+ argsz =3D info->argsz;
+ info =3D g_realloc(info, argsz);
+ goto retry;
+ }
+
+ return info;
+}
+
int vfio_get_dev_region_info(VFIODevice *vbasedev, uint32_t type,
uint32_t subtype, struct vfio_region_info **i=
nfo)
{
--=20
2.49.0