From patchwork Thu Aug 12 15:29:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 119278 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7CFTqwS011029 for ; Thu, 12 Aug 2010 15:29:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933711Ab0HLP3t (ORCPT ); Thu, 12 Aug 2010 11:29:49 -0400 Received: from mail-qy0-f181.google.com ([209.85.216.181]:56838 "EHLO mail-qy0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760206Ab0HLP3p (ORCPT ); Thu, 12 Aug 2010 11:29:45 -0400 Received: by qyk5 with SMTP id 5so1765810qyk.19 for ; Thu, 12 Aug 2010 08:29:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:cc:subject :date:message-id:x-mailer:in-reply-to:references; bh=cb66TUqlxhzlvLyrKoZUO2SKnDAPNjHdZufkY49vKtw=; b=BrfTM0u9yeGNksBU/k/Ltz2XgVOqv6t1+CPUlTjYyJA9p30lYSkuMjJj0UUwULP0U3 oVf/MzxS7wtcLvxVaN5fOOk3Q6oJb1gxNVUWTo1NxcpiCCy3Y1kLdvFbuKs6KOpIrdUP g8CeNw4KI/qGCx18ATQjovGZ1f20K08y/GR6g= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=tFHJ4nfDlbnFrlRRadOC48FcznWqbEZgWqI+49XNyJt6YbA29gexHmAhCD/bnESZfm 76EZz8fG6+PDil+4GjfyvuEa0/zOPJQRVVsrW8kJzCmgxHzJgBCxeEg9uSP/LMHSlfj5 6qpfBD61KNHwwuOQ+519pUY0ZmHwySiiYklHQ= Received: by 10.224.19.129 with SMTP id a1mr122282qab.12.1281626985059; Thu, 12 Aug 2010 08:29:45 -0700 (PDT) Received: from localhost.localdomain ([12.198.177.3]) by mx.google.com with ESMTPS id f15sm1988571qcr.37.2010.08.12.08.29.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 12 Aug 2010 08:29:44 -0700 (PDT) From: Paolo Bonzini To: kvm@vger.kernel.org Cc: qemu-devel@nongnu.org Subject: [qemu-kvm PATCH 3/3] make kvm_mutex_*lock static Date: Thu, 12 Aug 2010 11:29:28 -0400 Message-Id: <1281626968-5607-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1281626968-5607-1-git-send-email-pbonzini@redhat.com> References: <1281626968-5607-1-git-send-email-pbonzini@redhat.com> 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.3 (demeter.kernel.org [140.211.167.41]); Thu, 12 Aug 2010 15:29:53 +0000 (UTC) diff --git a/qemu-kvm.c b/qemu-kvm.c index 96d458c..f46c394 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -1798,13 +1798,13 @@ int kvm_set_irq(int irq, int level, int *status) #endif -void kvm_mutex_unlock(void) +static void kvm_mutex_unlock(void) { assert(!cpu_single_env); pthread_mutex_unlock(&qemu_mutex); } -void kvm_mutex_lock(void) +static void kvm_mutex_lock(void) { pthread_mutex_lock(&qemu_mutex); cpu_single_env = NULL; diff --git a/qemu-kvm.h b/qemu-kvm.h index c08e9b8..6b26daa 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -893,9 +893,6 @@ int handle_tpr_access(void *opaque, CPUState *env, uint64_t rip, #define qemu_kvm_cpu_stop(env) do {} while(0) #endif -void kvm_mutex_unlock(void); -void kvm_mutex_lock(void); - #ifdef CONFIG_KVM typedef struct KVMSlot {