From patchwork Tue Oct 1 17:17:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 279543 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D0E962C0085 for ; Wed, 2 Oct 2013 03:24:14 +1000 (EST) Received: from localhost ([::1]:60322 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VR3gC-00046X-MN for incoming@patchwork.ozlabs.org; Tue, 01 Oct 2013 13:24:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VR3aY-0004Qn-Gb for qemu-devel@nongnu.org; Tue, 01 Oct 2013 13:18:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VR3aS-0000Gu-Mt for qemu-devel@nongnu.org; Tue, 01 Oct 2013 13:18:22 -0400 Received: from mail-qc0-x22f.google.com ([2607:f8b0:400d:c01::22f]:42885) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VR3aS-0000GZ-IL for qemu-devel@nongnu.org; Tue, 01 Oct 2013 13:18:16 -0400 Received: by mail-qc0-f175.google.com with SMTP id v2so4885034qcr.20 for ; Tue, 01 Oct 2013 10:18:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=l0p5qTwwZ1Hq/o/iWzptAy0hT2nD4gSF5Pp5FvgvOL0=; b=W/78qsVuaOvniSLUGXnK8fiRWsZf+xXBpJ7HDRR9Qt5P7JOnQ7eZ6oEVXCH5KmjBqY IP9zWvnaHXoF0CvieWJKA/sHslex6cNWBxnKTBkjIeFYX8PVpkiaUK4ZkySXpR52hlhH DXeVyTXvUwDmjM/jXUwRewl06I120GcaWgmbocvjk53lLHukaavaiCaK4syEgMzEZDqm IeMRsieWJUA2a4EbFrG4UV5Vs9yRUBoFmzrCtfBYZtIWIpZiBqbFb+IkoFec+QXFgyAw MnbDve6z4FbI6G/YLfewFL6DuFrazkDEXQuC9zROFpEqOuA93FiDGTLLcT715GaPALw7 MrkA== X-Received: by 10.49.50.7 with SMTP id y7mr36714740qen.45.1380647896256; Tue, 01 Oct 2013 10:18:16 -0700 (PDT) Received: from anchor.com (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPSA id r5sm14813158qaj.13.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 01 Oct 2013 10:18:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 1 Oct 2013 10:17:25 -0700 Message-Id: <1380647845-16793-10-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1380647845-16793-1-git-send-email-rth@twiddle.net> References: <1380647845-16793-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c01::22f Cc: agraf@suse.de Subject: [Qemu-devel] [PATCH v2 9/9] target-s390: Force TCG to report Z9-109 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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 Fedora 19 targets Z9-109 as the minimum supported cpu, and the kernel will exit very early in the boot process if facilities do not match. This is a hack until we properly implement distinct qom cpu types. Signed-off-by: Richard Henderson --- target-s390x/cpu.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 0cdddd3..dfdc6f2 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -248,6 +248,16 @@ static void s390_cpu_initfn(Object *obj) env->facilities[0] = FAC0_TCG; env->facilities[1] = 0; + /* ??? Current distros are targeting Z9-109 as the minimum. TCG + supports most of the Z9-109 facilities but not all. Sadly, the + kernel checks for facilities it doesn't actually need, minor stuff + like hex floating point and translation. For now, include all + that the kernel requires we support. */ +#ifndef CONFIG_USER_ONLY + env->facilities[0] |= FAC0_Z9_109; + env->machine_type = 0x20940000; +#endif + if (tcg_enabled() && !inited) { inited = true; s390x_translate_init();