From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWmYa-0001k6-VO for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:33:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bWmYX-0005Jm-NQ for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:33:36 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:45910) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWmYX-0005J1-Ax for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:33:33 -0400 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u78FOdEP130635 for ; Mon, 8 Aug 2016 11:33:32 -0400 Received: from e06smtp15.uk.ibm.com (e06smtp15.uk.ibm.com [195.75.94.111]) by mx0a-001b2d01.pphosted.com with ESMTP id 24nce84yee-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 08 Aug 2016 11:33:32 -0400 Received: from localhost by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 8 Aug 2016 16:33:29 +0100 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 571BD1B0805F for ; Mon, 8 Aug 2016 16:34:58 +0100 (BST) Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u78FXPSn17956872 for ; Mon, 8 Aug 2016 15:33:25 GMT Received: from d06av02.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u78FXPV2032665 for ; Mon, 8 Aug 2016 09:33:25 -0600 From: David Hildenbrand Date: Mon, 8 Aug 2016 17:32:51 +0200 In-Reply-To: <1470670378-53732-1-git-send-email-dahi@linux.vnet.ibm.com> References: <1470670378-53732-1-git-send-email-dahi@linux.vnet.ibm.com> Message-Id: <1470670378-53732-23-git-send-email-dahi@linux.vnet.ibm.com> Subject: [Qemu-devel] [Patch v2 22/29] s390x/kvm: disable host model for existing compat machines List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: ehabkost@redhat.com, jdenemar@redhat.com, imammedo@redhat.com, cornelia.huck@de.ibm.com, borntraeger@de.ibm.com, fiuczy@linux.vnet.ibm.com, mimu@linux.vnet.ibm.com Compatibility machines that touch runtime-instrumentation should not be used with the CPU model. Otherwise the host model will look different, depending on the QEMU machine QEMU has been started with. So let's simply disable the host model for existing compatibility machines that all disable ri. Acked-by: Cornelia Huck Signed-off-by: David Hildenbrand --- target-s390x/kvm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 2cc0357..3c0929b 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -2451,6 +2451,10 @@ static int configure_cpu_feat(const S390FeatBitmap features) bool kvm_s390_cpu_models_supported(void) { + if (!ri_allowed()) { + /* compatibility machines interfere with the cpu model */ + return false; + } return kvm_vm_check_attr(kvm_state, KVM_S390_VM_CPU_MODEL, KVM_S390_VM_CPU_MACHINE) && kvm_vm_check_attr(kvm_state, KVM_S390_VM_CPU_MODEL, -- 2.6.6