diff options
author | David Hildenbrand <dahi@linux.vnet.ibm.com> | 2015-04-24 09:30:24 -0400 |
---|---|---|
committer | Christian Borntraeger <borntraeger@de.ibm.com> | 2015-05-08 09:51:17 -0400 |
commit | 06b36753a6466239fc945b6756e12d635621ae5f (patch) | |
tree | 4987bdf121d41c1d986c9f93adede9669544f626 /arch/s390/kvm | |
parent | 96e0ed23dca3769053c5211ef885e789097834bf (diff) |
KVM: s390: drop handling of interception code 12
Our implementation will never trigger interception code 12 as the
responsible setting is never enabled - and never will be.
The handler is dead code. Let's get rid of it.
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'arch/s390/kvm')
-rw-r--r-- | arch/s390/kvm/intercept.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c index 9e3779e3e496..7365e8a46032 100644 --- a/arch/s390/kvm/intercept.c +++ b/arch/s390/kvm/intercept.c | |||
@@ -241,21 +241,6 @@ static int handle_prog(struct kvm_vcpu *vcpu) | |||
241 | return kvm_s390_inject_prog_irq(vcpu, &pgm_info); | 241 | return kvm_s390_inject_prog_irq(vcpu, &pgm_info); |
242 | } | 242 | } |
243 | 243 | ||
244 | static int handle_instruction_and_prog(struct kvm_vcpu *vcpu) | ||
245 | { | ||
246 | int rc, rc2; | ||
247 | |||
248 | vcpu->stat.exit_instr_and_program++; | ||
249 | rc = handle_instruction(vcpu); | ||
250 | rc2 = handle_prog(vcpu); | ||
251 | |||
252 | if (rc == -EOPNOTSUPP) | ||
253 | vcpu->arch.sie_block->icptcode = 0x04; | ||
254 | if (rc) | ||
255 | return rc; | ||
256 | return rc2; | ||
257 | } | ||
258 | |||
259 | /** | 244 | /** |
260 | * handle_external_interrupt - used for external interruption interceptions | 245 | * handle_external_interrupt - used for external interruption interceptions |
261 | * | 246 | * |
@@ -355,7 +340,6 @@ static const intercept_handler_t intercept_funcs[] = { | |||
355 | [0x00 >> 2] = handle_noop, | 340 | [0x00 >> 2] = handle_noop, |
356 | [0x04 >> 2] = handle_instruction, | 341 | [0x04 >> 2] = handle_instruction, |
357 | [0x08 >> 2] = handle_prog, | 342 | [0x08 >> 2] = handle_prog, |
358 | [0x0C >> 2] = handle_instruction_and_prog, | ||
359 | [0x10 >> 2] = handle_noop, | 343 | [0x10 >> 2] = handle_noop, |
360 | [0x14 >> 2] = handle_external_interrupt, | 344 | [0x14 >> 2] = handle_external_interrupt, |
361 | [0x18 >> 2] = handle_noop, | 345 | [0x18 >> 2] = handle_noop, |