From patchwork Wed Nov 11 23:49:46 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 59459 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nABNnlD8029750 for ; Wed, 11 Nov 2009 23:49:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759310AbZKKXtj (ORCPT ); Wed, 11 Nov 2009 18:49:39 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757535AbZKKXtj (ORCPT ); Wed, 11 Nov 2009 18:49:39 -0500 Received: from fmmailgate03.web.de ([217.72.192.234]:40571 "EHLO fmmailgate03.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757531AbZKKXtj (ORCPT ); Wed, 11 Nov 2009 18:49:39 -0500 Received: from smtp08.web.de (fmsmtp08.dlan.cinetic.de [172.20.5.216]) by fmmailgate03.web.de (Postfix) with ESMTP id A21D61321DA03; Thu, 12 Nov 2009 00:49:44 +0100 (CET) Received: from [88.64.15.183] (helo=[192.168.1.10]) by smtp08.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #314) id 1N8Mwa-0007Rj-00; Thu, 12 Nov 2009 00:49:44 +0100 Message-ID: <4AFB4D9A.3080705@web.de> Date: Thu, 12 Nov 2009 00:49:46 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Marcelo Tosatti , Avi Kivity CC: kvm Subject: [PATCH] qemu-kvm: Reenable iothread mutex wrappers on !CONFIG_KVM X-Enigmail-Version: 0.95.7 X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1/9Od9NQOaHaqT4hVhUfpfm/fYCSxL5IEI4R4W8 JO3gQpWwDtxIMokPSNd8RyIm7bsKJ0A0i4wq8wNa8ftPfbVBR8 ie4lwBHQU= Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/vl.c b/vl.c index 594ca34..6556075 100644 --- a/vl.c +++ b/vl.c @@ -3443,7 +3443,7 @@ void qemu_notify_event(void) } } -#ifdef KVM_UPSTREAM +#if defined(KVM_UPSTREAM) || !defined(CONFIG_KVM) void qemu_mutex_lock_iothread(void) {} void qemu_mutex_unlock_iothread(void) {} #endif