tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'kvm-s390-master-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master

KVM: s390: Fixes

- fix compilation for !CONFIG_PCI
- fix the output of KVM_CAP_MAX_VCPU_ID

Paolo Bonzini f8d221d2 24e8a2ca

+15 -2
+3
arch/mips/kvm/mips.c
··· 1122 1122 case KVM_CAP_MAX_VCPUS: 1123 1123 r = KVM_MAX_VCPUS; 1124 1124 break; 1125 + case KVM_CAP_MAX_VCPU_ID: 1126 + r = KVM_MAX_VCPU_ID; 1127 + break; 1125 1128 case KVM_CAP_MIPS_FPU: 1126 1129 /* We don't handle systems with inconsistent cpu_has_fpu */ 1127 1130 r = !!raw_cpu_has_fpu;
+3
arch/powerpc/kvm/powerpc.c
··· 657 657 case KVM_CAP_MAX_VCPUS: 658 658 r = KVM_MAX_VCPUS; 659 659 break; 660 + case KVM_CAP_MAX_VCPU_ID: 661 + r = KVM_MAX_VCPU_ID; 662 + break; 660 663 #ifdef CONFIG_PPC_BOOK3S_64 661 664 case KVM_CAP_PPC_GET_SMMU_INFO: 662 665 r = 1;
+1
arch/s390/kvm/kvm-s390.c
··· 539 539 break; 540 540 case KVM_CAP_NR_VCPUS: 541 541 case KVM_CAP_MAX_VCPUS: 542 + case KVM_CAP_MAX_VCPU_ID: 542 543 r = KVM_S390_BSCA_CPU_SLOTS; 543 544 if (!kvm_s390_use_sca_entries()) 544 545 r = KVM_MAX_VCPUS;
+3
arch/x86/kvm/x86.c
··· 3122 3122 case KVM_CAP_MAX_VCPUS: 3123 3123 r = KVM_MAX_VCPUS; 3124 3124 break; 3125 + case KVM_CAP_MAX_VCPU_ID: 3126 + r = KVM_MAX_VCPU_ID; 3127 + break; 3125 3128 case KVM_CAP_PV_MMU: /* obsolete */ 3126 3129 r = 0; 3127 3130 break;
+3
virt/kvm/arm/arm.c
··· 224 224 case KVM_CAP_MAX_VCPUS: 225 225 r = KVM_MAX_VCPUS; 226 226 break; 227 + case KVM_CAP_MAX_VCPU_ID: 228 + r = KVM_MAX_VCPU_ID; 229 + break; 227 230 case KVM_CAP_MSI_DEVID: 228 231 if (!kvm) 229 232 r = -EINVAL;
+2 -2
virt/kvm/kvm_main.c
··· 1795 1795 1796 1796 if (map->page) 1797 1797 kunmap(map->page); 1798 + #ifdef CONFIG_HAS_IOMEM 1798 1799 else 1799 1800 memunmap(map->hva); 1801 + #endif 1800 1802 1801 1803 if (dirty) { 1802 1804 kvm_vcpu_mark_page_dirty(vcpu, map->gfn); ··· 3151 3149 case KVM_CAP_MULTI_ADDRESS_SPACE: 3152 3150 return KVM_ADDRESS_SPACE_NUM; 3153 3151 #endif 3154 - case KVM_CAP_MAX_VCPU_ID: 3155 - return KVM_MAX_VCPU_ID; 3156 3152 case KVM_CAP_NR_MEMSLOTS: 3157 3153 return KVM_USER_MEM_SLOTS; 3158 3154 default: