aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kvm
diff options
context:
space:
mode:
authorThomas Huth <thuth@linux.vnet.ibm.com>2013-06-20 11:21:59 -0400
committerPaolo Bonzini <pbonzini@redhat.com>2013-06-20 17:31:04 -0400
commit208dd7567df471c7c47aa25b94569afc115de5f5 (patch)
tree70abff3e94f201a927bd8f5e64ef34dc99068ba7 /arch/s390/kvm
parent6c806a7332e6d36c1f95966b4a8a22f342b68948 (diff)
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>
Diffstat (limited to 'arch/s390/kvm')
-rw-r--r--arch/s390/kvm/priv.c16
-rw-r--r--arch/s390/kvm/sigp.c3
2 files changed, 8 insertions, 11 deletions
diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index a0c63d79431b..a21e0146fe2c 100644
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
@@ -259,8 +259,8 @@ int kvm_s390_handle_lpsw(struct kvm_vcpu *vcpu)
259 u64 addr; 259 u64 addr;
260 260
261 if (gpsw->mask & PSW_MASK_PSTATE) 261 if (gpsw->mask & PSW_MASK_PSTATE)
262 return kvm_s390_inject_program_int(vcpu, 262 return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP);
263 PGM_PRIVILEGED_OPERATION); 263
264 addr = kvm_s390_get_base_disp_s(vcpu); 264 addr = kvm_s390_get_base_disp_s(vcpu);
265 if (addr & 7) 265 if (addr & 7)
266 return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION); 266 return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);
@@ -446,7 +446,7 @@ int kvm_s390_handle_b2(struct kvm_vcpu *vcpu)
446 if (handler) { 446 if (handler) {
447 if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE) 447 if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE)
448 return kvm_s390_inject_program_int(vcpu, 448 return kvm_s390_inject_program_int(vcpu,
449 PGM_PRIVILEGED_OPERATION); 449 PGM_PRIVILEGED_OP);
450 else 450 else
451 return handler(vcpu); 451 return handler(vcpu);
452 } 452 }
@@ -493,7 +493,7 @@ static int handle_pfmf(struct kvm_vcpu *vcpu)
493 return kvm_s390_inject_program_int(vcpu, PGM_OPERATION); 493 return kvm_s390_inject_program_int(vcpu, PGM_OPERATION);
494 494
495 if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE) 495 if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE)
496 return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OPERATION); 496 return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP);
497 497
498 if (vcpu->run->s.regs.gprs[reg1] & PFMF_RESERVED) 498 if (vcpu->run->s.regs.gprs[reg1] & PFMF_RESERVED)
499 return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION); 499 return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);
@@ -564,7 +564,7 @@ int kvm_s390_handle_b9(struct kvm_vcpu *vcpu)
564 if ((handler != handle_epsw) && 564 if ((handler != handle_epsw) &&
565 (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE)) 565 (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE))
566 return kvm_s390_inject_program_int(vcpu, 566 return kvm_s390_inject_program_int(vcpu,
567 PGM_PRIVILEGED_OPERATION); 567 PGM_PRIVILEGED_OP);
568 else 568 else
569 return handler(vcpu); 569 return handler(vcpu);
570 } 570 }
@@ -581,8 +581,7 @@ int kvm_s390_handle_priv_eb(struct kvm_vcpu *vcpu)
581 581
582 /* All eb instructions that end up here are privileged. */ 582 /* All eb instructions that end up here are privileged. */
583 if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE) 583 if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE)
584 return kvm_s390_inject_program_int(vcpu, 584 return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP);
585 PGM_PRIVILEGED_OPERATION);
586 handler = eb_handlers[vcpu->arch.sie_block->ipb & 0xff]; 585 handler = eb_handlers[vcpu->arch.sie_block->ipb & 0xff];
587 if (handler) 586 if (handler)
588 return handler(vcpu); 587 return handler(vcpu);
@@ -642,8 +641,7 @@ static int handle_sckpf(struct kvm_vcpu *vcpu)
642 u32 value; 641 u32 value;
643 642
644 if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE) 643 if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE)
645 return kvm_s390_inject_program_int(vcpu, 644 return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP);
646 PGM_PRIVILEGED_OPERATION);
647 645
648 if (vcpu->run->s.regs.gprs[0] & 0x00000000ffff0000) 646 if (vcpu->run->s.regs.gprs[0] & 0x00000000ffff0000)
649 return kvm_s390_inject_program_int(vcpu, 647 return kvm_s390_inject_program_int(vcpu,
diff --git a/arch/s390/kvm/sigp.c b/arch/s390/kvm/sigp.c
index 033c864f1ae8..bec398c57acf 100644
--- a/arch/s390/kvm/sigp.c
+++ b/arch/s390/kvm/sigp.c
@@ -333,8 +333,7 @@ int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu)
333 333
334 /* sigp in userspace can exit */ 334 /* sigp in userspace can exit */
335 if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE) 335 if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE)
336 return kvm_s390_inject_program_int(vcpu, 336 return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP);
337 PGM_PRIVILEGED_OPERATION);
338 337
339 order_code = kvm_s390_get_base_disp_rs(vcpu); 338 order_code = kvm_s390_get_base_disp_rs(vcpu);
340 339