hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

KVM: s390: Renamed PGM_PRIVILEGED_OPERATION 

Renamed the PGM_PRIVILEGED_OPERATION define to PGM_PRIVILEGED_OP since this
define was way longer than the other PGM_* defines and caused the code often
to exceed the 80 columns limit when not split to multiple lines.

Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Thomas Huth 2013-06-20 17:21:59 +02:00 committed by Paolo Bonzini
parent 6c806a7332
commit 208dd7567d
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/s390/include/asm/kvm_host.h
View File

@ -175,7 +175,7 @@ struct kvm_s390_ext_info {
}; };
#define PGM_OPERATION 0x01 #define PGM_OPERATION 0x01
#define PGM_PRIVILEGED_OPERATION 0x02 #define PGM_PRIVILEGED_OP 0x02
#define PGM_EXECUTE 0x03 #define PGM_EXECUTE 0x03
#define PGM_PROTECTION 0x04 #define PGM_PROTECTION 0x04
#define PGM_ADDRESSING 0x05 #define PGM_ADDRESSING 0x05

16
arch/s390/kvm/priv.c
View File

@ -259,8 +259,8 @@ int kvm_s390_handle_lpsw(struct kvm_vcpu *vcpu)
u64 addr; u64 addr;
if (gpsw->mask & PSW_MASK_PSTATE) if (gpsw->mask & PSW_MASK_PSTATE)
return kvm_s390_inject_program_int(vcpu, return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP);
PGM_PRIVILEGED_OPERATION);
addr = kvm_s390_get_base_disp_s(vcpu); addr = kvm_s390_get_base_disp_s(vcpu);
if (addr & 7) if (addr & 7)
return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION); return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);
@ -446,7 +446,7 @@ int kvm_s390_handle_b2(struct kvm_vcpu *vcpu)
if (handler) { if (handler) {
if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE) if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE)
return kvm_s390_inject_program_int(vcpu, return kvm_s390_inject_program_int(vcpu,
PGM_PRIVILEGED_OPERATION); PGM_PRIVILEGED_OP);
else else
return handler(vcpu); return handler(vcpu);
} }
@ -493,7 +493,7 @@ static int handle_pfmf(struct kvm_vcpu *vcpu)
return kvm_s390_inject_program_int(vcpu, PGM_OPERATION); return kvm_s390_inject_program_int(vcpu, PGM_OPERATION);
if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE) if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE)
return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OPERATION); return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP);
if (vcpu->run->s.regs.gprs[reg1] & PFMF_RESERVED) if (vcpu->run->s.regs.gprs[reg1] & PFMF_RESERVED)
return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION); return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);
@ -564,7 +564,7 @@ int kvm_s390_handle_b9(struct kvm_vcpu *vcpu)
if ((handler != handle_epsw) && if ((handler != handle_epsw) &&
(vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE)) (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE))
return kvm_s390_inject_program_int(vcpu, return kvm_s390_inject_program_int(vcpu,
PGM_PRIVILEGED_OPERATION); PGM_PRIVILEGED_OP);
else else
return handler(vcpu); return handler(vcpu);
} }
@ -581,8 +581,7 @@ int kvm_s390_handle_priv_eb(struct kvm_vcpu *vcpu)
/* All eb instructions that end up here are privileged. */ /* All eb instructions that end up here are privileged. */
if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE) if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE)
return kvm_s390_inject_program_int(vcpu, return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP);
PGM_PRIVILEGED_OPERATION);
handler = eb_handlers[vcpu->arch.sie_block->ipb & 0xff]; handler = eb_handlers[vcpu->arch.sie_block->ipb & 0xff];
if (handler) if (handler)
return handler(vcpu); return handler(vcpu);
@ -642,8 +641,7 @@ static int handle_sckpf(struct kvm_vcpu *vcpu)
u32 value; u32 value;
if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE) if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE)
return kvm_s390_inject_program_int(vcpu, return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP);
PGM_PRIVILEGED_OPERATION);
if (vcpu->run->s.regs.gprs[0] & 0x00000000ffff0000) if (vcpu->run->s.regs.gprs[0] & 0x00000000ffff0000)
return kvm_s390_inject_program_int(vcpu, return kvm_s390_inject_program_int(vcpu,

3
arch/s390/kvm/sigp.c
View File

@ -333,8 +333,7 @@ int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu)
/* sigp in userspace can exit */ /* sigp in userspace can exit */
if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE) if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE)
return kvm_s390_inject_program_int(vcpu, return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP);
PGM_PRIVILEGED_OPERATION);
order_code = kvm_s390_get_base_disp_rs(vcpu); order_code = kvm_s390_get_base_disp_rs(vcpu);