[PATCH] remove ppc functions from callbacks

[PATCH] remove ppc functions from callbacks

[Glauber Costa]

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.

Anyway, I'm providing this patch separatedly, so that if it breaks
for whenever reason, we can identify a bisection point easily

Signed-off-by: Glauber Costa <glommer@redhat.com>
CC: Hollis Blanchard <hollisb@us.ibm.com>
---
 libkvm-all.h |    4 ----
 qemu-kvm.c   |    4 ----
 qemu-kvm.h   |    5 -----
 3 files changed, 0 insertions(+), 13 deletions(-)

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 eefca61..61f5a19 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -2278,10 +2278,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 126b8f3..57e8a2f 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -134,11 +134,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)
 
-- 
1.6.2.2

Re: [PATCH] remove ppc functions from callbacks

[Hollis Blanchard]

On Tue, 2009-06-16 at 09:34 -0400, Glauber Costa wrote:
> 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.
> 
> Anyway, I'm providing this patch separatedly, so that if it breaks
> for whenever reason, we can identify a bisection point easily
> 
> Signed-off-by: Glauber Costa <glommer@redhat.com>
> CC: Hollis Blanchard <hollisb@us.ibm.com>

Yup, this path is handled via kvm_arch_handle_exit() now. Thanks.

Acked-by: Hollis Blanchard <hollisb@us.ibm.com>

-- 
Hollis Blanchard
IBM Linux Technology Center

Re: [PATCH] remove ppc functions from callbacks

[Avi Kivity]

On 06/16/2009 04:34 PM, Glauber Costa wrote:
> 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.
>
> Anyway, I'm providing this patch separatedly, so that if it breaks
> for whenever reason, we can identify a bisection point easily
>
>    

Applied, thanks.

-- 
error compiling committee.c: too many arguments to function