From: Glauber Costa <[email protected]> handle_powerpc_dcr_read() and handle_powerpc_dcr_write() are two powerpc specific functions that are called via libkvm callbacks. However, grepping the source code finds simply no use of them. This is probably due to the fact that powerpc now relies on a totally qemu upstream implementation of kvm, and does not need it anymore.
Signed-off-by: Glauber Costa <[email protected]> Acked-by: Hollis Blanchard <[email protected]> Signed-off-by: Avi Kivity <[email protected]> diff --git a/libkvm-all.h b/libkvm-all.h index 4f7b9a3..47855be 100644 --- a/libkvm-all.h +++ b/libkvm-all.h @@ -156,10 +156,6 @@ struct kvm_callbacks { void (*post_kvm_run)(void *opaque, void *env); int (*pre_kvm_run)(void *opaque, void *env); int (*tpr_access)(void *opaque, kvm_vcpu_context_t vcpu, uint64_t rip, int is_write); -#if defined(__powerpc__) - int (*powerpc_dcr_read)(kvm_vcpu_context_t vcpu, uint32_t dcrn, uint32_t *data); - int (*powerpc_dcr_write)(kvm_vcpu_context_t vcpu, uint32_t dcrn, uint32_t data); -#endif #if defined(__s390__) int (*s390_handle_intercept)(kvm_context_t context, kvm_vcpu_context_t vcpu, struct kvm_run *run); diff --git a/qemu-kvm.c b/qemu-kvm.c index 4129fe2..a2131b7 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -2301,10 +2301,6 @@ static struct kvm_callbacks qemu_kvm_ops = { #ifdef TARGET_I386 .tpr_access = handle_tpr_access, #endif -#ifdef TARGET_PPC - .powerpc_dcr_read = handle_powerpc_dcr_read, - .powerpc_dcr_write = handle_powerpc_dcr_write, -#endif .unhandled = handle_unhandled, }; diff --git a/qemu-kvm.h b/qemu-kvm.h index b6db1bd..68a5b40 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -136,11 +136,6 @@ void kvm_remove_ioperm_data(unsigned long start_port, unsigned long num); void kvm_arch_do_ioperm(void *_data); #endif -#ifdef TARGET_PPC -int handle_powerpc_dcr_read(kvm_vcpu_context_t vcpu, uint32_t dcrn, uint32_t *data); -int handle_powerpc_dcr_write(kvm_vcpu_context_t vcpu,uint32_t dcrn, uint32_t data); -#endif - #define ALIGN(x, y) (((x)+(y)-1) & ~((y)-1)) #define BITMAP_SIZE(m) (ALIGN(((m)>>TARGET_PAGE_BITS), HOST_LONG_BITS) / 8) -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
