From patchwork Tue Oct 25 12:25:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 121661 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 49FA81007D9 for ; Tue, 25 Oct 2011 23:58:06 +1100 (EST) Received: from localhost ([::1]:52608 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIgZq-0003MW-FT for incoming@patchwork.ozlabs.org; Tue, 25 Oct 2011 08:57:58 -0400 Received: from eggs.gnu.org ([140.186.70.92]:38310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIgZV-0000wQ-LU for qemu-devel@nongnu.org; Tue, 25 Oct 2011 08:57:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RIgNj-0004Mp-Fm for qemu-devel@nongnu.org; Tue, 25 Oct 2011 08:45:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9368) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIgNj-0004MP-5I for qemu-devel@nongnu.org; Tue, 25 Oct 2011 08:45:27 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9PCjQX2016411 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 25 Oct 2011 08:45:26 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-39.ams2.redhat.com [10.36.116.39]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p9PCjNpD026472; Tue, 25 Oct 2011 08:45:24 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 4D170402FC; Tue, 25 Oct 2011 14:25:51 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 25 Oct 2011 14:25:43 +0200 Message-Id: <1319545550-24203-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1319545550-24203-1-git-send-email-kraxel@redhat.com> References: <1319545550-24203-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Cc: Jan Kiszka , Gerd Hoffmann Subject: [Qemu-devel] [PATCH 04/11] spice: Convert core to QEMU thread API 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: Jan Kiszka No need to use pthread directly, we have proper abstractions for identity checking. Signed-off-by: Jan Kiszka Signed-off-by: Gerd Hoffmann --- ui/spice-core.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/spice-core.c b/ui/spice-core.c index 8a86e45..4c06c36 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -19,10 +19,10 @@ #include #include -#include #include "qemu-common.h" #include "qemu-spice.h" +#include "qemu-thread.h" #include "qemu-timer.h" #include "qemu-queue.h" #include "qemu-x509.h" @@ -45,7 +45,7 @@ static char *auth_passwd; static time_t auth_expires = TIME_MAX; int using_spice = 0; -static pthread_t me; +static QemuThread me; struct SpiceTimer { QEMUTimer *timer; @@ -229,7 +229,7 @@ static void channel_event(int event, SpiceChannelEventInfo *info) * thread and grab the iothread lock if so before calling qemu * functions. */ - bool need_lock = !pthread_equal(me, pthread_self()); + bool need_lock = !qemu_thread_is_self(&me); if (need_lock) { qemu_mutex_lock_iothread(); } @@ -556,7 +556,7 @@ void qemu_spice_init(void) spice_image_compression_t compression; spice_wan_compression_t wan_compr; - me = pthread_self(); + qemu_thread_get_self(&me); if (!opts) { return;