From nobody Fri May 3 06:49:46 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.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 ARC-Seal: i=1; a=rsa-sha256; t=1599204022; cv=none; d=zohomail.com; s=zohoarc; b=mNpK+hTNq9beFptmZ7ye5qoVbDLneKMVDJu1LVsYMLeSRRagfS0YPvmtSU5r9g4997tk0E78NBtug4F14Vtw6QcntQwSUnHUpIt2FHaUT0c7Locrc/x2Qolcf8MVbNMUrsuD5RXuhcA02Us9g3wpxshCPJZ/H0Xjn7i1EI1gRCI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599204022; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=M6S1N77sfwMJNYeGC82CCcrcwggYucl/SZvVJ6ctEsA=; b=VWLl3jeowf06pnn6LIGQreUIOytvDFJjbqKUScrESA0JzB6vzfuaEb67qGykXoaigJpgIMkyjDEOVaoqYUAvCZoBbtd3WsUCBYLLYq9SSC2fgtzvV3ykEPLqj5qx/gCY++KUIXhMHm0pMh4r9idK4fLLFQFGl3rGsA4CAi3l2eU= ARC-Authentication-Results: i=1; mx.zohomail.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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599204022319912.3301895051162; Fri, 4 Sep 2020 00:20:22 -0700 (PDT) Received: from localhost ([::1]:54630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kE61E-00047H-GZ for importer@patchew.org; Fri, 04 Sep 2020 03:20:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33560) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kE60a-0003a9-Nj for qemu-devel@nongnu.org; Fri, 04 Sep 2020 03:19:40 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:55854 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kE60Y-00046M-4v for qemu-devel@nongnu.org; Fri, 04 Sep 2020 03:19:40 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 4357D56638D3A8ECE35B; Fri, 4 Sep 2020 15:19:23 +0800 (CST) Received: from opensource.huawei.com (10.175.100.152) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.487.0; Fri, 4 Sep 2020 15:19:14 +0800 From: Pan Nengyuan To: Subject: [PATCH] target/i386/cpu: add return value verification and ignore Error objects Date: Fri, 4 Sep 2020 09:45:29 -0400 Message-ID: <20200904134529.1317-1-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 MIME-Version: 1.0 X-Originating-IP: [10.175.100.152] X-CFilter-Loop: Reflected 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=45.249.212.35; envelope-from=pannengyuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/04 03:19:24 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DATE_IN_FUTURE_06_12=1.947, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhang.zhanghailiang@huawei.com, Pan Nengyuan , kuhn.chenqun@huawei.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 'err' is unnecessary in x86_cpu_class_check_missing_features(), we can chan= ge x86_cpu_expand_features() to return true on success, false on failure, then pass NULL here to remove = it. Signed-off-by: Pan Nengyuan Suggested-by: Markus Armbruster Reviewed-by: Li Qiang Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/cpu.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 49d8958528..c3d3766133 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4883,7 +4883,7 @@ static void x86_cpu_parse_featurestr(const char *type= name, char *features, } } =20 -static void x86_cpu_expand_features(X86CPU *cpu, Error **errp); +static bool x86_cpu_expand_features(X86CPU *cpu, Error **errp); static void x86_cpu_filter_features(X86CPU *cpu, bool verbose); =20 /* Build a list with the name of all features on a feature word array */ @@ -4925,7 +4925,6 @@ static void x86_cpu_class_check_missing_features(X86C= PUClass *xcc, strList **missing_feats) { X86CPU *xc; - Error *err =3D NULL; strList **next =3D missing_feats; =20 if (xcc->host_cpuid_required && !accel_uses_host_cpuid()) { @@ -4937,8 +4936,7 @@ static void x86_cpu_class_check_missing_features(X86C= PUClass *xcc, =20 xc =3D X86_CPU(object_new_with_class(OBJECT_CLASS(xcc))); =20 - x86_cpu_expand_features(xc, &err); - if (err) { + if (!x86_cpu_expand_features(xc, NULL)) { /* Errors at x86_cpu_expand_features should never happen, * but in case it does, just report the model as not * runnable at all using the "type" property. @@ -4947,7 +4945,6 @@ static void x86_cpu_class_check_missing_features(X86C= PUClass *xcc, new->value =3D g_strdup("type"); *next =3D new; next =3D &new->next; - error_free(err); } =20 x86_cpu_filter_features(xc, false); @@ -6426,7 +6423,7 @@ static void x86_cpu_enable_xsave_components(X86CPU *c= pu) /* Expand CPU configuration data, based on configured features * and host/accelerator capabilities when appropriate. */ -static void x86_cpu_expand_features(X86CPU *cpu, Error **errp) +static bool x86_cpu_expand_features(X86CPU *cpu, Error **errp) { CPUX86State *env =3D &cpu->env; FeatureWord w; @@ -6436,14 +6433,14 @@ static void x86_cpu_expand_features(X86CPU *cpu, Er= ror **errp) for (l =3D plus_features; l; l =3D l->next) { const char *prop =3D l->data; if (!object_property_set_bool(OBJECT(cpu), prop, true, errp)) { - return; + return false; } } =20 for (l =3D minus_features; l; l =3D l->next) { const char *prop =3D l->data; if (!object_property_set_bool(OBJECT(cpu), prop, false, errp)) { - return; + return false; } } =20 @@ -6540,6 +6537,8 @@ static void x86_cpu_expand_features(X86CPU *cpu, Erro= r **errp) if (env->cpuid_xlevel2 =3D=3D UINT32_MAX) { env->cpuid_xlevel2 =3D env->cpuid_min_xlevel2; } + + return true; } =20 /* --=20 2.18.2