From: David Hildenbrand <dahi@linux.vnet.ibm.com>
Date: Mon, 5 Sep 2016 08:52:34 +0000 (+0200)
Subject: s390x/kvm: allow runtime-instrumentation for "none" machine
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=392529cb7747a4226e724c5a59858334f76021e2;p=qemu.git

s390x/kvm: allow runtime-instrumentation for "none" machine

To be able to query the correct host model for the "none" machine,
let's allow runtime-instrumentation for that machine.

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Message-Id: <20160905085244.99980-21-dahi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 3bfd6cc6fd..a63b4e8c61 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -249,6 +249,11 @@ bool ri_allowed(void)
 
             return s390mc->ri_allowed;
         }
+        /*
+         * Make sure the "none" machine can have ri, otherwise it won't * be
+         * unlocked in KVM and therefore the host CPU model might be wrong.
+         */
+        return true;
     }
     return 0;
 }