[Qemu-devel] [PATCH v2 9/9] target-s390: Force TCG to report Z9-109

[Richard Henderson]

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 <address@hidden>
---
 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