Commit 2353e593 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-master-5.15-1' of... 

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

KVM: s390: allow to compile without warning with W=1
parents 7b0035ea 25b5476a

arch/s390/kvm/gaccess.c

+12 −0
Original line number Diff line number Diff line
@@ -894,6 +894,11 @@ int access_guest_real(struct kvm_vcpu *vcpu, unsigned long gra, 


/**

 * guest_translate_address - translate guest logical into guest absolute address

 * @vcpu: virtual cpu

 * @gva: Guest virtual address

 * @ar: Access register

 * @gpa: Guest physical address

 * @mode: Translation access mode

 *

 * Parameter semantics are the same as the ones from guest_translate.

 * The memory contents at the guest address are not changed.
@@ -934,6 +939,11 @@ int guest_translate_address(struct kvm_vcpu *vcpu, unsigned long gva, u8 ar, 


/**

 * check_gva_range - test a range of guest virtual addresses for accessibility

 * @vcpu: virtual cpu

 * @gva: Guest virtual address

 * @ar: Access register

 * @length: Length of test range

 * @mode: Translation access mode

 */

int check_gva_range(struct kvm_vcpu *vcpu, unsigned long gva, u8 ar,

		    unsigned long length, enum gacc_mode mode)
@@ -956,6 +966,7 @@ int check_gva_range(struct kvm_vcpu *vcpu, unsigned long gva, u8 ar, 


/**

 * kvm_s390_check_low_addr_prot_real - check for low-address protection

 * @vcpu: virtual cpu

 * @gra: Guest real address

 *

 * Checks whether an address is subject to low-address protection and set
@@ -979,6 +990,7 @@ int kvm_s390_check_low_addr_prot_real(struct kvm_vcpu *vcpu, unsigned long gra) 
 * @pgt: pointer to the beginning of the page table for the given address if

 *	 successful (return value 0), or to the first invalid DAT entry in

 *	 case of exceptions (return value > 0)

 * @dat_protection: referenced memory is write protected

 * @fake: pgt references contiguous guest memory block, not a pgtable

 */

static int kvm_s390_shadow_tables(struct gmap *sg, unsigned long saddr,

arch/s390/kvm/intercept.c

+3 −1
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ static int handle_prog(struct kvm_vcpu *vcpu) 


/**

 * handle_external_interrupt - used for external interruption interceptions

 * @vcpu: virtual cpu

 *

 * This interception only occurs if the CPUSTAT_EXT_INT bit was set, or if

 * the new PSW does not have external interrupts disabled. In the first case,
@@ -315,7 +316,8 @@ static int handle_external_interrupt(struct kvm_vcpu *vcpu) 
}



/**

 * Handle MOVE PAGE partial execution interception.

 * handle_mvpg_pei - Handle MOVE PAGE partial execution interception.

 * @vcpu: virtual cpu

 *

 * This interception can only happen for guests with DAT disabled and

 * addresses that are currently not mapped in the host. Thus we try to