[Take this as a band-aid, I guess the PowerPC people can do better.] Until PowerPC is updated to the new guest debugging interface, we have to remove the current implementation. This should also unbreak the build.
Signed-off-by: Jan Kiszka <[email protected]> --- arch/powerpc/kvm/44x.c | 20 -------------------- arch/powerpc/kvm/powerpc.c | 20 +------------------- 2 files changed, 1 insertions(+), 39 deletions(-) diff --git a/arch/powerpc/kvm/44x.c b/arch/powerpc/kvm/44x.c index a66bec5..20b9be0 100644 --- a/arch/powerpc/kvm/44x.c +++ b/arch/powerpc/kvm/44x.c @@ -55,7 +55,6 @@ void kvmppc_core_load_host_debugstate(struct kvm_vcpu *vcpu) void kvmppc_core_load_guest_debugstate(struct kvm_vcpu *vcpu) { - struct kvm_guest_debug *dbg = &vcpu->guest_debug; u32 dbcr0 = 0; vcpu->arch.host_msr = mfmsr(); @@ -70,25 +69,6 @@ void kvmppc_core_load_guest_debugstate(struct kvm_vcpu *vcpu) vcpu->arch.host_dbcr1 = mfspr(SPRN_DBCR1); vcpu->arch.host_dbcr2 = mfspr(SPRN_DBCR2); - /* set registers up for guest */ - - if (dbg->bp[0]) { - mtspr(SPRN_IAC1, dbg->bp[0]); - dbcr0 |= DBCR0_IAC1 | DBCR0_IDM; - } - if (dbg->bp[1]) { - mtspr(SPRN_IAC2, dbg->bp[1]); - dbcr0 |= DBCR0_IAC2 | DBCR0_IDM; - } - if (dbg->bp[2]) { - mtspr(SPRN_IAC3, dbg->bp[2]); - dbcr0 |= DBCR0_IAC3 | DBCR0_IDM; - } - if (dbg->bp[3]) { - mtspr(SPRN_IAC4, dbg->bp[3]); - dbcr0 |= DBCR0_IAC4 | DBCR0_IDM; - } - mtspr(SPRN_DBCR0, dbcr0); mtspr(SPRN_DBCR1, 0); mtspr(SPRN_DBCR2, 0); diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 74b576a..ed6669c 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -216,36 +216,18 @@ void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) { - if (vcpu->guest_debug.enabled) - kvmppc_core_load_guest_debugstate(vcpu); - kvmppc_core_vcpu_load(vcpu, cpu); } void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) { - if (vcpu->guest_debug.enabled) - kvmppc_core_load_host_debugstate(vcpu); - kvmppc_core_vcpu_put(vcpu); } int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, struct kvm_guest_debug *dbg) { - int i; - - vcpu->guest_debug.enabled = dbg->enabled; - if (vcpu->guest_debug.enabled) { - for (i=0; i < ARRAY_SIZE(vcpu->guest_debug.bp); i++) { - if (dbg->breakpoints[i].enabled) - vcpu->guest_debug.bp[i] = dbg->breakpoints[i].address; - else - vcpu->guest_debug.bp[i] = 0; - } - } - - return 0; + return -EINVAL; } static void kvmppc_complete_dcr_load(struct kvm_vcpu *vcpu, -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
