commit 9bb0ec099756078118d8079e09f2bf3d6e7e00b6
author David Hildenbrand <dahi@linux.vnet.ibm.com> Mon Apr 04 14:27:51 2016 +0200
committer Christian Borntraeger <borntraeger@de.ibm.com> Mon May 09 13:33:57 2016 +0200
tree 94be53634febb4306b848ae264b6716cd6e81442
parent bd50e8ec8f668de472b3bf782ac95866056257dd

KVM: s390: cleanup cpuid handling

We only have one cpuid for all VCPUs, so let's directly use the one in the
cpu model. Also always store it directly as u64, no need for struct cpuid.

Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

arch/s390/kvm/priv.c

diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index 3137479..95916fa 100644
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
@@ -439,7 +439,7 @@
 
 static int handle_stidp(struct kvm_vcpu *vcpu)
 {
-	u64 stidp_data = vcpu->arch.stidp_data;
+	u64 stidp_data = vcpu->kvm->arch.model.cpuid;
 	u64 operand2;
 	int rc;
 	ar_t ar;