From nobody Sat May 4 16:47:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542452566996972.7918574821703; Sat, 17 Nov 2018 03:02:46 -0800 (PST) Received: from localhost ([::1]:48766 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNyN1-00079X-5P for importer@patchew.org; Sat, 17 Nov 2018 06:02:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNyLZ-0006dp-GG for qemu-devel@nongnu.org; Sat, 17 Nov 2018 06:01:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNyLY-0003z1-R7 for qemu-devel@nongnu.org; Sat, 17 Nov 2018 06:01:05 -0500 Received: from mxhk.zte.com.cn ([63.217.80.70]:17884) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gNyLU-0003us-Jt; Sat, 17 Nov 2018 06:01:00 -0500 Received: from mse01.zte.com.cn (unknown [10.30.3.20]) by Forcepoint Email with ESMTPS id 9950634DA987A0496E83; Sat, 17 Nov 2018 19:00:49 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id wAHB0fZn057762; Sat, 17 Nov 2018 19:00:42 +0800 (GMT-8) (envelope-from peng.hao2@zte.com.cn) Received: from localhost.localdomain.localdomain ([10.74.120.59]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2018111719012931-11314418 ; Sat, 17 Nov 2018 19:01:29 +0800 From: Peng Hao To: peter.maydell@linaro.org Date: Sun, 18 Nov 2018 03:22:46 +0800 Message-Id: <1542482566-91660-1-git-send-email-peng.hao2@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2018-11-17 19:01:29, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2018-11-17 19:00:22, Serialize complete at 2018-11-17 19:00:22 X-MAIL: mse01.zte.com.cn wAHB0fZn057762 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 63.217.80.70 Subject: [Qemu-devel] [PATCH] hw/arm/sysbus-fdt: fix assert in match function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peng Hao , qemu-arm@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In match function it should not call OBJECK_CHECK. When there is a mismatch, we should continue to match rather than assert(). Signed-off-by: Peng Hao --- hw/arm/sysbus-fdt.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c index 0e24c80..41b962d 100644 --- a/hw/arm/sysbus-fdt.c +++ b/hw/arm/sysbus-fdt.c @@ -419,10 +419,15 @@ static int add_amd_xgbe_fdt_node(SysBusDevice *sbdev,= void *opaque) static bool vfio_platform_match(SysBusDevice *sbdev, const BindingEntry *entry) { - VFIOPlatformDevice *vdev =3D VFIO_PLATFORM_DEVICE(sbdev); + VFIOPlatformDevice *vdev; const char *compat; unsigned int n; =20 + vdev =3D (VFIOPlatformDevice *) object_dynamic_cast(OBJECT(sbdev), + TYPE_VFIO_PLATFORM); + if (!vdev) + return false; + for (n =3D vdev->num_compat, compat =3D vdev->compat; n > 0; n--, compat +=3D strlen(compat) + 1) { if (!strcmp(entry->compat, compat)) { --=20 1.8.3.1