From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MTgcj-0006wG-K3 for qemu-devel@nongnu.org; Wed, 22 Jul 2009 14:33:05 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MTgce-0006o8-5m for qemu-devel@nongnu.org; Wed, 22 Jul 2009 14:33:04 -0400 Received: from [199.232.76.173] (port=58715 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MTgcd-0006nl-VG for qemu-devel@nongnu.org; Wed, 22 Jul 2009 14:33:00 -0400 Received: from mx2.redhat.com ([66.187.237.31]:60941) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MTgcd-00087C-FJ for qemu-devel@nongnu.org; Wed, 22 Jul 2009 14:32:59 -0400 Date: Wed, 22 Jul 2009 15:32:52 -0300 From: Luiz Capitulino Message-ID: <20090722153252.68e1f113@doriath> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] Fix broken build List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com Cc: glommer@redhat.com, qemu-devel@nongnu.org The only caller of on_vcpu() is protected by ifdef KVM_CAP_SET_GUEST_DEBUG, so protect on_vcpu() too otherwise QEMU may not to build. Signed-off-by: Luiz Capitulino --- kvm-all.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 824bb4c..70507b1 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -155,15 +155,6 @@ static void kvm_reset_vcpu(void *opaque) } } -static void on_vcpu(CPUState *env, void (*func)(void *data), void *data) -{ - if (env == cpu_single_env) { - func(data); - return; - } - abort(); -} - int kvm_irqchip_in_kernel(void) { return kvm_state->irqchip_in_kernel; @@ -906,6 +897,15 @@ void kvm_setup_guest_memory(void *start, size_t size) } #ifdef KVM_CAP_SET_GUEST_DEBUG +static void on_vcpu(CPUState *env, void (*func)(void *data), void *data) +{ + if (env == cpu_single_env) { + func(data); + return; + } + abort(); +} + struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUState *env, target_ulong pc) { -- 1.6.4.rc1.10.g2a67