From nobody Mon Nov 25 09:50:59 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=1716353029; cv=none; d=zohomail.com; s=zohoarc; b=gBVegSyQP34qq1jgTGo0NMKa2tcZ7sa5doVb36QitfWpzMEmlUJFXRXT8Le1oD8snALer3y959lXuPORC6Eji3X5/VK8gSJwQ2Bji98JpAYDlSNAUPUT83oGUtAF/AR92/E0GAWgrMVDQBhdu7j5EMuSJcO0lMZ8NuIidK8C2mA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1716353029; 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=OAs5NY/JxWZV/ykILFDm1Vhok/3vLm5q25vQLMkaDKA=; b=EgHo6FUJwBGnRrop/ppJxf59ZwA0/ObbsRcFY/RWN6oYX1b+GK4H/bYI4qmsDc0gY8BQebvBUSjxFJo/q4u2qF+YERSzsYqXxgHEBzoSDopwJB2FigAokwSSd/I4ldyEL/J8F7gInoenBPmGDRLNvrhZK1g1CXxHqTG9gAnBpRU= 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 171635302913061.94066489044633; Tue, 21 May 2024 21:43:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9doV-0001PF-Ep; Wed, 22 May 2024 00:42:55 -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 ) id 1s9doU-0001Or-7N for qemu-devel@nongnu.org; Wed, 22 May 2024 00:42:54 -0400 Received: from mgamail.intel.com ([192.198.163.10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s9doS-0005sV-ED for qemu-devel@nongnu.org; Wed, 22 May 2024 00:42:53 -0400 Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2024 21:42:52 -0700 Received: from unknown (HELO SPR-S2600BT.bj.intel.com) ([10.240.192.124]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2024 21:42:50 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716352973; x=1747888973; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jnonh+R/LPS7uBevdbaTjQz/fEBnZL+cByDlYNJn0F8=; b=GDULGdW78aGL3GNSsh/F7rN6QRZ6R9Pd7u0+0KL+7pNx/uDYRn1iCN6j XrJsJ18Pg0O0i5osu6qY5uhGmBTyzCO18Ng8dL9R/CkVVqS9jsAub+Hor KNagrZ1/jx/r3pDCWL/F6iZ19gGtaubw3mmNEb1Ktvk07IElMsWUuPQCw nwOtk9GnA8lAQ4iCWW8ZB6wGWuwJASRLk2RmhFOYn7FQm63mtWFV4667C VVorN9aUqyb1T8tHpzYJDCgOlbmKF3TyEiFFlD7mFPJwXOhVLtHHj4Mqx jTRcvlfGoAXxIbPqTXdoXxjrRo+Tc2GWiNTTzP42KLECe2udI3DvSFXCR Q==; X-CSE-ConnectionGUID: KE1/MlUjTIyxQnX2vDjHcQ== X-CSE-MsgGUID: i9MYC0DMQfCWnPtXp7/87Q== X-IronPort-AV: E=McAfee;i="6600,9927,11079"; a="23994139" X-IronPort-AV: E=Sophos;i="6.08,179,1712646000"; d="scan'208";a="23994139" X-CSE-ConnectionGUID: SmQFA0toQ2WH2XJetDwJgw== X-CSE-MsgGUID: yu8cb8SsTL2OrzHVI7BvQQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,179,1712646000"; d="scan'208";a="33683695" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, eric.auger@redhat.com, chao.p.peng@intel.com, Zhenzhong Duan Subject: [PATCH v2 06/20] vfio/platform: Make vfio_populate_device() and vfio_base_device_init() return bool Date: Wed, 22 May 2024 12:40:01 +0800 Message-Id: <20240522044015.412951-7-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240522044015.412951-1-zhenzhong.duan@intel.com> References: <20240522044015.412951-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.10; 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.001, 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 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: 1716353030275100001 This is to follow the coding standand in qapi/error.h to return bool for bool-valued functions. Suggested-by: C=C3=A9dric Le Goater Signed-off-by: Zhenzhong Duan Reviewed-by: C=C3=A9dric Le Goater --- hw/vfio/platform.c | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index e1a32863d9..a85c199c76 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -441,7 +441,7 @@ static int vfio_platform_hot_reset_multi(VFIODevice *vb= asedev) * @errp: error object * */ -static int vfio_populate_device(VFIODevice *vbasedev, Error **errp) +static bool vfio_populate_device(VFIODevice *vbasedev, Error **errp) { VFIOINTp *intp, *tmp; int i, ret =3D -1; @@ -450,7 +450,7 @@ static int vfio_populate_device(VFIODevice *vbasedev, E= rror **errp) =20 if (!(vbasedev->flags & VFIO_DEVICE_FLAGS_PLATFORM)) { error_setg(errp, "this isn't a platform device"); - return ret; + return false; } =20 vdev->regions =3D g_new0(VFIORegion *, vbasedev->num_regions); @@ -487,12 +487,11 @@ static int vfio_populate_device(VFIODevice *vbasedev,= Error **errp) irq.flags); intp =3D vfio_init_intp(vbasedev, irq, errp); if (!intp) { - ret =3D -1; goto irq_err; } } } - return 0; + return true; irq_err: timer_del(vdev->mmap_timer); QLIST_FOREACH_SAFE(intp, &vdev->intp_list, next, tmp) { @@ -507,7 +506,7 @@ reg_error: g_free(vdev->regions[i]); } g_free(vdev->regions); - return ret; + return false; } =20 /* specialized functions for VFIO Platform devices */ @@ -527,10 +526,8 @@ static VFIODeviceOps vfio_platform_ops =3D { * fd retrieval, resource query. * Precondition: the device name must be initialized */ -static int vfio_base_device_init(VFIODevice *vbasedev, Error **errp) +static bool vfio_base_device_init(VFIODevice *vbasedev, Error **errp) { - int ret; - /* @fd takes precedence over @sysfsdev which takes precedence over @ho= st */ if (vbasedev->fd < 0 && vbasedev->sysfsdev) { g_free(vbasedev->name); @@ -538,7 +535,7 @@ static int vfio_base_device_init(VFIODevice *vbasedev, = Error **errp) } else if (vbasedev->fd < 0) { if (!vbasedev->name || strchr(vbasedev->name, '/')) { error_setg(errp, "wrong host device name"); - return -EINVAL; + return false; } =20 vbasedev->sysfsdev =3D g_strdup_printf("/sys/bus/platform/devices/= %s", @@ -546,20 +543,20 @@ static int vfio_base_device_init(VFIODevice *vbasedev= , Error **errp) } =20 if (!vfio_device_get_name(vbasedev, errp)) { - return -EINVAL; + return false; } =20 if (!vfio_attach_device(vbasedev->name, vbasedev, &address_space_memory, errp)) { - return -EINVAL; + return false; } =20 - ret =3D vfio_populate_device(vbasedev, errp); - if (ret) { - vfio_detach_device(vbasedev); + if (vfio_populate_device(vbasedev, errp)) { + return true; } =20 - return ret; + vfio_detach_device(vbasedev); + return false; } =20 /** @@ -576,7 +573,7 @@ static void vfio_platform_realize(DeviceState *dev, Err= or **errp) VFIOPlatformDevice *vdev =3D VFIO_PLATFORM_DEVICE(dev); SysBusDevice *sbdev =3D SYS_BUS_DEVICE(dev); VFIODevice *vbasedev =3D &vdev->vbasedev; - int i, ret; + int i; =20 qemu_mutex_init(&vdev->intp_mutex); =20 @@ -584,9 +581,8 @@ static void vfio_platform_realize(DeviceState *dev, Err= or **errp) vbasedev->sysfsdev : vbasedev->name, vdev->compat); =20 - ret =3D vfio_base_device_init(vbasedev, errp); - if (ret) { - goto out; + if (!vfio_base_device_init(vbasedev, errp)) { + goto init_err; } =20 if (!vdev->compat) { @@ -618,11 +614,9 @@ static void vfio_platform_realize(DeviceState *dev, Er= ror **errp) } sysbus_init_mmio(sbdev, vdev->regions[i]->mem); } -out: - if (!ret) { - return; - } + return; =20 +init_err: if (vdev->vbasedev.name) { error_prepend(errp, VFIO_MSG_PREFIX, vdev->vbasedev.name); } else { --=20 2.34.1