From mboxrd@z Thu Jan 1 00:00:00 1970 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) Sender: Richard Henderson From: Richard Henderson Date: Tue, 1 Oct 2013 10:17:25 -0700 Message-Id: <1380647845-16793-10-git-send-email-rth@twiddle.net> In-Reply-To: <1380647845-16793-1-git-send-email-rth@twiddle.net> References: <1380647845-16793-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH v2 9/9] target-s390: Force TCG to report Z9-109 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: agraf@suse.de 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(); -- 1.8.1.4