From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MVRiV-0007ym-AQ for qemu-devel@nongnu.org; Mon, 27 Jul 2009 11:02:19 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MVRiQ-0007wU-N8 for qemu-devel@nongnu.org; Mon, 27 Jul 2009 11:02:18 -0400 Received: from [199.232.76.173] (port=48283 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MVRiQ-0007wR-I8 for qemu-devel@nongnu.org; Mon, 27 Jul 2009 11:02:14 -0400 Received: from mx2.redhat.com ([66.187.237.31]:40747) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MVRiP-00022d-Qa for qemu-devel@nongnu.org; Mon, 27 Jul 2009 11:02:14 -0400 In-Reply-To: (Juan Quintela's message of "Mon\, 27 Jul 2009 16\:13\:26 +0200") References: From: Juan Quintela Date: Mon, 27 Jul 2009 17:00:19 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: [Qemu-devel] Re: [PATCH 47/47] move on_vcpu inside proper #ifdef List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com Juan Quintela wrote: > Signed-off-by: Juan Quintela > --- > kvm-all.c | 18 +++++++++--------- > 1 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/kvm-all.c b/kvm-all.c > index 824bb4c..ce14b92 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; > @@ -935,6 +926,15 @@ static void kvm_invoke_set_guest_debug(void *data) > dbg_data->err = kvm_vcpu_ioctl(dbg_data->env, KVM_SET_GUEST_DEBUG, &dbg_data->dbg); > } > > +static void on_vcpu(CPUState *env, void (*func)(void *data), void *data) > +{ > + if (env == cpu_single_env) { > + func(data); > + return; > + } > + abort(); > +} > + > int kvm_update_guest_debug(CPUState *env, unsigned long reinject_trap) > { > struct kvm_set_guest_debug_data data; Ooops, this patch don't belong to this series, was there just to get compilation to finish. Anthony, please ignore it. Later, Juan.