From nobody Tue May 14 03:04:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1647532263; cv=none; d=zohomail.com; s=zohoarc; b=ZMoo6AFOFuSNqD0/flvvgbLHknm4tMHTgEG78SohGSTxyS/xV/+kIcAyw/yBTJhzM7LqK6bUD0poHYQOl+aULxTWE7cKDfyJYlY2wcFv6Ef9/LE0ZuQHpmSzGAGI9WFU9z6IoijazAttzyDwTxWQ21JYvq6j+xzP+p8hfvYPZzY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647532263; 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=ST26Tc/edg0WnUIiR0nZcUiwi3dn9NNvPSDlGIwVz20=; b=UZqM1v7KRf4oiSKbRxoisxQ7kr0HZ1WEsgO2NGDFgVe5PhPHoc/4FSqPHb1XeitaEiYmabF+Mpje5qpws4VNtn9IcjmjPn2O9Q8ZqmINHT7akvfKcReVS3NyGZtrM/xXzdwjmkSAoQcParEGEnjx6md19DL9ETTH831ME7Oa0hE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 164753226340513.001928391108208; Thu, 17 Mar 2022 08:51:03 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-591-LDmG7I6oNruWKQMGXYmfTQ-1; Thu, 17 Mar 2022 11:50:55 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6DB5E18A658B; Thu, 17 Mar 2022 15:50:52 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 59D224029C6; Thu, 17 Mar 2022 15:50:52 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 06D9E1940375; Thu, 17 Mar 2022 15:50:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2E2731940349 for ; Thu, 17 Mar 2022 15:50:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0E67A41136F6; Thu, 17 Mar 2022 15:50:50 +0000 (UTC) Received: from work.fritz.box (unknown [10.39.195.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 76C2041136F5; Thu, 17 Mar 2022 15:50:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647532262; 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=ST26Tc/edg0WnUIiR0nZcUiwi3dn9NNvPSDlGIwVz20=; b=GCemTkltfMiXUGkOHEVgAvbLUeLZrqKaIoZjeJ8vV8QC/R9FCE3BDoduZfCDRVfl0Wu0jD IoHIwXnEX0gOoK76bGH/rmfVoZcwlTp1u0WpvLabmzenHR0DJXesrrmRe5PIllqgShWYUA TL+RdWy/7EjieypT3Pv5lyTeMVcSFu8= X-MC-Unique: LDmG7I6oNruWKQMGXYmfTQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 1/2] nwfilter_driver: Use automatic mutex management Date: Thu, 17 Mar 2022 16:50:47 +0100 Message-Id: <20220317155048.51800-2-twiederh@redhat.com> In-Reply-To: <20220317155048.51800-1-twiederh@redhat.com> References: <20220317155048.51800-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tim Wiederhake Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1647532264330100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/nwfilter/nwfilter_driver.c | 94 +++++++++++++++------------------- 1 file changed, 40 insertions(+), 54 deletions(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index c5f0169623..cac73c50e5 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -57,15 +57,6 @@ static int nwfilterStateReload(void); =20 static virMutex driverMutex =3D VIR_MUTEX_INITIALIZER; =20 -static void nwfilterDriverLock(void) -{ - virMutexLock(&driverMutex); -} -static void nwfilterDriverUnlock(void) -{ - virMutexUnlock(&driverMutex); -} - #ifdef WITH_FIREWALLD =20 static void @@ -204,6 +195,7 @@ nwfilterStateInitialize(bool privileged, virStateInhibitCallback callback G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driverMutex); GDBusConnection *sysbus =3D NULL; =20 if (root !=3D NULL) { @@ -230,8 +222,6 @@ nwfilterStateInitialize(bool privileged, if (!privileged) return VIR_DRV_STATE_INIT_SKIPPED; =20 - nwfilterDriverLock(); - driver->stateDir =3D g_strdup(RUNSTATEDIR "/libvirt/nwfilter"); =20 if (g_mkdir_with_parents(driver->stateDir, S_IRWXU) < 0) { @@ -290,13 +280,10 @@ nwfilterStateInitialize(bool privileged, if (virNWFilterBuildAll(driver, false) < 0) goto error; =20 - nwfilterDriverUnlock(); - return VIR_DRV_STATE_INIT_COMPLETE; =20 error: - nwfilterDriverUnlock(); - nwfilterStateCleanup(); + nwfilterStateCleanupLocked(); =20 return VIR_DRV_STATE_INIT_ERROR; =20 @@ -335,16 +322,15 @@ nwfilterStateReload(void) /* shut down all threads -- they will be restarted if necessary */ virNWFilterLearnThreadsTerminate(true); =20 - nwfilterDriverLock(); - virNWFilterWriteLockFilterUpdates(); - - virNWFilterObjListLoadAllConfigs(driver->nwfilters, driver->configDir); + VIR_WITH_MUTEX_LOCK_GUARD(&driverMutex) { + virNWFilterWriteLockFilterUpdates(); =20 - virNWFilterUnlockFilterUpdates(); + virNWFilterObjListLoadAllConfigs(driver->nwfilters, driver->config= Dir); =20 - virNWFilterBuildAll(driver, false); + virNWFilterUnlockFilterUpdates(); =20 - nwfilterDriverUnlock(); + virNWFilterBuildAll(driver, false); + } =20 return 0; } @@ -422,13 +408,13 @@ static virNWFilterPtr nwfilterLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { - virNWFilterObj *obj; + virNWFilterObj *obj =3D NULL; virNWFilterDef *def; virNWFilterPtr nwfilter =3D NULL; =20 - nwfilterDriverLock(); - obj =3D nwfilterObjFromNWFilter(uuid); - nwfilterDriverUnlock(); + VIR_WITH_MUTEX_LOCK_GUARD(&driverMutex) { + obj =3D nwfilterObjFromNWFilter(uuid); + } =20 if (!obj) return NULL; @@ -449,13 +435,13 @@ static virNWFilterPtr nwfilterLookupByName(virConnectPtr conn, const char *name) { - virNWFilterObj *obj; + virNWFilterObj *obj =3D NULL; virNWFilterDef *def; virNWFilterPtr nwfilter =3D NULL; =20 - nwfilterDriverLock(); - obj =3D virNWFilterObjListFindByName(driver->nwfilters, name); - nwfilterDriverUnlock(); + VIR_WITH_MUTEX_LOCK_GUARD(&driverMutex) { + obj =3D virNWFilterObjListFindByName(driver->nwfilters, name); + } =20 if (!obj) { virReportError(VIR_ERR_NO_NWFILTER, @@ -478,14 +464,15 @@ nwfilterLookupByName(virConnectPtr conn, static int nwfilterConnectNumOfNWFilters(virConnectPtr conn) { - int ret; + int ret =3D -1; if (virConnectNumOfNWFiltersEnsureACL(conn) < 0) return -1; =20 - nwfilterDriverLock(); - ret =3D virNWFilterObjListNumOfNWFilters(driver->nwfilters, conn, - virConnectNumOfNWFiltersCheckAC= L); - nwfilterDriverUnlock(); + VIR_WITH_MUTEX_LOCK_GUARD(&driverMutex) { + ret =3D virNWFilterObjListNumOfNWFilters(driver->nwfilters, conn, + virConnectNumOfNWFiltersChe= ckACL); + } + return ret; } =20 @@ -495,16 +482,17 @@ nwfilterConnectListNWFilters(virConnectPtr conn, char **const names, int maxnames) { - int nnames; + int nnames =3D -1; =20 if (virConnectListNWFiltersEnsureACL(conn) < 0) return -1; =20 - nwfilterDriverLock(); - nnames =3D virNWFilterObjListGetNames(driver->nwfilters, conn, - virConnectListNWFiltersCheckACL, - names, maxnames); - nwfilterDriverUnlock(); + VIR_WITH_MUTEX_LOCK_GUARD(&driverMutex) { + nnames =3D virNWFilterObjListGetNames(driver->nwfilters, conn, + virConnectListNWFiltersCheckAC= L, + names, maxnames); + } + return nnames; } =20 @@ -514,17 +502,17 @@ nwfilterConnectListAllNWFilters(virConnectPtr conn, virNWFilterPtr **nwfilters, unsigned int flags) { - int ret; + int ret =3D -1; =20 virCheckFlags(0, -1); =20 if (virConnectListAllNWFiltersEnsureACL(conn) < 0) return -1; =20 - nwfilterDriverLock(); - ret =3D virNWFilterObjListExport(conn, driver->nwfilters, nwfilters, - virConnectListAllNWFiltersCheckACL); - nwfilterDriverUnlock(); + VIR_WITH_MUTEX_LOCK_GUARD(&driverMutex) { + ret =3D virNWFilterObjListExport(conn, driver->nwfilters, nwfilter= s, + virConnectListAllNWFiltersCheckACL); + } =20 return ret; } @@ -535,6 +523,7 @@ nwfilterDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags) { + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driverMutex); virNWFilterDef *def; virNWFilterObj *obj =3D NULL; virNWFilterDef *objdef; @@ -549,7 +538,6 @@ nwfilterDefineXMLFlags(virConnectPtr conn, return NULL; } =20 - nwfilterDriverLock(); virNWFilterWriteLockFilterUpdates(); =20 if (!(def =3D virNWFilterDefParseString(xml, flags))) @@ -576,7 +564,6 @@ nwfilterDefineXMLFlags(virConnectPtr conn, virNWFilterObjUnlock(obj); =20 virNWFilterUnlockFilterUpdates(); - nwfilterDriverUnlock(); return nwfilter; } =20 @@ -592,11 +579,11 @@ nwfilterDefineXML(virConnectPtr conn, static int nwfilterUndefine(virNWFilterPtr nwfilter) { + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driverMutex); virNWFilterObj *obj; virNWFilterDef *def; int ret =3D -1; =20 - nwfilterDriverLock(); virNWFilterWriteLockFilterUpdates(); =20 if (!(obj =3D nwfilterObjFromNWFilter(nwfilter->uuid))) @@ -625,7 +612,6 @@ nwfilterUndefine(virNWFilterPtr nwfilter) virNWFilterObjUnlock(obj); =20 virNWFilterUnlockFilterUpdates(); - nwfilterDriverUnlock(); return ret; } =20 @@ -634,15 +620,15 @@ static char * nwfilterGetXMLDesc(virNWFilterPtr nwfilter, unsigned int flags) { - virNWFilterObj *obj; + virNWFilterObj *obj =3D NULL; virNWFilterDef *def; char *ret =3D NULL; =20 virCheckFlags(0, NULL); =20 - nwfilterDriverLock(); - obj =3D nwfilterObjFromNWFilter(nwfilter->uuid); - nwfilterDriverUnlock(); + VIR_WITH_MUTEX_LOCK_GUARD(&driverMutex) { + obj =3D nwfilterObjFromNWFilter(nwfilter->uuid); + } =20 if (!obj) return NULL; --=20 2.31.1 From nobody Tue May 14 03:04:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1647532259; cv=none; d=zohomail.com; s=zohoarc; b=Df/KopVXU00C17IUgylTgt9EqjQ6TPXPVACssH4yqnD6HjRKJQ7KLeMw5/VjJTHRAq8tIdnzIeV2K2Mguq+oV95YoskGlJxMPERUR/pl+w71ri0LjDevFukWzybX5pdmsFlBzv6Xp70EmeEd+lehTq5ytCUcwnf1/bPA4UgSb7o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647532259; 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=izN+HZxzJTkRJcgE1NS4YPN6UeNJf+XYPU3ew+adIoc=; b=Dfp7jD5BbCAlnmNaInH5uQ1SYMrgk6//SsOhU6SgatATIaXuMrNJSWMkXIEv7x7P7e2GeM0DDG/QSQo8ZxdWK37FmRKsKaWYBIZSN/sU4prWVtOKQWov+dHKWeMUiDkWqX64pxf5Q/P/fQSbxDSc3h3IE9yiRIEanUCEchZHqok= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1647532259018553.9708470309431; Thu, 17 Mar 2022 08:50:59 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-452-bblqdwiLMc6yxKeHPpGorg-1; Thu, 17 Mar 2022 11:50:56 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CC24B1C00B9D; Thu, 17 Mar 2022 15:50:52 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1AA041136E2; Thu, 17 Mar 2022 15:50:52 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6C90D193058E; Thu, 17 Mar 2022 15:50:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D2D19194E012 for ; Thu, 17 Mar 2022 15:50:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B5F7141136F6; Thu, 17 Mar 2022 15:50:50 +0000 (UTC) Received: from work.fritz.box (unknown [10.39.195.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44C8A41136F5; Thu, 17 Mar 2022 15:50:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647532259; 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=izN+HZxzJTkRJcgE1NS4YPN6UeNJf+XYPU3ew+adIoc=; b=PMfkySjFpKosl2N4lPohqbYQ3hehKI5MSH1dPkqrdZza4syBSMnZfAGs/QhR0McjA2mOhJ mz2WaVfOvoXSfmg6IqRYUEuI7A5PW+EeGP5gayk0eQOVPqRjsQl0LMle3va54iLpk4S53A 3E/WS1nYMLxz8Ygk23pBfp/YCyvcJAg= X-MC-Unique: bblqdwiLMc6yxKeHPpGorg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 2/2] qemu_conf: Use automatic memory management Date: Thu, 17 Mar 2022 16:50:48 +0100 Message-Id: <20220317155048.51800-3-twiederh@redhat.com> In-Reply-To: <20220317155048.51800-1-twiederh@redhat.com> References: <20220317155048.51800-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tim Wiederhake Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1647532268979100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/qemu/qemu_conf.c | 63 +++++++++++++++----------------------------- 1 file changed, 21 insertions(+), 42 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 81449b8b77..c22cf79cbe 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -85,17 +85,6 @@ static int virQEMUConfigOnceInit(void) VIR_ONCE_GLOBAL_INIT(virQEMUConfig); =20 =20 -static void -qemuDriverLock(virQEMUDriver *driver) -{ - virMutexLock(&driver->lock); -} -static void -qemuDriverUnlock(virQEMUDriver *driver) -{ - virMutexUnlock(&driver->lock); -} - #ifndef DEFAULT_LOADER_NVRAM # define DEFAULT_LOADER_NVRAM \ "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd:" \ @@ -1279,11 +1268,9 @@ virQEMUDriverConfigSetDefaults(virQEMUDriverConfig *= cfg) =20 virQEMUDriverConfig *virQEMUDriverGetConfig(virQEMUDriver *driver) { - virQEMUDriverConfig *conf; - qemuDriverLock(driver); - conf =3D virObjectRef(driver->config); - qemuDriverUnlock(driver); - return conf; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); + + return virObjectRef(driver->config); } =20 virDomainXMLOption * @@ -1303,16 +1290,13 @@ virQEMUDriverCreateXMLConf(virQEMUDriver *driver, virCPUDef * virQEMUDriverGetHostCPU(virQEMUDriver *driver) { - virCPUDef *hostcpu; - - qemuDriverLock(driver); + virCPUDef *hostcpu =3D NULL; =20 - if (!driver->hostcpu) - driver->hostcpu =3D virCPUProbeHost(virArchFromHost()); - - hostcpu =3D driver->hostcpu; - - qemuDriverUnlock(driver); + VIR_WITH_MUTEX_LOCK_GUARD(&driver->lock) { + if (!driver->hostcpu) + driver->hostcpu =3D virCPUProbeHost(virArchFromHost()); + hostcpu =3D driver->hostcpu; + } =20 if (hostcpu) virCPUDefRef(hostcpu); @@ -1389,32 +1373,27 @@ virCaps *virQEMUDriverCreateCapabilities(virQEMUDri= ver *driver) * Returns: a reference to a virCaps *instance or NULL */ virCaps *virQEMUDriverGetCapabilities(virQEMUDriver *driver, - bool refresh) + bool refresh) { - virCaps *ret =3D NULL; if (refresh) { virCaps *caps =3D NULL; if ((caps =3D virQEMUDriverCreateCapabilities(driver)) =3D=3D NULL) return NULL; =20 - qemuDriverLock(driver); - virObjectUnref(driver->caps); - driver->caps =3D caps; - } else { - qemuDriverLock(driver); - - if (driver->caps =3D=3D NULL || - driver->caps->nguests =3D=3D 0) { - VIR_DEBUG("Capabilities didn't detect any guests. Forcing a " - "refresh."); - qemuDriverUnlock(driver); - return virQEMUDriverGetCapabilities(driver, true); + VIR_WITH_MUTEX_LOCK_GUARD(&driver->lock) { + virObjectUnref(driver->caps); + driver->caps =3D caps; + return virObjectRef(driver->caps); } } =20 - ret =3D virObjectRef(driver->caps); - qemuDriverUnlock(driver); - return ret; + VIR_WITH_MUTEX_LOCK_GUARD(&driver->lock) { + if (driver->caps && driver->caps->nguests > 0) + return virObjectRef(driver->caps); + } + + VIR_DEBUG("Capabilities didn't detect any guests. Forcing a refresh."); + return virQEMUDriverGetCapabilities(driver, true); } =20 =20 --=20 2.31.1