From patchwork Tue Jun 16 13:34:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 30614 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n5GDZ4SV023238 for ; Tue, 16 Jun 2009 13:35:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754801AbZFPNe7 (ORCPT ); Tue, 16 Jun 2009 09:34:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754860AbZFPNe7 (ORCPT ); Tue, 16 Jun 2009 09:34:59 -0400 Received: from mx2.redhat.com ([66.187.237.31]:44369 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754349AbZFPNe6 (ORCPT ); Tue, 16 Jun 2009 09:34:58 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n5GDZ0Ul008980; Tue, 16 Jun 2009 09:35:00 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n5GDYxhm007541; Tue, 16 Jun 2009 09:34:59 -0400 Received: from localhost.localdomain (virtlab1.virt.bos.redhat.com [10.16.72.21]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n5GDYwYb005243; Tue, 16 Jun 2009 09:34:58 -0400 From: Glauber Costa To: kvm@vger.kernel.org Cc: avi@redhat.com, Hollis Blanchard Subject: [PATCH] remove ppc functions from callbacks Date: Tue, 16 Jun 2009 09:34:52 -0400 Message-Id: <1245159292-7579-1-git-send-email-glommer@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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 CC: Hollis Blanchard Acked-by: Hollis Blanchard --- 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)