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

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
...@@ -894,6 +894,11 @@ int access_guest_real(struct kvm_vcpu *vcpu, unsigned long gra, ...@@ -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 * 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. * Parameter semantics are the same as the ones from guest_translate.
* The memory contents at the guest address are not changed. * 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, ...@@ -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 * 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, int check_gva_range(struct kvm_vcpu *vcpu, unsigned long gva, u8 ar,
unsigned long length, enum gacc_mode mode) unsigned long length, enum gacc_mode mode)
...@@ -956,6 +966,7 @@ int check_gva_range(struct kvm_vcpu *vcpu, unsigned long gva, u8 ar, ...@@ -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 * kvm_s390_check_low_addr_prot_real - check for low-address protection
* @vcpu: virtual cpu
* @gra: Guest real address * @gra: Guest real address
* *
* Checks whether an address is subject to low-address protection and set * 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) ...@@ -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 * @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 * successful (return value 0), or to the first invalid DAT entry in
* case of exceptions (return value > 0) * case of exceptions (return value > 0)
* @dat_protection: referenced memory is write protected
* @fake: pgt references contiguous guest memory block, not a pgtable * @fake: pgt references contiguous guest memory block, not a pgtable
*/ */
static int kvm_s390_shadow_tables(struct gmap *sg, unsigned long saddr, static int kvm_s390_shadow_tables(struct gmap *sg, unsigned long saddr,
......
...@@ -269,6 +269,7 @@ static int handle_prog(struct kvm_vcpu *vcpu) ...@@ -269,6 +269,7 @@ static int handle_prog(struct kvm_vcpu *vcpu)
/** /**
* handle_external_interrupt - used for external interruption interceptions * 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 * 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, * 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) ...@@ -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 * This interception can only happen for guests with DAT disabled and
* addresses that are currently not mapped in the host. Thus we try to * addresses that are currently not mapped in the host. Thus we try to
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment