From nobody Fri Dec 19 18:53:04 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646413257; cv=none; d=zohomail.com; s=zohoarc; b=I42MsU6yL8sNeVRyW68ZiWcQnTA1DYKnV5XF27YLzf0sIaBAo5W9L3DYB6eej/E81CsOSEmqhLwYMmjRwLYKltNHCvI3hp+ylZikOdYFVarnxR5HlasWnQKRhoeHUw782pxFlzc8RWCJRIS272UNXjnln4h1OnG9QU0Vjx6fOaE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646413257; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Xnz9gUdPLjEfkILxFU1TG62D3jDVigV1WYKRGuoacbk=; b=fY+3WQRL4AFGa5N37W9Zwqncw7Itd/nHDYTFtqfquukesJ5jekIKuwg8OG9C8Sm+ZtzbovOCkyXEJZZo+FjhLNyw07bOr8y6WGTZGJ2Uk7I61KIePcaqy+i1KA0ebNDSe0tER0G01RG7LGQN5aVHAM8ewpN/ezX7PIaC8c8yKR4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646413257412372.7924246210339; Fri, 4 Mar 2022 09:00:57 -0800 (PST) Received: from localhost ([::1]:55460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQBIX-0000sG-25 for importer@patchew.org; Fri, 04 Mar 2022 12:00:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQB5a-0004se-Vs for qemu-devel@nongnu.org; Fri, 04 Mar 2022 11:47:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:54191) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQB5Z-0007LH-Cq for qemu-devel@nongnu.org; Fri, 04 Mar 2022 11:47:34 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-575-B1BSifLgOAWRjBHe_wFDLg-1; Fri, 04 Mar 2022 11:47:29 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 948F0801DDC; Fri, 4 Mar 2022 16:47:28 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.194.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 995A983BF9; Fri, 4 Mar 2022 16:47:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646412452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Xnz9gUdPLjEfkILxFU1TG62D3jDVigV1WYKRGuoacbk=; b=Z7rLTrCUGkZdxXuGnlC/ktz2DOCETxVMjO2ANiURtK6Ln48KzWXNrcv2FkQy1KpQfX22mU 4BCQuV+cAjZILpK3Lo32AzAmUwB75eJ7Zb5fdn9G5q0/d2z2w//GEkOsJ5fYvSCRs/a5Ly fH1F/qks5fJ+QD1GTL6DcnNxKDMLdDE= X-MC-Unique: B1BSifLgOAWRjBHe_wFDLg-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 09/50] cpus: use coroutine TLS macros for iothread_locked Date: Fri, 4 Mar 2022 17:46:30 +0100 Message-Id: <20220304164711.474713-10-kwolf@redhat.com> In-Reply-To: <20220304164711.474713-1-kwolf@redhat.com> References: <20220304164711.474713-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646413261706100001 Content-Type: text/plain; charset="utf-8" From: Stefan Hajnoczi qemu_mutex_iothread_locked() may be used from coroutines. Standard __thread variables cannot be used by coroutines. Use the coroutine TLS macros instead. Signed-off-by: Stefan Hajnoczi Message-Id: <20220222140150.27240-5-stefanha@redhat.com> Signed-off-by: Kevin Wolf --- softmmu/cpus.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 035395ae13..d1ff3cfea1 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "monitor/monitor.h" +#include "qemu/coroutine-tls.h" #include "qapi/error.h" #include "qapi/qapi-commands-machine.h" #include "qapi/qapi-commands-misc.h" @@ -473,11 +474,11 @@ bool qemu_in_vcpu_thread(void) return current_cpu && qemu_cpu_is_self(current_cpu); } =20 -static __thread bool iothread_locked =3D false; +QEMU_DEFINE_STATIC_CO_TLS(bool, iothread_locked) =20 bool qemu_mutex_iothread_locked(void) { - return iothread_locked; + return get_iothread_locked(); } =20 /* @@ -490,13 +491,13 @@ void qemu_mutex_lock_iothread_impl(const char *file, = int line) =20 g_assert(!qemu_mutex_iothread_locked()); bql_lock(&qemu_global_mutex, file, line); - iothread_locked =3D true; + set_iothread_locked(true); } =20 void qemu_mutex_unlock_iothread(void) { g_assert(qemu_mutex_iothread_locked()); - iothread_locked =3D false; + set_iothread_locked(false); qemu_mutex_unlock(&qemu_global_mutex); } =20 --=20 2.35.1