From nobody Mon Feb 9 03:46:36 2026 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=1629203216; cv=none; d=zohomail.com; s=zohoarc; b=L1nK3mt3R06WUz+nBvtmerCG5OOOyQKDrkBCB9MIxZffrnJZP1kde2bzbb8PYRmU962KL3HGi1+8cwWzBH3xeH7nkag9lag+sMWQWfaaoTAHWnxf9TwDQ7O+WQXWKN0H5U31z7T7Vnd+WhRwnU4Zc/a5vhDjOBcv53qGOfYQ8f4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629203216; 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=s8YE6JdscYiCP8xyKM/GEkOqvSzOJeTL+rRLPMRRo08=; b=fxfaTMOu7IUswpxcxfNDcXfDXWlTU7e6G4aLoWxACwzkd8DX3VxHkQjMUeLSf/42oHZgzLeW3P7w/uPZZgsWl5pRTJIG+MwUEy8PhrGZdObf0j0SKsdwAac5pmKtOlH3+JKgRogRfWWgeIIqncV8A46JeyEeHiYWh9TDMgWW93A= 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 1629203216922997.4252549915909; Tue, 17 Aug 2021 05:26:56 -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-386-HKy6i5_aMamuLj7yHnVRNA-1; Tue, 17 Aug 2021 08:26:53 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 70BADC744A; Tue, 17 Aug 2021 12:26:47 +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 4C2CA5DD68; Tue, 17 Aug 2021 12:26:47 +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 199744A7CA; Tue, 17 Aug 2021 12:26:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17HCPgk6018150 for ; Tue, 17 Aug 2021 08:25:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2CF9660916; Tue, 17 Aug 2021 12:25:42 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8562E60854 for ; Tue, 17 Aug 2021 12:25:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629203215; 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=s8YE6JdscYiCP8xyKM/GEkOqvSzOJeTL+rRLPMRRo08=; b=VEa/4pQRVwUFeLXjkItdHDwcJfruw3MEV/YT1MC/TD87Bf0GvexzsEI+1/iPvPCUyHIU/g pM76fHPHv/6WHUNiBqAhrlKRo+TejuXSUp54W1ZA29iZJpsazh1dt4PSmBV631hk4ftxSj 9Z0djaincMIiJioKu/AtUkolP7mEWpE= X-MC-Unique: HKy6i5_aMamuLj7yHnVRNA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/6] Use g_auto for xmlFreeDoc everywhere Date: Tue, 17 Aug 2021 14:25:31 +0200 Message-Id: <90bc34fa4726092b8e7760072fd7227f8f939177.1629203014.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.14 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629203217374100001 Signed-off-by: J=C3=A1n Tomko --- src/conf/checkpoint_conf.c | 3 +-- src/conf/cpu_conf.c | 3 +-- src/conf/domain_conf.c | 6 ++---- src/conf/interface_conf.c | 3 +-- src/conf/node_device_conf.c | 3 +-- src/conf/nwfilter_conf.c | 3 +-- src/conf/secret_conf.c | 3 +-- src/conf/snapshot_conf.c | 3 +-- src/conf/storage_conf.c | 6 ++---- src/conf/virnetworkportdef.c | 3 +-- src/conf/virnwfilterbindingdef.c | 3 +-- src/conf/virnwfilterbindingobj.c | 3 +-- src/conf/virsavecookie.c | 3 +-- src/conf/virstorageobj.c | 3 +-- src/libxl/libxl_migration.c | 3 +-- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_migration_cookie.c | 3 +-- src/security/virt-aa-helper.c | 3 +-- src/storage/storage_util.c | 3 +-- src/test/test_driver.c | 10 +++------- src/util/virxml.c | 3 +-- src/vbox/vbox_snapshot_conf.c | 12 ++++-------- src/vz/vz_driver.c | 3 +-- src/vz/vz_sdk.c | 3 +-- tests/cputest.c | 6 ++---- tests/metadatatest.c | 3 +-- tests/qemucaps2xmltest.c | 4 +--- tests/virnetdevbandwidthtest.c | 3 +-- 28 files changed, 36 insertions(+), 74 deletions(-) diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index d2041dd0ac..4731f21aba 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -213,7 +213,7 @@ virDomainCheckpointDefParseString(const char *xmlStr, unsigned int flags) { virDomainCheckpointDef *ret =3D NULL; - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; int keepBlanksDefault =3D xmlKeepBlanksDefault(0); =20 if ((xml =3D virXMLParse(NULL, xmlStr, _("(domain_checkpoint)"), @@ -221,7 +221,6 @@ virDomainCheckpointDefParseString(const char *xmlStr, xmlKeepBlanksDefault(keepBlanksDefault); ret =3D virDomainCheckpointDefParseNode(xml, xmlDocGetRootElement(= xml), xmlopt, parseOpaque, flags); - xmlFreeDoc(xml); } xmlKeepBlanksDefault(keepBlanksDefault); =20 diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index dac7af4bf4..4434120557 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -281,7 +281,7 @@ virCPUDefParseXMLString(const char *xml, virCPUDef **cpu, bool validateXML) { - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; int ret =3D -1; =20 @@ -299,7 +299,6 @@ virCPUDefParseXMLString(const char *xml, ret =3D 0; =20 cleanup: - xmlFreeDoc(doc); return ret; } =20 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 926f831073..10effdce69 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -20377,7 +20377,7 @@ virDomainDefParse(const char *xmlStr, void *parseOpaque, unsigned int flags) { - xmlDocPtr xml =3D NULL; + g_autoptr(xmlDoc) xml =3D NULL; virDomainDef *def =3D NULL; int keepBlanksDefault =3D xmlKeepBlanksDefault(0); xmlNodePtr root; @@ -20397,7 +20397,6 @@ virDomainDefParse(const char *xmlStr, def =3D virDomainDefParseNode(xml, root, xmlopt, parseOpaque, flags); =20 cleanup: - xmlFreeDoc(xml); xmlKeepBlanksDefault(keepBlanksDefault); return def; } @@ -20480,14 +20479,13 @@ virDomainObjParseFile(const char *filename, virDomainXMLOption *xmlopt, unsigned int flags) { - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; virDomainObj *obj =3D NULL; int keepBlanksDefault =3D xmlKeepBlanksDefault(0); =20 if ((xml =3D virXMLParseFile(filename))) { obj =3D virDomainObjParseNode(xml, xmlDocGetRootElement(xml), xmlopt, flags); - xmlFreeDoc(xml); } =20 xmlKeepBlanksDefault(keepBlanksDefault); diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index c4b763d0de..c371a252a8 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -821,12 +821,11 @@ static virInterfaceDef * virInterfaceDefParse(const char *xmlStr, const char *filename) { - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; virInterfaceDef *def =3D NULL; =20 if ((xml =3D virXMLParse(filename, xmlStr, _("(interface_definition)")= , NULL, false))) { def =3D virInterfaceDefParseNode(xml, xmlDocGetRootElement(xml)); - xmlFreeDoc(xml); } =20 return def; diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index bda1a11b37..b4c1acb6a5 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2174,13 +2174,12 @@ virNodeDeviceDefParse(const char *str, virNodeDeviceDefParserCallbacks *parserCallbacks, void *opaque) { - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; g_autoptr(virNodeDeviceDef) def =3D NULL; =20 if ((xml =3D virXMLParse(filename, str, _("(node_device_definition)"),= NULL, false))) { def =3D virNodeDeviceDefParseNode(xml, xmlDocGetRootElement(xml), create, virt_type); - xmlFreeDoc(xml); } =20 if (parserCallbacks) { diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index b7adae7161..7d491e27b1 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2742,11 +2742,10 @@ virNWFilterDefParse(const char *xmlStr, const char *filename) { virNWFilterDef *def =3D NULL; - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; =20 if ((xml =3D virXMLParse(filename, xmlStr, _("(nwfilter_definition)"),= NULL, false))) { def =3D virNWFilterDefParseNode(xml, xmlDocGetRootElement(xml)); - xmlFreeDoc(xml); } =20 return def; diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index 5968b4365c..ef6a4b606e 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -193,12 +193,11 @@ static virSecretDef * virSecretDefParse(const char *xmlStr, const char *filename) { - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; virSecretDef *ret =3D NULL; =20 if ((xml =3D virXMLParse(filename, xmlStr, _("(definition_of_secret)")= , NULL, false))) { ret =3D secretXMLParseNode(xml, xmlDocGetRootElement(xml)); - xmlFreeDoc(xml); } =20 return ret; diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 6d3c59f98e..c765e4c815 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -447,7 +447,7 @@ virDomainSnapshotDefParseString(const char *xmlStr, unsigned int flags) { virDomainSnapshotDef *ret =3D NULL; - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; int keepBlanksDefault =3D xmlKeepBlanksDefault(0); =20 if ((xml =3D virXMLParse(NULL, xmlStr, _("(domain_snapshot)"), "domain= snapshot.rng", @@ -456,7 +456,6 @@ virDomainSnapshotDefParseString(const char *xmlStr, ret =3D virDomainSnapshotDefParseNode(xml, xmlDocGetRootElement(xm= l), xmlopt, parseOpaque, current, flags); - xmlFreeDoc(xml); } xmlKeepBlanksDefault(keepBlanksDefault); =20 diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index e72e8d0ade..040a413d0f 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1007,11 +1007,10 @@ virStoragePoolDefParse(const char *xmlStr, const char *filename) { virStoragePoolDef *ret =3D NULL; - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; =20 if ((xml =3D virXMLParse(filename, xmlStr, _("(storage_pool_definition= )"), NULL, false))) { ret =3D virStoragePoolDefParseNode(xml, xmlDocGetRootElement(xml)); - xmlFreeDoc(xml); } =20 return ret; @@ -1476,11 +1475,10 @@ virStorageVolDefParse(virStoragePoolDef *pool, unsigned int flags) { virStorageVolDef *ret =3D NULL; - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; =20 if ((xml =3D virXMLParse(filename, xmlStr, _("(storage_volume_definiti= on)"), NULL, false))) { ret =3D virStorageVolDefParseNode(pool, xml, xmlDocGetRootElement(= xml), flags); - xmlFreeDoc(xml); } =20 return ret; diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index 8da05353b7..5e916ab2b8 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -294,11 +294,10 @@ virNetworkPortDefParse(const char *xmlStr, const char *filename) { virNetworkPortDef *def =3D NULL; - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; =20 if ((xml =3D virXMLParse(filename, xmlStr, _("(networkport_definition)= "), NULL, false))) { def =3D virNetworkPortDefParseNode(xml, xmlDocGetRootElement(xml)); - xmlFreeDoc(xml); } =20 return def; diff --git a/src/conf/virnwfilterbindingdef.c b/src/conf/virnwfilterbinding= def.c index 45fa51a56c..3428b05841 100644 --- a/src/conf/virnwfilterbindingdef.c +++ b/src/conf/virnwfilterbindingdef.c @@ -185,11 +185,10 @@ virNWFilterBindingDefParse(const char *xmlStr, const char *filename) { virNWFilterBindingDef *def =3D NULL; - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; =20 if ((xml =3D virXMLParse(filename, xmlStr, _("(nwfilterbinding_definit= ion)"), NULL, false))) { def =3D virNWFilterBindingDefParseNode(xml, xmlDocGetRootElement(x= ml)); - xmlFreeDoc(xml); } =20 return def; diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbinding= obj.c index 20f33506fd..279e334d3f 100644 --- a/src/conf/virnwfilterbindingobj.c +++ b/src/conf/virnwfilterbindingobj.c @@ -262,11 +262,10 @@ virNWFilterBindingObjParse(const char *xmlStr, const char *filename) { virNWFilterBindingObj *obj =3D NULL; - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; =20 if ((xml =3D virXMLParse(filename, xmlStr, _("(nwfilterbinding_status)= "), NULL, false))) { obj =3D virNWFilterBindingObjParseNode(xml, xmlDocGetRootElement(x= ml)); - xmlFreeDoc(xml); } =20 return obj; diff --git a/src/conf/virsavecookie.c b/src/conf/virsavecookie.c index b7e1e7df93..3bb97246af 100644 --- a/src/conf/virsavecookie.c +++ b/src/conf/virsavecookie.c @@ -79,7 +79,7 @@ virSaveCookieParseString(const char *xml, virObject **obj, virSaveCookieCallbacks *saveCookie) { - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; int ret =3D -1; =20 @@ -96,7 +96,6 @@ virSaveCookieParseString(const char *xml, ret =3D virSaveCookieParseNode(ctxt, obj, saveCookie); =20 cleanup: - xmlFreeDoc(doc); return ret; } =20 diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 91c63b2c45..f8b85494c0 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -1643,7 +1643,7 @@ virStoragePoolObjLoadState(virStoragePoolObjList *poo= ls, { char *stateFile =3D NULL; virStoragePoolObj *obj =3D NULL; - xmlDocPtr xml =3D NULL; + g_autoptr(xmlDoc) xml =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; xmlNodePtr node =3D NULL; g_autoptr(virStoragePoolDef) def =3D NULL; @@ -1687,7 +1687,6 @@ virStoragePoolObjLoadState(virStoragePoolObjList *poo= ls, =20 cleanup: VIR_FREE(stateFile); - xmlFreeDoc(xml); return obj; } =20 diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 817252bce9..a2c2b6dbde 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -148,7 +148,7 @@ libxlMigrationEatCookie(const char *cookiein, libxlMigrationCookie **migout) { libxlMigrationCookie *mig =3D NULL; - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; g_autofree char *uuidstr =3D NULL; int ret =3D -1; @@ -216,7 +216,6 @@ libxlMigrationEatCookie(const char *cookiein, libxlMigrationCookieFree(mig); =20 cleanup: - xmlFreeDoc(doc); return ret; } =20 diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index cecacb051b..535550754c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4191,7 +4191,7 @@ virQEMUCapsLoadCache(virArch hostArch, const char *filename, bool skipInvalidation) { - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; int ret =3D -1; size_t i; int n; @@ -4421,7 +4421,6 @@ virQEMUCapsLoadCache(virArch hostArch, cleanup: VIR_FREE(str); VIR_FREE(nodes); - xmlFreeDoc(doc); return ret; } =20 diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index b4081b17e2..106897cacd 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -1431,7 +1431,7 @@ qemuMigrationCookieXMLParseStr(qemuMigrationCookie *m= ig, const char *xml, unsigned int flags) { - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; int ret =3D -1; =20 @@ -1443,7 +1443,6 @@ qemuMigrationCookieXMLParseStr(qemuMigrationCookie *m= ig, ret =3D qemuMigrationCookieXMLParse(mig, driver, qemuCaps, doc, ctxt, = flags); =20 cleanup: - xmlFreeDoc(doc); =20 return ret; } diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 2ba2a4a2b8..c0bbd7414a 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -568,7 +568,7 @@ static int caps_mockup(vahControl * ctl, const char *xmlStr) { int rc =3D -1; - xmlDocPtr xml =3D NULL; + g_autoptr(xmlDoc) xml =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; char *arch; =20 @@ -607,7 +607,6 @@ caps_mockup(vahControl * ctl, const char *xmlStr) rc =3D 0; =20 cleanup: - xmlFreeDoc(xml); =20 return rc; } diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 1beff7726a..7ee736535c 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -2892,7 +2892,7 @@ virStorageUtilGlusterExtractPoolSources(const char *h= ost, virStoragePoolSourceList *list, virStoragePoolType pooltype) { - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; virStoragePoolSource *src =3D NULL; size_t i; @@ -2940,7 +2940,6 @@ virStorageUtilGlusterExtractPoolSources(const char *h= ost, ret =3D nnodes; =20 cleanup: - xmlFreeDoc(doc); =20 return ret; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 6bb52e9302..b096d49ac6 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -825,7 +825,7 @@ static xmlNodePtr testParseXMLDocFromFile(xmlNodePtr node, const char *file, const char *typ= e) { xmlNodePtr ret =3D NULL; - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autofree char *absFile =3D NULL; g_autofree char *relFile =3D NULL; =20 @@ -848,7 +848,6 @@ testParseXMLDocFromFile(xmlNodePtr node, const char *fi= le, const char *type) } =20 error: - xmlFreeDoc(doc); return ret; } =20 @@ -1333,7 +1332,7 @@ testOpenParse(testDriver *privconn, static int testOpenFromFile(virConnectPtr conn, const char *file) { - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; testDriver *privconn; =20 @@ -1355,13 +1354,11 @@ testOpenFromFile(virConnectPtr conn, const char *fi= le) if (testOpenParse(privconn, file, ctxt) < 0) goto error; =20 - xmlFreeDoc(doc); virObjectUnlock(privconn); =20 return VIR_DRV_OPEN_SUCCESS; =20 error: - xmlFreeDoc(doc); virObjectUnref(privconn); conn->privateData =3D NULL; return VIR_DRV_OPEN_ERROR; @@ -1375,7 +1372,7 @@ testOpenDefault(virConnectPtr conn) { int ret =3D VIR_DRV_OPEN_ERROR; testDriver *privconn =3D NULL; - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; size_t i; =20 @@ -1424,7 +1421,6 @@ testOpenDefault(virConnectPtr conn) ret =3D VIR_DRV_OPEN_SUCCESS; cleanup: virMutexUnlock(&defaultLock); - xmlFreeDoc(doc); return ret; =20 error: diff --git a/src/util/virxml.c b/src/util/virxml.c index 61e3d91640..b736d59d9c 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -1619,12 +1619,11 @@ int virXMLValidateNodeAgainstSchema(const char *schemafile, xmlNodePtr node) { int ret; - xmlDocPtr copy =3D xmlNewDoc(NULL); + g_autoptr(xmlDoc) copy =3D xmlNewDoc(NULL); =20 xmlDocSetRootElement(copy, xmlCopyNode(node, true)); ret =3D virXMLValidateAgainstSchema(schemafile, copy); =20 - xmlFreeDoc(copy); return ret; } =20 diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index 0f30aef108..65546b785e 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -575,7 +575,7 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath, { int ret =3D -1; virVBoxSnapshotConfMachine *machineDescription =3D NULL; - xmlDocPtr xml =3D NULL; + g_autoptr(xmlDoc) xml =3D NULL; xmlNodePtr machineNode =3D NULL; xmlNodePtr cur =3D NULL; g_autoptr(xmlXPathContext) xPathContext =3D NULL; @@ -716,7 +716,6 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath, ret =3D 0; =20 cleanup: - xmlFreeDoc(xml); =20 VIR_FREE(currentStateModifiedString); VIR_FREE(currentSnapshotAttribute); @@ -954,7 +953,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMach= ine *machine, { int ret =3D -1; size_t i =3D 0; - xmlDocPtr xml =3D NULL; + g_autoptr(xmlDoc) xml =3D NULL; xmlNodePtr mediaRegistryNode =3D NULL; xmlNodePtr snapshotNode =3D NULL; xmlNodePtr machineNode =3D NULL; @@ -1172,7 +1171,6 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMa= chine *machine, xmlUnlinkNode(machineNode); xmlFreeNode(machineNode); =20 - xmlFreeDoc(xml); =20 g_strfreev(firstRegex); g_strfreev(secondRegex); @@ -1219,7 +1217,7 @@ virVBoxSnapshotConfGetRWDisksPathsFromLibvirtXML(cons= t char *filePath, int result =3D -1; size_t i =3D 0; char **ret =3D NULL; - xmlDocPtr xml =3D NULL; + g_autoptr(xmlDoc) xml =3D NULL; g_autoptr(xmlXPathContext) xPathContext =3D NULL; xmlNodePtr *nodes =3D NULL; int nodeSize =3D 0; @@ -1258,7 +1256,6 @@ virVBoxSnapshotConfGetRWDisksPathsFromLibvirtXML(cons= t char *filePath, result =3D 0; =20 cleanup: - xmlFreeDoc(xml); if (result < 0) { g_strfreev(ret); nodeSize =3D -1; @@ -1281,7 +1278,7 @@ virVBoxSnapshotConfGetRODisksPathsFromLibvirtXML(cons= t char *filePath, int result =3D -1; size_t i =3D 0; char **ret =3D NULL; - xmlDocPtr xml =3D NULL; + g_autoptr(xmlDoc) xml =3D NULL; g_autoptr(xmlXPathContext) xPathContext =3D NULL; xmlNodePtr *nodes =3D NULL; int nodeSize =3D 0; @@ -1319,7 +1316,6 @@ virVBoxSnapshotConfGetRODisksPathsFromLibvirtXML(cons= t char *filePath, result =3D 0; =20 cleanup: - xmlFreeDoc(xml); if (result < 0) { g_strfreev(ret); nodeSize =3D -1; diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index edc4327550..9eba9d47fb 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2789,7 +2789,7 @@ vzBakeCookie(struct _vzDriver *driver, static vzMigrationCookie * vzEatCookie(const char *cookiein, int cookieinlen, unsigned int flags) { - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctx =3D NULL; vzMigrationCookie *mig =3D NULL; =20 @@ -2838,7 +2838,6 @@ vzEatCookie(const char *cookiein, int cookieinlen, un= signed int flags) } =20 cleanup: - xmlFreeDoc(doc); return mig; =20 error: diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 5a747913b5..2ba48134b0 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -4578,7 +4578,7 @@ static virDomainSnapshotObjList * prlsdkParseSnapshotTree(const char *treexml) { virDomainSnapshotObjList *ret =3D NULL; - xmlDocPtr xml =3D NULL; + g_autoptr(xmlDoc) xml =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; xmlNodePtr root; xmlNodePtr *nodes =3D NULL; @@ -4696,7 +4696,6 @@ prlsdkParseSnapshotTree(const char *treexml) virDomainSnapshotObjListFree(snapshots); VIR_FREE(nodes); VIR_FREE(xmlstr); - xmlFreeDoc(xml); VIR_FREE(def); =20 return ret; diff --git a/tests/cputest.c b/tests/cputest.c index 34d9e8ddb0..d19ded4b40 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -71,7 +71,7 @@ static virCPUDef * cpuTestLoadXML(virArch arch, const char *name) { char *xml =3D NULL; - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; virCPUDef *cpu =3D NULL; =20 @@ -84,7 +84,6 @@ cpuTestLoadXML(virArch arch, const char *name) virCPUDefParseXML(ctxt, NULL, VIR_CPU_TYPE_AUTO, &cpu, false); =20 cleanup: - xmlFreeDoc(doc); VIR_FREE(xml); return cpu; } @@ -96,7 +95,7 @@ cpuTestLoadMultiXML(virArch arch, unsigned int *count) { char *xml =3D NULL; - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; xmlNodePtr *nodes =3D NULL; virCPUDef **cpus =3D NULL; @@ -129,7 +128,6 @@ cpuTestLoadMultiXML(virArch arch, cleanup: VIR_FREE(xml); VIR_FREE(nodes); - xmlFreeDoc(doc); return cpus; =20 cleanup_cpus: diff --git a/tests/metadatatest.c b/tests/metadatatest.c index ceb683028c..2bcb0a1225 100644 --- a/tests/metadatatest.c +++ b/tests/metadatatest.c @@ -56,7 +56,7 @@ static const char metadata2_ns[] =3D static char * getMetadataFromXML(virDomainPtr dom) { - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; xmlNodePtr node; =20 @@ -76,7 +76,6 @@ getMetadataFromXML(virDomainPtr dom) =20 cleanup: VIR_FREE(xml); - xmlFreeDoc(doc); =20 return ret; } diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 35eb27c1fb..ce1116b792 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -51,7 +51,7 @@ static virQEMUCaps * testQemuGetCaps(char *caps) { virQEMUCaps *qemuCaps =3D NULL; - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; ssize_t i, n; g_autofree xmlNodePtr *nodes =3D NULL; @@ -79,12 +79,10 @@ testQemuGetCaps(char *caps) } } =20 - xmlFreeDoc(xml); return qemuCaps; =20 error: virObjectUnref(qemuCaps); - xmlFreeDoc(xml); return NULL; } =20 diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c index 51ceae5a6a..83e7b2089f 100644 --- a/tests/virnetdevbandwidthtest.c +++ b/tests/virnetdevbandwidthtest.c @@ -42,7 +42,7 @@ struct testSetStruct { #define PARSE(xml, var) \ do { \ int rc; \ - xmlDocPtr doc; \ + g_autoptr(xmlDoc) doc =3D NULL; \ g_autoptr(xmlXPathContext) ctxt =3D NULL; \ \ if (!xml) \ @@ -57,7 +57,6 @@ struct testSetStruct { NULL, \ ctxt->node, \ true); \ - xmlFreeDoc(doc); \ if (rc < 0) \ goto cleanup; \ } while (0) --=20 2.31.1