From nobody Mon Feb 9 17:58:24 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594006934; cv=none; d=zohomail.com; s=zohoarc; b=BdfK/xQF3P44lhteYmRgNcMrxSd7A2oMR+V7Twmth28y0qNzs+mePlcJyv2p5Ilml5neU8gj3+FQ2BaS9u+ZRePKOoA843dcZcw+VdmryiaNxbIod/8k2fZzDqzXA8LWZFwIJdZ1y1HI98kD5NAKH9KYB8bLEBsX1wLobjv2Ang= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594006934; h=Content-Type:Content-Transfer-Encoding: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=Ple1JdOYV2YiuxuLuNshPT3ATWuNWRUDlZbV1YH2+vM=; b=GSW6yfhWo5uQ6mygkSAAqk+Im3b7/zPVKpGH0ObLULLmGFEtiGkF6g1Gi5y+AuAIS+15npEGfUKNNHNHLKDNaXTw6LM2o2Py/iU3D2c40Z/VONTvO66kHPdfM3aeW/aFXsn9NOI80cPbdQIUNbIISsXWYx760Ny9+uuDq8Z62n0= 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=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594006934314544.4236830861767; Sun, 5 Jul 2020 20:42:14 -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-508-NQ7ttXmOM9KPrlpD4Z1Qsw-1; Sun, 05 Jul 2020 23:42:10 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 24F4F8015FB; Mon, 6 Jul 2020 03:42:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 045B3619B5; Mon, 6 Jul 2020 03:42:05 +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 CB1E987886; Mon, 6 Jul 2020 03:42:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0663ffs0004410 for ; Sun, 5 Jul 2020 23:41:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id C1A147AC9F; Mon, 6 Jul 2020 03:41:41 +0000 (UTC) Received: from vhost2.laine.org (ovpn-112-194.phx2.redhat.com [10.3.112.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id 747FB71678 for ; Mon, 6 Jul 2020 03:41:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594006932; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=Ple1JdOYV2YiuxuLuNshPT3ATWuNWRUDlZbV1YH2+vM=; b=H9m/29CJlbwX2Ij0QQYH2jtRKTeMzqiwHQNTIM8p7VbE1wQPPUFh1K0whNKK/Ks7iT1RkK uRHDt/DZqUZm58+dDMweUWO6pNXv9b9V/uzrgOCN1TnJmqRefThc/I72xFwdIoRnZY8Oti wqeIgeIojzKu+aTaRxi4xtbyck6OlPo= X-MC-Unique: NQ7ttXmOM9KPrlpD4Z1Qsw-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 03/32] hyperv: use g_auto() for all virBuffers Date: Sun, 5 Jul 2020 23:40:58 -0400 Message-Id: <20200706034127.1117504-4-laine@redhat.com> In-Reply-To: <20200706034127.1117504-1-laine@redhat.com> References: <20200706034127.1117504-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com 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.12 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) Content-Type: text/plain; charset="utf-8" Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- src/hyperv/hyperv_driver.c | 34 ++++++++++++++++------------------ src/hyperv/hyperv_wmi.c | 11 +++++------ 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 4677a25ff8..20d372b274 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -60,7 +60,7 @@ static int hypervInitConnection(virConnectPtr conn, hypervPrivate *priv, char *username, char *password) { - virBuffer query =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; hypervWqlQuery wqlQuery =3D HYPERV_WQL_QUERY_INITIALIZER; hypervObject *computerSystem =3D NULL; int ret =3D -1; @@ -204,7 +204,7 @@ hypervConnectGetHostname(virConnectPtr conn) { char *hostname =3D NULL; hypervPrivate *priv =3D conn->privateData; - virBuffer query =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; Win32_ComputerSystem *computerSystem =3D NULL; =20 virBufferAddLit(&query, WIN32_COMPUTERSYSTEM_WQL_SELECT); @@ -234,7 +234,7 @@ hypervNodeGetInfo(virConnectPtr conn, virNodeInfoPtr in= fo) { int result =3D -1; hypervPrivate *priv =3D conn->privateData; - virBuffer query =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; Win32_ComputerSystem *computerSystem =3D NULL; Win32_Processor *processorList =3D NULL; Win32_Processor *processor =3D NULL; @@ -329,7 +329,7 @@ hypervConnectListDomains(virConnectPtr conn, int *ids, = int maxids) { bool success =3D false; hypervPrivate *priv =3D conn->privateData; - virBuffer query =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; Msvm_ComputerSystem *computerSystemList =3D NULL; Msvm_ComputerSystem *computerSystem =3D NULL; int count =3D 0; @@ -371,7 +371,7 @@ hypervConnectNumOfDomains(virConnectPtr conn) { bool success =3D false; hypervPrivate *priv =3D conn->privateData; - virBuffer query =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; Msvm_ComputerSystem *computerSystemList =3D NULL; Msvm_ComputerSystem *computerSystem =3D NULL; int count =3D 0; @@ -407,7 +407,7 @@ hypervDomainLookupByID(virConnectPtr conn, int id) { virDomainPtr domain =3D NULL; hypervPrivate *priv =3D conn->privateData; - virBuffer query =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; Msvm_ComputerSystem *computerSystem =3D NULL; =20 virBufferAddLit(&query, MSVM_COMPUTERSYSTEM_WQL_SELECT); @@ -439,7 +439,7 @@ hypervDomainLookupByUUID(virConnectPtr conn, const unsi= gned char *uuid) virDomainPtr domain =3D NULL; hypervPrivate *priv =3D conn->privateData; char uuid_string[VIR_UUID_STRING_BUFLEN]; - virBuffer query =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; Msvm_ComputerSystem *computerSystem =3D NULL; =20 virUUIDFormat(uuid, uuid_string); @@ -473,7 +473,7 @@ hypervDomainLookupByName(virConnectPtr conn, const char= *name) { virDomainPtr domain =3D NULL; hypervPrivate *priv =3D conn->privateData; - virBuffer query =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; Msvm_ComputerSystem *computerSystem =3D NULL; =20 virBufferAddLit(&query, MSVM_COMPUTERSYSTEM_WQL_SELECT); @@ -612,7 +612,7 @@ hypervDomainGetInfo(virDomainPtr domain, virDomainInfoP= tr info) int result =3D -1; hypervPrivate *priv =3D domain->conn->privateData; char uuid_string[VIR_UUID_STRING_BUFLEN]; - virBuffer query =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; Msvm_ComputerSystem *computerSystem =3D NULL; Msvm_VirtualSystemSettingData *virtualSystemSettingData =3D NULL; Msvm_ProcessorSettingData *processorSettingData =3D NULL; @@ -746,7 +746,7 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned in= t flags) hypervPrivate *priv =3D domain->conn->privateData; virDomainDefPtr def =3D NULL; char uuid_string[VIR_UUID_STRING_BUFLEN]; - virBuffer query =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; Msvm_ComputerSystem *computerSystem =3D NULL; Msvm_VirtualSystemSettingData *virtualSystemSettingData =3D NULL; Msvm_ProcessorSettingData *processorSettingData =3D NULL; @@ -851,7 +851,7 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned in= t flags) } else if (priv->wmiVersion =3D=3D HYPERV_WMI_VERSION_V2 && virtualSystemSettingData->data.v2->Notes.data !=3D NULL) { char **notes =3D (char **)virtualSystemSettingData->data.v2->Notes= .data; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; size_t i =3D 0; =20 /* in practice Notes has 1 element */ @@ -906,7 +906,7 @@ hypervConnectListDefinedDomains(virConnectPtr conn, cha= r **const names, int maxn { bool success =3D false; hypervPrivate *priv =3D conn->privateData; - virBuffer query =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; Msvm_ComputerSystem *computerSystemList =3D NULL; Msvm_ComputerSystem *computerSystem =3D NULL; int count =3D 0; @@ -958,7 +958,7 @@ hypervConnectNumOfDefinedDomains(virConnectPtr conn) { bool success =3D false; hypervPrivate *priv =3D conn->privateData; - virBuffer query =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; Msvm_ComputerSystem *computerSystemList =3D NULL; Msvm_ComputerSystem *computerSystem =3D NULL; int count =3D 0; @@ -1198,7 +1198,7 @@ hypervConnectListAllDomains(virConnectPtr conn, unsigned int flags) { hypervPrivate *priv =3D conn->privateData; - virBuffer query =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; Msvm_ComputerSystem *computerSystemList =3D NULL; Msvm_ComputerSystem *computerSystem =3D NULL; size_t ndoms; @@ -1336,7 +1336,7 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int= codeset, char *selector =3D NULL; Msvm_ComputerSystem *computerSystem =3D NULL; Msvm_Keyboard *keyboard =3D NULL; - virBuffer query =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; hypervInvokeParamsListPtr params =3D NULL; char keycodeStr[VIR_INT64_STR_BUFLEN]; =20 @@ -1437,7 +1437,6 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int= codeset, VIR_FREE(selector); hypervFreeObject(priv, (hypervObject *)keyboard); hypervFreeObject(priv, (hypervObject *)computerSystem); - virBufferFreeAndReset(&query); return result; } =20 @@ -1454,7 +1453,7 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsig= ned long memory, unsigned long memory_mb =3D VIR_ROUND_UP(VIR_DIV_UP(memory, 1024), 2); Msvm_VirtualSystemSettingData *vssd =3D NULL; Msvm_MemorySettingData *memsd =3D NULL; - virBuffer eprQuery =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) eprQuery =3D VIR_BUFFER_INITIALIZER; virHashTablePtr memResource =3D NULL; =20 virCheckFlags(0, -1); @@ -1537,7 +1536,6 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsig= ned long memory, =20 params_cleanup: hypervFreeInvokeParams(params); - virBufferFreeAndReset(&eprQuery); cleanup: VIR_FREE(memory_str); hypervFreeObject(priv, (hypervObject *)vssd); diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index ca2d29733e..f8d0aaf373 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -778,7 +778,7 @@ hypervInvokeMethod(hypervPrivate *priv, hypervInvokePar= amsListPtr params, char *returnValue =3D NULL; char *instanceID =3D NULL; bool completed =3D false; - virBuffer query =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; Msvm_ConcreteJob *job =3D NULL; int jobState =3D -1; hypervParamPtr p =3D NULL; @@ -939,7 +939,6 @@ hypervInvokeMethod(hypervPrivate *priv, hypervInvokePar= amsListPtr params, VIR_FREE(jobcode_instance_xpath); VIR_FREE(returnValue); VIR_FREE(instanceID); - virBufferFreeAndReset(&query); hypervFreeObject(priv, (hypervObject *)job); hypervFreeInvokeParams(params); return result; @@ -1314,7 +1313,7 @@ hypervInvokeMsvmComputerSystemRequestStateChange(virD= omainPtr domain, char *returnValue =3D NULL; int returnCode; char *instanceID =3D NULL; - virBuffer query =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; Msvm_ConcreteJob *concreteJob =3D NULL; bool completed =3D false; const char *resourceUri =3D MSVM_COMPUTERSYSTEM_V2_RESOURCE_URI; @@ -1553,7 +1552,7 @@ hypervMsvmComputerSystemFromDomain(virDomainPtr domai= n, { hypervPrivate *priv =3D domain->conn->privateData; char uuid_string[VIR_UUID_STRING_BUFLEN]; - virBuffer query =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; =20 if (computerSystem =3D=3D NULL || *computerSystem !=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")= ); @@ -1588,7 +1587,7 @@ int hypervGetMsvmVirtualSystemSettingDataFromUUID(hypervPrivate *priv, const char *uuid_string, Msvm_VirtualSystemSettingData **list) { - virBuffer query =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; =20 virBufferAsprintf(&query, "associators of " @@ -1614,7 +1613,7 @@ int hypervGetMsvmMemorySettingDataFromVSSD(hypervPrivate *priv, const char *vssd_instanceid, Msvm_MemorySettingData **list) { - virBuffer query =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; =20 virBufferAsprintf(&query, "associators of " --=20 2.25.4