From patchwork Thu Feb 29 03:37:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhenzhong Duan X-Patchwork-Id: 1906086 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=crGGCE82; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TlcSf1zBfz20Qg for ; Thu, 29 Feb 2024 14:40:50 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfXGx-00088b-1n; Wed, 28 Feb 2024 22:39:51 -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 1rfXGv-000883-Nt for qemu-devel@nongnu.org; Wed, 28 Feb 2024 22:39:49 -0500 Received: from mgamail.intel.com ([198.175.65.10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfXGt-0001yY-Op for qemu-devel@nongnu.org; Wed, 28 Feb 2024 22:39:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709177988; x=1740713988; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eGjd+pRgiwGO1fh5AeBj2UC6ZWHBBBc2TbAegiluf1Y=; b=crGGCE82R5UTCNxv30x4ehwZn5pSvGOZh2oL/9jZFBmjDr9nEh2dd/YE h/uK458rzYkWpQNAGTtaeyl8Quqcaph+HnV6lAGk1+l1dP+6js3WoN+0/ 8MP3/lHyXaFUdrk8laOdP2VasGFBfdDhUWh1OKwZbiIp9HHanJVTXJL1Z 6aR5o5tRv0Qi4+i5vkzWJp5bOBtNGOKrwwhFr8cz8pthgn5pk5u1ZLiZg 03tfDgFvUuEwFBiLRsvCk2jTry5jAOS6yTH/XW1eC9EYNjVesp2rEuFsz f3Al5K1s+BGqUfrgySN77Mg2DtWFJI4uaT2rJbVYEQxfZU8BvFH9YR55v g==; X-IronPort-AV: E=McAfee;i="6600,9927,10998"; a="21082849" X-IronPort-AV: E=Sophos;i="6.06,192,1705392000"; d="scan'208";a="21082849" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2024 19:39:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,192,1705392000"; d="scan'208";a="7592529" Received: from spr-s2600bt.bj.intel.com ([10.240.192.124]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2024 19:39:42 -0800 From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, berrange@redhat.com, eduardo@habkost.net, chao.p.peng@intel.com, Zhenzhong Duan Subject: [PATCH 1/2] qom/object_interfaces: Remove unnecessary local_err check Date: Thu, 29 Feb 2024 11:37:38 +0800 Message-Id: <20240229033739.1123076-2-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240229033739.1123076-1-zhenzhong.duan@intel.com> References: <20240229033739.1123076-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Received-SPF: pass client-ip=198.175.65.10; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.102, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org In the error return path, local_err is always set, no need to check it. Signed-off-by: Zhenzhong Duan Reviewed-by: Zhao Liu --- qom/object_interfaces.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index e0833c8bfe..255a7bf659 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -128,13 +128,11 @@ Object *user_creatable_add_type(const char *type, const char *id, } goto out; } -out: - if (local_err) { - error_propagate(errp, local_err); - object_unref(obj); - return NULL; - } return obj; +out: + error_propagate(errp, local_err); + object_unref(obj); + return NULL; } void user_creatable_add_qapi(ObjectOptions *options, Error **errp)