diff options
| author |   David Hildenbrand <dahi@linux.vnet.ibm.com> | 2016-04-04 14:27:51 +0200 |
|---|---|---|
| committer |   Christian Borntraeger <borntraeger@de.ibm.com> | 2016-05-09 13:33:57 +0200 |
| commit | 9bb0ec099756078118d8079e09f2bf3d6e7e00b6 (patch) | |
| tree | 94be53634febb4306b848ae264b6716cd6e81442 /arch/s390/include/asm/kvm_host.h | |
| parent | KVM: s390: enable SRS only if enabled for the guest (diff) | |
| download | linux-dev-9bb0ec099756078118d8079e09f2bf3d6e7e00b6.tar.xz linux-dev-9bb0ec099756078118d8079e09f2bf3d6e7e00b6.zip | |
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>
Diffstat (limited to 'arch/s390/include/asm/kvm_host.h')
| -rw-r--r-- | arch/s390/include/asm/kvm_host.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h index 6da41fab70fb..9282ccf1d136 100644 --- a/arch/s390/include/asm/kvm_host.h +++ b/arch/s390/include/asm/kvm_host.h @@ -544,10 +544,6 @@ struct kvm_vcpu_arch { struct kvm_s390_local_interrupt local_int; struct hrtimer ckc_timer; struct kvm_s390_pgm_info pgm; - union { - struct cpuid cpu_id; - u64 stidp_data; - }; struct gmap *gmap; struct kvm_guestdbg_info_arch guestdbg; unsigned long pfault_token; @@ -605,7 +601,7 @@ struct kvm_s390_cpu_model { __u64 fac_mask[S390_ARCH_FAC_LIST_SIZE_U64]; /* facility list requested by guest (in dma page) */ __u64 *fac_list; - struct cpuid cpu_id; + u64 cpuid; unsigned short ibc; }; |