From patchwork Wed Aug 8 06:25:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pingfan liu X-Patchwork-Id: 175862 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 11DCE2C0096 for ; Wed, 8 Aug 2012 16:44:58 +1000 (EST) Received: from localhost ([::1]:45104 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sz00m-0006rG-4I for incoming@patchwork.ozlabs.org; Wed, 08 Aug 2012 02:44:56 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SyzjW-0001ej-2N for qemu-devel@nongnu.org; Wed, 08 Aug 2012 02:27:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SyzjV-0002Rn-0X for qemu-devel@nongnu.org; Wed, 08 Aug 2012 02:27:06 -0400 Received: from mail-ob0-f173.google.com ([209.85.214.173]:62109) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SyzjU-0001sm-S7 for qemu-devel@nongnu.org; Wed, 08 Aug 2012 02:27:04 -0400 Received: by mail-ob0-f173.google.com with SMTP id ta14so635077obb.4 for ; Tue, 07 Aug 2012 23:27:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=GPAB3LbLvH3zIyaMtK1Fcm+SzUrTWJlya86IPnqJULY=; b=oh8UmeBcXwdMG8ARNOTetfa1Yr+iGEThqJt4z5LdlW5Arh9SYYNhdrTMuY8o/lbdQe uVWDVK5KorsorZarGzDNbN7N0H7enlZYSI+SrXMuAwYyPrAUx41upVe2nSF8DCdWKqDm h6fAzM2HOcJq4ZACQx0l2b+CLYl0xMdVIX0ScEAVQ6E6uKmy+2HuAKWUIUCU4pVhHdNG l1doaYqST/eP0OOt3llVouMumzd6CM4GyEL2kBSEac+nLa3AivcC/fSgJMzNx2i4Wz+s myCFsUIvNOIyuRcXHt+jA8hCKbLWQOQw7oaly6HKvWsgf9MHcaM0cDR7elgxQvO6Lkgo oArw== Received: by 10.182.164.40 with SMTP id yn8mr28429625obb.40.1344407224644; Tue, 07 Aug 2012 23:27:04 -0700 (PDT) Received: from localhost ([202.108.130.138]) by mx.google.com with ESMTPS id jl8sm21886320obb.18.2012.08.07.23.27.02 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 07 Aug 2012 23:27:04 -0700 (PDT) From: Liu Ping Fan To: qemu-devel@nongnu.org Date: Wed, 8 Aug 2012 14:25:52 +0800 Message-Id: <1344407156-25562-12-git-send-email-qemulist@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1344407156-25562-1-git-send-email-qemulist@gmail.com> References: <1344407156-25562-1-git-send-email-qemulist@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.173 Cc: kvm@vger.kernel.org, Stefan Hajnoczi , Marcelo Tosatti , qemulist@gmail.com, Blue Swirl , Avi Kivity , Anthony Liguori , Jan Kiszka , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH 11/15] lock: introduce global lock for device tree X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Liu Ping Fan Signed-off-by: Liu Ping Fan --- cpus.c | 12 ++++++++++++ main-loop.h | 3 +++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/cpus.c b/cpus.c index b182b3d..a734b36 100644 --- a/cpus.c +++ b/cpus.c @@ -611,6 +611,7 @@ static void qemu_tcg_init_cpu_signals(void) } #endif /* _WIN32 */ +QemuMutex qemu_device_tree_mutex; QemuMutex qemu_global_mutex; static QemuCond qemu_io_proceeded_cond; static bool iothread_requesting_mutex; @@ -634,6 +635,7 @@ void qemu_init_cpu_loop(void) qemu_cond_init(&qemu_work_cond); qemu_cond_init(&qemu_io_proceeded_cond); qemu_mutex_init(&qemu_global_mutex); + qemu_mutex_init(&qemu_device_tree_mutex); qemu_thread_get_self(&io_thread); } @@ -911,6 +913,16 @@ void qemu_mutex_unlock_iothread(void) qemu_mutex_unlock(&qemu_global_mutex); } +void qemu_lock_devtree(void) +{ + qemu_mutex_lock(&qemu_device_tree_mutex); +} + +void qemu_unlock_devtree(void) +{ + qemu_mutex_unlock(&qemu_device_tree_mutex); +} + static int all_vcpus_paused(void) { CPUArchState *penv = first_cpu; diff --git a/main-loop.h b/main-loop.h index dce1cd9..17e959a 100644 --- a/main-loop.h +++ b/main-loop.h @@ -353,6 +353,9 @@ void qemu_mutex_lock_iothread(void); */ void qemu_mutex_unlock_iothread(void); +void qemu_lock_devtree(void); +void qemu_unlock_devtree(void); + /* internal interfaces */ void qemu_fd_register(int fd);