From nobody Thu May 2 05:15:23 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.zoho.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 1488484350337999.7760485195333; Thu, 2 Mar 2017 11:52:30 -0800 (PST) Received: from localhost ([::1]:54254 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjWm5-0006n5-4e for importer@patchew.org; Thu, 02 Mar 2017 14:52:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjWlZ-0006mx-CT for qemu-devel@nongnu.org; Thu, 02 Mar 2017 14:51:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cjWlW-0001fh-N0 for qemu-devel@nongnu.org; Thu, 02 Mar 2017 14:51:57 -0500 Received: from inet-orm.provo.novell.com ([137.65.248.124]:60637 helo=mail.novell.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cjWlW-0001eW-DC for qemu-devel@nongnu.org; Thu, 02 Mar 2017 14:51:54 -0500 Received: from brogers1.provo.novell.com (brogers1.dnsdhcp.provo.novell.com [137.65.132.245]) by mail.novell.com with ESMTP (NOT encrypted); Thu, 02 Mar 2017 12:51:42 -0700 From: Bruce Rogers To: qemu-devel@nongnu.org Date: Thu, 2 Mar 2017 12:51:34 -0700 Message-Id: <20170302195134.22171-1-brogers@suse.com> X-Mailer: git-send-email 2.11.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 137.65.248.124 Subject: [Qemu-devel] [PATCH] linux-user: Exclude more cpu model code when building s390x linux-user 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: Bruce Rogers , david@redhat.com, agraf@suse.de, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Currently qemu-s390x segfaults. Avoid cpu model code which doesn't apply in linux user case. Signed-off-by: Bruce Rogers --- target/s390x/cpu_models.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 2a894eec65..97e4e75f68 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -590,7 +590,6 @@ CpuModelBaselineInfo *arch_query_cpu_model_baseline(Cpu= ModelInfo *infoa, cpu_info_from_model(baseline_info->model, &model, true); return baseline_info; } -#endif =20 static void check_consistency(const S390CPUModel *model) { @@ -660,7 +659,6 @@ static void check_compatibility(const S390CPUModel *max= _model, =20 static S390CPUModel *get_max_cpu_model(Error **errp) { -#ifndef CONFIG_USER_ONLY static S390CPUModel max_model; static bool cached; =20 @@ -680,9 +678,9 @@ static S390CPUModel *get_max_cpu_model(Error **errp) cached =3D true; return &max_model; } -#endif return NULL; } +#endif =20 static inline void apply_cpu_model(const S390CPUModel *model, Error **errp) { @@ -718,6 +716,7 @@ static inline void apply_cpu_model(const S390CPUModel *= model, Error **errp) =20 void s390_realize_cpu_model(CPUState *cs, Error **errp) { +#ifndef CONFIG_USER_ONLY S390CPUClass *xcc =3D S390_CPU_GET_CLASS(cs); S390CPU *cpu =3D S390_CPU(cs); const S390CPUModel *max_model; @@ -751,6 +750,7 @@ void s390_realize_cpu_model(CPUState *cs, Error **errp) } =20 apply_cpu_model(cpu->model, errp); +#endif } =20 static void get_feature(Object *obj, Visitor *v, const char *name, --=20 2.11.1