From nobody Mon Feb 9 10:47:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1586526995; cv=none; d=zohomail.com; s=zohoarc; b=cTTYt2jDhnlhr2CGB3BbkfuA/j/oOnkV519LYshMFvCYH3sSLQdHe+axxUx0dzdSvCPnRTy2ElGP9AqNiyCMIRaYEzPtRJ1PXKWmbJwsWKj+S4sfGaLBOsRAHHsosB9YSgGH1pFWLLUcJ9mylMwaTv9LEhZLNkx8A7bkB3OCzNY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586526995; 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=dA7fW2QBt4hMXqscHUVdWKhYYE6f74SYL65EDSeA/rQ=; b=YA0FKiZLsMffI/pzduziLOy/cjftyQBgGWKFY3S0OnTSRThH5VDq+nK3gqgYRk6jLgtS8G1Jz4KIxQoTsEtLjAKLihtmFdFYkPJFLyXnXjfwjs/OQnEmOZKrGy9rwA4eRf635n/CLJ4yfo1jpNFjO17/uvP718SpPogd4l4wEPk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 158652699530197.68001823723989; Fri, 10 Apr 2020 06:56:35 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-366-R_NVJ_60PHmppYbaANiYTg-1; Fri, 10 Apr 2020 09:56:30 -0400 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 B23A81137847; Fri, 10 Apr 2020 13:56:24 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8919F9DD96; Fri, 10 Apr 2020 13:56:24 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3ECA218034EF; Fri, 10 Apr 2020 13:56:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 03ADu3kK023172 for ; Fri, 10 Apr 2020 09:56:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id CB8A52166AE1; Fri, 10 Apr 2020 13:56:03 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C77392166B34 for ; Fri, 10 Apr 2020 13:56:03 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ACCE9185A793 for ; Fri, 10 Apr 2020 13:56:03 +0000 (UTC) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-431-HNoCXYdfOeesdwIPSesjrA-1; Fri, 10 Apr 2020 09:56:01 -0400 Received: by mail-wr1-f68.google.com with SMTP id k11so1758311wrp.5 for ; Fri, 10 Apr 2020 06:56:01 -0700 (PDT) Received: from localhost.localdomain (public-gprs377075.centertel.pl. [37.47.104.52]) by smtp.gmail.com with ESMTPSA id c11sm3066319wrt.24.2020.04.10.06.55.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Apr 2020 06:55:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586526992; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=dA7fW2QBt4hMXqscHUVdWKhYYE6f74SYL65EDSeA/rQ=; b=iqtkZKaHYWixw2P1bu1tkmcfDx901HP19yiW/NGsijJc01tHh4JU2pdKmf9MyJ6YzBBQ/D W8OtsY19owy7/5tz4Mtfe2adInYNotSy+7U5q0jXOCuKDrPycbZY5Cr6wnYzIhuW8pg3NC JXuWHMUj/A9FHmK/YNfYRFP1Ub/TVbw= X-MC-Unique: R_NVJ_60PHmppYbaANiYTg-1 X-MC-Unique: HNoCXYdfOeesdwIPSesjrA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xrMHex94udbNicEm2lO4Rhhhkgn20PBGjoOwna3lSh0=; b=o60cwxghSAnlFj5IzWmc5mucJ4nTY5xfQ70jcPP5UtnYUg/YLo75DF2foqF57NUTWP pqQNKJuL2vMxl6pNSpMUVW+HzglNtG/osnZKYfHkbZZz47wQjeSK9sb8YI3zO0CdBUZx EZVI6jKIho7NuKLnAJ7GtBcXXzc4ujaSOHJqTx1ra2/9KZrKNefhzoMprWhqleJlsQKb IGweijxR57TaOTpuSMWg9DIZMS2oJqH3o/leyA9gnmkDd0Zyl9plIdqZLR4YHUJNnK1X lSpq8VngW9DD4kKQvJO2+m9R0/M526NF5mLxUokUtvyI/WDtModrXrb9stQYTgWcHThT M7Ug== X-Gm-Message-State: AGi0PuaenVh9G7PD1eGAIN5F6BWwRw5vwCxehDAcyAedb836TM8TwmZo 5S/Zk0VBAL/6lckrfYyD95+1VZ7zvPA= X-Google-Smtp-Source: APiQypLqqp0TvsGuwS+Xp3l7aMYc2oOwcLT+hV1tt53z/wGVsJFsgRu4LUFWVBb0w3rlaF6gdvuRjQ== X-Received: by 2002:adf:ecc2:: with SMTP id s2mr5067398wro.73.1586526959882; Fri, 10 Apr 2020 06:55:59 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH 25/43] qemu: convert virMutex to GMutex Date: Fri, 10 Apr 2020 15:54:52 +0200 Message-Id: <20200410135510.2148319-26-r4f4rfs@gmail.com> In-Reply-To: <20200410135510.2148319-1-r4f4rfs@gmail.com> References: <20200410135510.2148319-1-r4f4rfs@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 03ADu3kK023172 X-loop: libvir-list@redhat.com Cc: Rafael Fonseca X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Rafael Fonseca --- src/qemu/qemu_conf.c | 4 ++-- src/qemu/qemu_conf.h | 2 +- src/qemu/qemu_driver.c | 9 ++------- tests/testutilsqemu.c | 5 ++--- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index c59824006c..f4460e77ec 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -86,12 +86,12 @@ VIR_ONCE_GLOBAL_INIT(virQEMUConfig); static void qemuDriverLock(virQEMUDriverPtr driver) { - virMutexLock(&driver->lock); + g_mutex_lock(&driver->lock); } static void qemuDriverUnlock(virQEMUDriverPtr driver) { - virMutexUnlock(&driver->lock); + g_mutex_unlock(&driver->lock); } =20 #ifndef DEFAULT_LOADER_NVRAM diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index b9ef4551a3..f28486d62b 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -225,7 +225,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virQEMUDriverConfig, virO= bjectUnref); =20 /* Main driver state */ struct _virQEMUDriver { - virMutex lock; + GMutex lock; =20 /* Require lock to get reference on 'config', * then lockless thereafter */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d6ed6d3b3f..f6a9edf93c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -645,12 +645,7 @@ qemuStateInitialize(bool privileged, =20 qemu_driver->lockFD =3D -1; =20 - if (virMutexInit(&qemu_driver->lock) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot initialize mutex")); - VIR_FREE(qemu_driver); - return VIR_DRV_STATE_INIT_ERROR; - } + g_mutex_init(&qemu_driver->lock); =20 qemu_driver->inhibitCallback =3D callback; qemu_driver->inhibitOpaque =3D opaque; @@ -1134,7 +1129,7 @@ qemuStateCleanup(void) virPidFileRelease(qemu_driver->config->stateDir, "driver", qemu_dr= iver->lockFD); =20 virObjectUnref(qemu_driver->config); - virMutexDestroy(&qemu_driver->lock); + g_mutex_clear(&qemu_driver->lock); VIR_FREE(qemu_driver); =20 return 0; diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index cb68ac0488..27053603a0 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -307,7 +307,7 @@ qemuTestParseCapabilitiesArch(virArch arch, =20 void qemuTestDriverFree(virQEMUDriver *driver) { - virMutexDestroy(&driver->lock); + g_mutex_clear(&driver->lock); if (driver->config) { virFileDeleteTree(driver->config->stateDir); virFileDeleteTree(driver->config->configDir); @@ -386,8 +386,7 @@ int qemuTestDriverInit(virQEMUDriver *driver) !(cpuPower9 =3D virCPUDefCopy(&cpuPower9Data))) return -1; =20 - if (virMutexInit(&driver->lock) < 0) - return -1; + g_mutex_init(&driver->lock); =20 driver->hostarch =3D virArchFromHost(); driver->config =3D virQEMUDriverConfigNew(false, NULL); --=20 2.25.2