From patchwork Fri May 27 12:19:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 823762 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4RCKAG0003963 for ; Fri, 27 May 2011 12:20:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754217Ab1E0MUF (ORCPT ); Fri, 27 May 2011 08:20:05 -0400 Received: from thoth.sbs.de ([192.35.17.2]:17282 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753265Ab1E0MT3 (ORCPT ); Fri, 27 May 2011 08:19:29 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id p4RCJPxF012054; Fri, 27 May 2011 14:19:25 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p4RCJOKd005557; Fri, 27 May 2011 14:19:25 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH 03/20] qemu-kvm: Switch to iothread version of qemu_notify_event Date: Fri, 27 May 2011 14:19:07 +0200 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 27 May 2011 12:20:11 +0000 (UTC) The differences do not matter for qemu-kvm's iothread code. Signed-off-by: Jan Kiszka --- cpus.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpus.c b/cpus.c index 48bac70..8b9b1f6 100644 --- a/cpus.c +++ b/cpus.c @@ -604,7 +604,6 @@ void qemu_cpu_kick_self(void) #endif } -#endif /* !IOTHREAD */ void qemu_notify_event(void) { CPUState *env = cpu_single_env; @@ -618,7 +617,6 @@ void qemu_notify_event(void) } exit_request = 1; } -#ifndef CONFIG_IOTHREAD void qemu_mutex_lock_iothread(void) {} void qemu_mutex_unlock_iothread(void) {} @@ -1024,12 +1022,14 @@ void qemu_init_vcpu(void *_env) qemu_tcg_init_vcpu(env); } } +#endif /* UNUSED_IOTHREAD_IMPL */ void qemu_notify_event(void) { qemu_event_increment(); } +#ifdef UNUSED_IOTHREAD_IMPL void cpu_stop_current(void) { if (cpu_single_env) {