From nobody Tue Feb 10 16:22:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1648220601; cv=none; d=zohomail.com; s=zohoarc; b=Q9hkyiuvTAeZbp+JAt6wv0B3qYCDugUbKiKdcFfU+AeWkId8UXODM5FU8U2XRiCGp8ZlS4mU7SqewcgXgCtPr/3J9Jz67mA6Y1sVzut5aFR1PJkOHpKf730WgxSU4GgHjBIb3X/zUk5o1tWs3+rnbFWM13mHyZReFsVvCWAHfZA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648220601; 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=HdWyuwdl8wbfwE7GOXIcJiJEGNVJgHwBEC3ekYTs4Ow=; b=PQRkZKJjGfheSaEn75wgEutjhi+p+tpyPclWlcF7cyCXmGdtjEpMLqCd79UlWY4vZaylbcxtyUezkVYog6CksHRX4ogmXfsajW6zMke4TVI8ynE6UU5NuwF4GpnZ9C7V1pSsAcgJQO7VC2cFy5Jc419lLmbb3lYwlYDAuH0f9u4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1648220601438267.9237859564016; Fri, 25 Mar 2022 08:03:21 -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-609-Z14Pq7dDM8eNubItXvVWXA-1; Fri, 25 Mar 2022 11:02:39 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 356CE899EE7; Fri, 25 Mar 2022 15:02:32 +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 207261457F15; Fri, 25 Mar 2022 15:02:32 +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 563CD194036C; Fri, 25 Mar 2022 15:02:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 245051940341 for ; Fri, 25 Mar 2022 15:02:29 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0C2F6C1D3AD; Fri, 25 Mar 2022 15:02:29 +0000 (UTC) Received: from work.fritz.box (unknown [10.39.194.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8EB44C27D96; Fri, 25 Mar 2022 15:02:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648220599; 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=HdWyuwdl8wbfwE7GOXIcJiJEGNVJgHwBEC3ekYTs4Ow=; b=ClZkBDs2X/9WVX2NwTxLRrTlD6+5g58JFAvOcOTJmLzB305x2tsfUrBIZqR9OQqWFgEAq6 JLwRrl9PiTLXCSGmHh8RszblGhf671hXjw9KZ8ACdTL7x0h9pevbOf768wjj/JJVKJ/pHF GCHjDtdAyHRl0OovFqe9CtZ9qTmYmqc= X-MC-Unique: Z14Pq7dDM8eNubItXvVWXA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 07/10] vbox_common: Use automatic mutex management Date: Fri, 25 Mar 2022 16:02:19 +0100 Message-Id: <20220325150222.78919-8-twiederh@redhat.com> In-Reply-To: <20220325150222.78919-1-twiederh@redhat.com> References: <20220325150222.78919-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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.7 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: 1648220603376100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Tim Wiederhake --- src/vbox/vbox_common.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index acd18494d3..03f55f2f1e 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -602,11 +602,10 @@ vboxDomainSave(virDomainPtr dom, const char *path G_G= NUC_UNUSED) static int vboxConnectGetVersion(virConnectPtr conn, unsigned long *versio= n) { struct _vboxDriver *data =3D conn->privateData; - VIR_DEBUG("%s: in vboxGetVersion", conn->driver->name); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(data); =20 - virObjectLock(data); + VIR_DEBUG("%s: in vboxGetVersion", conn->driver->name); *version =3D data->version; - virObjectUnlock(data); =20 return 0; } @@ -664,16 +663,12 @@ vboxConnectGetMaxVcpus(virConnectPtr conn, const char= *type G_GNUC_UNUSED) static char *vboxConnectGetCapabilities(virConnectPtr conn) { struct _vboxDriver *data =3D conn->privateData; - char *ret =3D NULL; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(data); =20 if (!data->vboxObj) - return ret; - - virObjectLock(data); - ret =3D virCapabilitiesFormatXML(data->caps); - virObjectUnlock(data); + return NULL; =20 - return ret; + return virCapabilitiesFormatXML(data->caps); } =20 static int vboxConnectListDomains(virConnectPtr conn, int *ids, int nids) @@ -7568,13 +7563,13 @@ vboxNodeGetFreePages(virConnectPtr conn, unsigned int flags) { struct _vboxDriver *driver =3D conn->privateData; - int lastCell; + int lastCell =3D -1; =20 virCheckFlags(0, -1); =20 - virObjectLock(driver); - lastCell =3D virCapabilitiesHostNUMAGetMaxNode(driver->caps->host.numa= ); - virObjectUnlock(driver); + VIR_WITH_OBJECT_LOCK_GUARD(driver) { + lastCell =3D virCapabilitiesHostNUMAGetMaxNode(driver->caps->host.= numa); + } =20 return virHostMemGetFreePages(npages, pages, startCell, cellCount, lastCell, counts); @@ -7590,14 +7585,14 @@ vboxNodeAllocPages(virConnectPtr conn G_GNUC_UNUSED, unsigned int flags) { struct _vboxDriver *driver =3D conn->privateData; - int lastCell; + int lastCell =3D -1; bool add =3D !(flags & VIR_NODE_ALLOC_PAGES_SET); =20 virCheckFlags(VIR_NODE_ALLOC_PAGES_SET, -1); =20 - virObjectLock(driver); - lastCell =3D virCapabilitiesHostNUMAGetMaxNode(driver->caps->host.numa= ); - virObjectUnlock(driver); + VIR_WITH_OBJECT_LOCK_GUARD(driver) { + lastCell =3D virCapabilitiesHostNUMAGetMaxNode(driver->caps->host.= numa); + } =20 return virHostMemAllocPages(npages, pageSizes, pageCounts, startCell, cellCount, lastCell, add); --=20 2.31.1