diff options
Diffstat (limited to 'arch/ia64/kvm/mmio.c')
| -rw-r--r-- | arch/ia64/kvm/mmio.c | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/arch/ia64/kvm/mmio.c b/arch/ia64/kvm/mmio.c index 21f63fffc379..7f1a858bc69f 100644 --- a/arch/ia64/kvm/mmio.c +++ b/arch/ia64/kvm/mmio.c @@ -66,25 +66,31 @@ void lsapic_write(struct kvm_vcpu *v, unsigned long addr, switch (addr) { case PIB_OFST_INTA: - panic_vm(v, "Undefined write on PIB INTA\n"); + /*panic_domain(NULL, "Undefined write on PIB INTA\n");*/ + panic_vm(v); break; case PIB_OFST_XTP: if (length == 1) { vlsapic_write_xtp(v, val); } else { - panic_vm(v, "Undefined write on PIB XTP\n"); + /*panic_domain(NULL, + "Undefined write on PIB XTP\n");*/ + panic_vm(v); } break; default: if (PIB_LOW_HALF(addr)) { - /*Lower half */ + /*lower half */ if (length != 8) - panic_vm(v, "Can't LHF write with size %ld!\n", - length); + /*panic_domain(NULL, + "Can't LHF write with size %ld!\n", + length);*/ + panic_vm(v); else vlsapic_write_ipi(v, addr, val); - } else { /*Upper half */ - panic_vm(v, "IPI-UHF write %lx\n", addr); + } else { /* upper half + printk("IPI-UHF write %lx\n",addr);*/ + panic_vm(v); } break; } @@ -102,18 +108,22 @@ unsigned long lsapic_read(struct kvm_vcpu *v, unsigned long addr, if (length == 1) /* 1 byte load */ ; /* There is no i8259, there is no INTA access*/ else - panic_vm(v, "Undefined read on PIB INTA\n"); + /*panic_domain(NULL,"Undefined read on PIB INTA\n"); */ + panic_vm(v); break; case PIB_OFST_XTP: if (length == 1) { result = VLSAPIC_XTP(v); + /* printk("read xtp %lx\n", result); */ } else { - panic_vm(v, "Undefined read on PIB XTP\n"); + /*panic_domain(NULL, + "Undefined read on PIB XTP\n");*/ + panic_vm(v); } break; default: - panic_vm(v, "Undefined addr access for lsapic!\n"); + panic_vm(v); break; } return result; @@ -152,7 +162,7 @@ static void mmio_access(struct kvm_vcpu *vcpu, u64 src_pa, u64 *dest, /* it's necessary to ensure zero extending */ *dest = p->u.ioreq.data & (~0UL >> (64-(s*8))); } else - panic_vm(vcpu, "Unhandled mmio access returned!\n"); + panic_vm(vcpu); out: local_irq_restore(psr); return ; @@ -314,9 +324,7 @@ void emulate_io_inst(struct kvm_vcpu *vcpu, u64 padr, u64 ma) return; } else { inst_type = -1; - panic_vm(vcpu, "Unsupported MMIO access instruction! \ - Bunld[0]=0x%lx, Bundle[1]=0x%lx\n", - bundle.i64[0], bundle.i64[1]); + panic_vm(vcpu); } size = 1 << size; @@ -327,7 +335,7 @@ void emulate_io_inst(struct kvm_vcpu *vcpu, u64 padr, u64 ma) if (inst_type == SL_INTEGER) vcpu_set_gr(vcpu, inst.M1.r1, data, 0); else - panic_vm(vcpu, "Unsupported instruction type!\n"); + panic_vm(vcpu); } vcpu_increment_iip(vcpu); |