From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=38648 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pu0ff-00011R-IO for qemu-devel@nongnu.org; Mon, 28 Feb 2011 05:49:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pu0fd-0008Hh-C1 for qemu-devel@nongnu.org; Mon, 28 Feb 2011 05:49:43 -0500 Received: from ozlabs.org ([203.10.76.45]:54693) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pu0fc-0008G3-Qg for qemu-devel@nongnu.org; Mon, 28 Feb 2011 05:49:41 -0500 Date: Mon, 28 Feb 2011 21:49:01 +1100 From: David Gibson Message-ID: <20110228104901.GE10873@yookeroo> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] Fix build breakage to kvm on ppc List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: agraf@suse.de, qemu-devel@nongnu.org Recent changes to the generic kvm support code broke compile of kvm for ppc. The patch below fixes the errors by adjusting types in the ppc code, and adding a missing #ifdef. Please apply. Signed-off-by: David Gibson --- kvm-all.c | 2 ++ target-ppc/kvm.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index e6a7de4..fb44e2e 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -998,7 +998,9 @@ int kvm_cpu_exec(CPUState *env) } ret = EXCP_INTERRUPT; +#ifdef KVM_CAP_SET_GUEST_DEBUG out: +#endif /* KVM_CAP_SET_GUEST_DEBUG */ env->exit_request = 0; cpu_single_env = NULL; return ret; diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 04b94a3..4fa1be3 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -223,7 +223,7 @@ int kvmppc_set_interrupt(CPUState *env, int irq, int level) #define PPC_INPUT_INT PPC6xx_INPUT_INT #endif -int kvm_arch_pre_run(CPUState *env, struct kvm_run *run) +void kvm_arch_pre_run(CPUState *env, struct kvm_run *run) { int r; unsigned irq; @@ -254,15 +254,15 @@ int kvm_arch_pre_run(CPUState *env, struct kvm_run *run) /* We don't know if there are more interrupts pending after this. However, * the guest will return to userspace in the course of handling this one * anyways, so we will get a chance to deliver the rest. */ - return 0; } void kvm_arch_post_run(CPUState *env, struct kvm_run *run) { } -void kvm_arch_process_irqchip_events(CPUState *env) +int kvm_arch_process_irqchip_events(CPUState *env) { + return 0; } static int kvmppc_handle_halt(CPUState *env) -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson