From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mm7Jm-0001e4-3t for qemu-devel@nongnu.org; Fri, 11 Sep 2009 10:41:42 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mm7Jg-0001bf-Od for qemu-devel@nongnu.org; Fri, 11 Sep 2009 10:41:41 -0400 Received: from [199.232.76.173] (port=43008 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mm7Jg-0001ba-Hv for qemu-devel@nongnu.org; Fri, 11 Sep 2009 10:41:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33217) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mm7Jg-0006w3-3I for qemu-devel@nongnu.org; Fri, 11 Sep 2009 10:41:36 -0400 From: Glauber Costa Date: Fri, 11 Sep 2009 11:41:32 -0300 Message-Id: <1252680092-5208-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH] temporary fix for on_vcpu 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 Recent changes made on_vcpu hit the abort() path, even with the IO thread disabled. This is because cpu_single_env is no longer set when we call this function. Although the correct fix is a little bit more complicated that that, the recent thread in which I proposed qemu_queue_work (which fixes that, btw), is likely to go on a quite different direction. So for the benefit of those using guest debugging, I'm proposing this simple fix in the interim. Signed-off-by: Glauber Costa --- kvm-all.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index df4e849..2c24440 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -902,11 +902,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) { +#ifdef CONFIG_IOTHREAD if (env == cpu_single_env) { func(data); return; } abort(); +#else + func(data); +#endif } struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUState *env, -- 1.6.2.5