From nobody Sun Feb 8 07:21:35 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1596473863; cv=none; d=zohomail.com; s=zohoarc; b=geQYIPwDONcPk9bx3e0OA8NPbcim4U84RZihEPpP3LkaitL3NqhkKTptYsCuz9dSzYb4CbKWzK8Fcyi/eyGvEEL55QZ7dk3d9XIYOXmHrS521lbnPPxhGagqi+BE4qz9B8BHWvnGcuVYbyRvF0fVGo8kAkT+3gyBXhOEPWMqzbs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473863; 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=Z61C0YoEx6wqH677eln8qsJ+wFSHBj+dpfB+OhoZEYw=; b=gB1E3o++JDkB/rvsBwiH6ingiSYP46+g0Xer3mWJyzKRMWz714g47JMt6U9oLXS0IrFmxPPZPLd4kQyee4Elq1s1XGlUNBNd1D/XCvMz6GnbeO/Y+zJS455abDkphEDgxSxhJOA8OIGbm+VgA6chkbVHoDmM9wLK2dgkd/WGYtQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1596473863141293.10497551577896; Mon, 3 Aug 2020 09:57:43 -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-417-F4Y-sO7MPemqvFwf1LsNNg-1; Mon, 03 Aug 2020 12:57:38 -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 DF16280046B; Mon, 3 Aug 2020 16:57:31 +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 BD93B90E81; Mon, 3 Aug 2020 16:57:31 +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 8D45D9A11F; Mon, 3 Aug 2020 16:57:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073GvThb007857 for ; Mon, 3 Aug 2020 12:57:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id AAC1371775; Mon, 3 Aug 2020 16:57:29 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id C37B471770 for ; Mon, 3 Aug 2020 16:57:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473861; 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=Z61C0YoEx6wqH677eln8qsJ+wFSHBj+dpfB+OhoZEYw=; b=PgM+dguqvVOvAGogmma1Bht3YYJXUUg7FowKmZnVTvW1gVpP7eyIvFL6dLmO/rBAV5r5U6 IcEK6Pl/WSohhExTG8KDuGf48+MO2JdMLXX545bLW0KuBhpgppTdm12egBd3f5YfaPTX2R PJs/GA9C0k0ICPCxw2LUOuV99RhslhU= X-MC-Unique: F4Y-sO7MPemqvFwf1LsNNg-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH RFC 16/19] VIR_XPATH_NODE_AUTORESTORE: remove semicolon from users Date: Mon, 3 Aug 2020 18:56:53 +0200 Message-Id: <00498568eb6844bd190e2ddc2ccf10f1c391c52a.1596473604.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.13 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) Since the macro no longer includes the 'ignore_value' statement, stop putting another empty statement after it. Signed-off-by: J=C3=A1n Tomko --- src/conf/backup_conf.c | 2 +- src/conf/checkpoint_conf.c | 2 +- src/conf/cpu_conf.c | 2 +- src/conf/domain_conf.c | 109 ++++++++++++++++--------------- src/conf/interface_conf.c | 8 +-- src/conf/netdev_vlan_conf.c | 2 +- src/conf/network_conf.c | 14 ++-- src/conf/networkcommon_conf.c | 2 +- src/conf/node_device_conf.c | 34 +++++----- src/conf/numa_conf.c | 6 +- src/conf/snapshot_conf.c | 2 +- src/conf/storage_adapter_conf.c | 2 +- src/conf/storage_conf.c | 2 +- src/conf/virsavecookie.c | 2 +- src/cpu/cpu_map.c | 4 +- src/cpu/cpu_x86.c | 2 +- src/lxc/lxc_domain.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_domain.c | 6 +- src/qemu/qemu_domainjob.c | 4 +- src/qemu/qemu_migration_cookie.c | 6 +- src/util/virstorageencryption.c | 4 +- src/util/virstoragefile.c | 2 +- 23 files changed, 111 insertions(+), 110 deletions(-) diff --git a/src/conf/backup_conf.c b/src/conf/backup_conf.c index 02319f7245..5caba621d8 100644 --- a/src/conf/backup_conf.c +++ b/src/conf/backup_conf.c @@ -102,7 +102,7 @@ virDomainBackupDiskDefParseXML(xmlNodePtr node, unsigned int flags, virDomainXMLOptionPtr xmlopt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *type =3D NULL; g_autofree char *driver =3D NULL; g_autofree char *backup =3D NULL; diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 1f935952c8..914af4305d 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -96,7 +96,7 @@ virDomainCheckpointDiskDefParseXML(xmlNodePtr node, virDomainCheckpointDiskDefPtr def) { g_autofree char *checkpoint =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 ctxt->node =3D node; =20 diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index fcc1ab6814..dea950ce68 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -327,7 +327,7 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt, { g_autoptr(virCPUDef) def =3D NULL; g_autofree xmlNodePtr *nodes =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int n; size_t i; g_autofree char *cpuMode =3D NULL; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 570812cefb..9a9211460c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8305,7 +8305,7 @@ virDomainHostdevSubsysSCSIiSCSIDefParseXML(xmlNodePtr= sourcenode, virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc =3D &def->u.iscsi; g_autoptr(virStorageAuthDef) authdef =3D NULL; xmlNodePtr node; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 ctxt->node =3D sourcenode; =20 @@ -8793,7 +8793,7 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt) { virNetDevCoalescePtr ret =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) unsigned long long tmp =3D 0; g_autofree char *str =3D NULL; =20 @@ -9164,7 +9164,7 @@ virSecurityLabelDefsParseXML(virDomainDefPtr def, virDomainXMLOptionPtr xmlopt, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) size_t i =3D 0, j; int n; g_autofree xmlNodePtr *list =3D NULL; @@ -9262,7 +9262,7 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLa= belDefPtr **seclabels_rtn, xmlXPathContextPtr ctxt, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virSecurityDeviceLabelDefPtr *seclabels =3D NULL; size_t nseclabels =3D 0; int n; @@ -9458,7 +9458,7 @@ static virStorageNetCookieDefPtr virDomainStorageNetCookieParse(xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autoptr(virStorageNetCookieDef) cookie =3D NULL; =20 ctxt->node =3D node; @@ -9485,7 +9485,7 @@ virDomainStorageNetCookiesParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virStorageSourcePtr src) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree xmlNodePtr *nodes =3D NULL; ssize_t nnodes; size_t i; @@ -9702,7 +9702,7 @@ virDomainDiskSourcePRParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virStoragePRDefPtr *pr) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 ctxt->node =3D node; =20 @@ -9757,7 +9757,7 @@ static virStorageSourceSlicePtr virDomainStorageSourceParseSlice(xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *offset =3D NULL; g_autofree char *size =3D NULL; g_autofree virStorageSourceSlicePtr ret =3D g_new0(virStorageSourceSli= ce, 1); @@ -9823,7 +9823,7 @@ virDomainStorageSourceParse(xmlNodePtr node, unsigned int flags, virDomainXMLOptionPtr xmlopt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr tmp; =20 ctxt->node =3D node; @@ -9901,7 +9901,7 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctx= t, unsigned int flags, virDomainXMLOptionPtr xmlopt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr source; g_autoptr(virStorageSource) backingStore =3D NULL; g_autofree char *type =3D NULL; @@ -10039,7 +10039,7 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def, virDomainXMLOptionPtr xmlopt) { xmlNodePtr mirrorNode; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *mirrorFormat =3D NULL; g_autofree char *mirrorType =3D NULL; g_autofree char *ready =3D NULL; @@ -10408,7 +10408,7 @@ virDomainDiskDefParsePrivateData(xmlXPathContextPtr= ctxt, virDomainXMLOptionPtr xmlopt) { xmlNodePtr private_node =3D virXPathNode("./privateData", ctxt); - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 if (!xmlopt || !xmlopt->privateData.diskParse || @@ -10435,7 +10435,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlo= pt, { virDomainDiskDefPtr def; xmlNodePtr cur; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) bool source =3D false; virStorageEncryptionPtr encryption =3D NULL; g_autoptr(virStorageAuthDef) authdef =3D NULL; @@ -11038,7 +11038,7 @@ virDomainControllerDefParseXML(virDomainXMLOptionPt= r xmlopt, bool processedTarget =3D false; int numaNode =3D -1; int ports =3D -1; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int rc; g_autofree char *typeStr =3D NULL; g_autofree char *idx =3D NULL; @@ -11424,7 +11424,7 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt, xmlXPathContextPtr ctxt, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainFSDefPtr def; xmlNodePtr cur; g_autofree char *type =3D NULL; @@ -11676,7 +11676,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node, { virDomainActualNetDefPtr actual =3D NULL; int ret =3D -1; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr bandwidth_node =3D NULL; xmlNodePtr vlanNode; xmlNodePtr virtPortNode; @@ -11876,7 +11876,7 @@ virDomainChrSourceReconnectDefParseXML(virDomainChr= SourceReconnectDefPtr def, xmlXPathContextPtr ctxt) { int tmpVal; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr cur; g_autofree char *tmp =3D NULL; =20 @@ -11927,7 +11927,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop= t, xmlNodePtr tmpNode; virHashTablePtr filterparams =3D NULL; virDomainActualNetDefPtr actual =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainChrSourceReconnectDef reconnect =3D {0}; int rv, val; g_autofree char *macaddr =3D NULL; @@ -13255,7 +13255,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef= Ptr def, =20 /* Check for an optional seclabel override in . */ if (chr_def) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) ctxt->node =3D cur; if (virSecurityDeviceLabelDefParseXML(&def->seclabels, &def->nseclabels, @@ -13632,7 +13632,7 @@ virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlop= t, unsigned int flags) { virDomainTPMDefPtr def; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int nbackends; g_autofree char *path =3D NULL; g_autofree char *model =3D NULL; @@ -13765,7 +13765,7 @@ virDomainInputDefParseXML(virDomainXMLOptionPtr xml= opt, xmlXPathContextPtr ctxt, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainInputDefPtr def; g_autofree char *evdev =3D NULL; g_autofree char *type =3D NULL; @@ -13960,7 +13960,7 @@ virDomainTimerDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt) { virDomainTimerDefPtr def; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr catchup; int ret; g_autofree char *name =3D NULL; @@ -14307,7 +14307,7 @@ virDomainGraphicsListensParseXML(virDomainGraphicsD= efPtr def, xmlXPathContextPtr ctxt, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainGraphicsListenDef newListen =3D {0}; int nListens; int ret =3D -1; @@ -14464,7 +14464,7 @@ virDomainGraphicsDefParseXMLSDL(virDomainGraphicsDe= fPtr def, xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int enableVal; xmlNodePtr glNode; g_autofree char *fullscreen =3D virXMLPropString(node, "fullscreen"); @@ -14853,7 +14853,7 @@ virDomainGraphicsDefParseXMLEGLHeadless(virDomainGr= aphicsDefPtr def, xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr glNode; =20 ctxt->node =3D node; @@ -14998,7 +14998,7 @@ virDomainSoundDefParseXML(virDomainXMLOptionPtr xml= opt, unsigned int flags) { virDomainSoundDefPtr def; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *model =3D NULL; =20 if (VIR_ALLOC(def) < 0) @@ -15146,7 +15146,7 @@ virDomainRNGDefParseXML(virDomainXMLOptionPtr xmlop= t, unsigned int flags) { virDomainRNGDefPtr def; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int nbackends; g_autofree xmlNodePtr *backends =3D NULL; g_autofree char *model =3D NULL; @@ -15259,7 +15259,7 @@ virDomainMemballoonDefParseXML(virDomainXMLOptionPt= r xmlopt, unsigned int flags) { virDomainMemballoonDefPtr def; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) unsigned int period =3D 0; g_autofree char *model =3D NULL; g_autofree char *deflate =3D NULL; @@ -15344,7 +15344,7 @@ virDomainShmemDefParseXML(virDomainXMLOptionPtr xml= opt, virDomainShmemDefPtr def =3D NULL; virDomainShmemDefPtr ret =3D NULL; xmlNodePtr msi =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr server =3D NULL; g_autofree char *tmp =3D NULL; =20 @@ -15447,7 +15447,7 @@ virSysinfoBIOSParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virSysinfoBIOSDefPtr *bios) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; virSysinfoBIOSDefPtr def; =20 @@ -15510,7 +15510,7 @@ virSysinfoSystemParseXML(xmlNodePtr node, unsigned char *domUUID, bool uuid_generated) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; virSysinfoSystemDefPtr def; g_autofree char *tmpUUID =3D NULL; @@ -15584,7 +15584,7 @@ virSysinfoBaseBoardParseXML(xmlXPathContextPtr ctxt, size_t *nbaseBoard) { size_t i, nboards =3D 0; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int n; g_autofree virSysinfoBaseBoardDefPtr boards =3D NULL; g_autofree xmlNodePtr *nodes =3D NULL; @@ -15633,7 +15633,7 @@ virSysinfoOEMStringsParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virSysinfoOEMStringsDefPtr *oem) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; virSysinfoOEMStringsDefPtr def; int nstrings; @@ -15671,7 +15671,7 @@ virSysinfoChassisParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virSysinfoChassisDefPtr *chassisdef) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; virSysinfoChassisDefPtr def; =20 @@ -15757,7 +15757,7 @@ virSysinfoParseFWCfgDef(virSysinfoDefPtr def, xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree xmlNodePtr *nodes =3D NULL; int n; size_t i; @@ -15816,7 +15816,7 @@ virSysinfoParseXML(xmlNodePtr node, unsigned char *domUUID, bool uuid_generated) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virSysinfoDefPtr def; g_autofree char *typeStr =3D NULL; int type; @@ -16029,7 +16029,7 @@ virDomainVideoDefParseXML(virDomainXMLOptionPtr xml= opt, { virDomainVideoDefPtr def; xmlNodePtr cur; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *type =3D NULL; g_autofree char *driver_name =3D NULL; g_autofree char *heads =3D NULL; @@ -16184,7 +16184,7 @@ virDomainHostdevDefParseXML(virDomainXMLOptionPtr x= mlopt, unsigned int flags) { virDomainHostdevDefPtr def; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *mode =3D virXMLPropString(node, "mode"); g_autofree char *type =3D virXMLPropString(node, "type"); =20 @@ -16448,7 +16448,7 @@ virDomainRedirFilterDefParseXML(xmlNodePtr node, { int n; size_t i; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainRedirFilterDefPtr def =3D NULL; g_autofree xmlNodePtr *nodes =3D NULL; =20 @@ -16586,7 +16586,7 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virDomainMemoryDefPtr def) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *nodemask =3D NULL; =20 ctxt->node =3D node; @@ -16640,10 +16640,11 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virDomainMemoryDefPtr def) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); - ctxt->node =3D node; + VIR_XPATH_NODE_AUTORESTORE(ctxt) int rv; =20 + ctxt->node =3D node; + /* initialize to value which marks that the user didn't specify it */ def->targetNode =3D -1; =20 @@ -16687,7 +16688,7 @@ static virDomainSEVDefPtr virDomainSEVDefParseXML(xmlNodePtr sevNode, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainSEVDefPtr def; unsigned long policy; g_autofree char *type =3D NULL; @@ -16753,7 +16754,7 @@ virDomainMemoryDefParseXML(virDomainXMLOptionPtr xm= lopt, const virDomainDef *dom, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr node; virDomainMemoryDefPtr def; int val; @@ -16848,7 +16849,7 @@ static virDomainIOMMUDefPtr virDomainIOMMUDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr driver; int val; g_autofree char *tmp =3D NULL; @@ -16928,7 +16929,7 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr xml= opt, xmlXPathContextPtr ctxt, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr cid; int val; g_autofree char *tmp =3D NULL; @@ -18851,7 +18852,7 @@ virDomainIdmapDefParseXML(xmlXPathContextPtr ctxt, { size_t i; virDomainIdMapEntryPtr idmap =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 if (VIR_ALLOC_N(idmap, num) < 0) return idmap; @@ -19250,7 +19251,7 @@ virDomainHugepagesParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virDomainHugePagePtr hugepage) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *nodeset =3D NULL; =20 ctxt->node =3D node; @@ -19285,7 +19286,7 @@ static virDomainResourceDefPtr virDomainResourceDefParse(xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainResourceDefPtr def =3D NULL; =20 ctxt->node =3D node; @@ -20462,7 +20463,7 @@ virDomainCachetuneDefParseCache(xmlXPathContextPtr = ctxt, xmlNodePtr node, virResctrlAllocPtr alloc) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) unsigned int level; unsigned int cache; int type; @@ -20606,7 +20607,7 @@ virDomainResctrlMonDefParse(virDomainDefPtr def, virDomainResctrlDefPtr resctrl) { virDomainResctrlMonDefPtr domresmon =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) unsigned int level =3D 0; size_t i =3D 0; int n =3D 0; @@ -20760,7 +20761,7 @@ virDomainCachetuneDefParse(virDomainDefPtr def, xmlNodePtr node, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainResctrlDefPtr resctrl =3D NULL; ssize_t i =3D 0; int n; @@ -20902,7 +20903,7 @@ virDomainMemorytuneDefParseMemory(xmlXPathContextPt= r ctxt, xmlNodePtr node, virResctrlAllocPtr alloc) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) unsigned int id; unsigned int bandwidth; g_autofree char *tmp =3D NULL; @@ -20948,7 +20949,7 @@ virDomainMemorytuneDefParse(virDomainDefPtr def, xmlNodePtr node, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainResctrlDefPtr resctrl =3D NULL; virDomainResctrlDefPtr newresctrl =3D NULL; g_autoptr(virBitmap) vcpus =3D NULL; diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 76f7054721..1e478ac075 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -262,7 +262,7 @@ static int virInterfaceDefParseDhcp(virInterfaceProtocolDefPtr def, xmlNodePtr dhcp, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) char *tmp; int ret =3D 0; =20 @@ -424,7 +424,7 @@ static int virInterfaceDefParseIfAdressing(virInterfaceDefPtr def, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr *protoNodes =3D NULL; int nProtoNodes, pp, ret =3D -1; char *tmp; @@ -553,7 +553,7 @@ virInterfaceDefParseBondItfs(virInterfaceDefPtr def, xmlXPathContextPtr ctxt) { xmlNodePtr *interfaces =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virInterfaceDefPtr itf; int nbItf; size_t i; @@ -692,7 +692,7 @@ virInterfaceDefParseXML(xmlXPathContextPtr ctxt, virInterfaceDefPtr def; int type; char *tmp; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr lnk; =20 =20 diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index 7830a341b2..493708fee1 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -33,7 +33,7 @@ int virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlan= Ptr def) { int ret =3D -1; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) char *trunk =3D NULL; char *nativeMode =3D NULL; xmlNodePtr *tagNodes =3D NULL; diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index d9a198a372..2547ae57c0 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -779,7 +779,7 @@ virNetworkDNSSrvDefParseXML(const char *networkName, bool partialOkay) { int ret; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 ctxt->node =3D node; =20 @@ -937,7 +937,7 @@ virNetworkDNSDefParseXML(const char *networkName, g_autofree char *enable =3D NULL; int nhosts, nsrvs, ntxts, nfwds; size_t i; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 ctxt->node =3D node; =20 @@ -1081,7 +1081,7 @@ virNetworkIPDefParseXML(const char *networkName, * On failure clear it out, but don't free it. */ =20 - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr dhcp; g_autofree char *address =3D NULL; g_autofree char *netmask =3D NULL; @@ -1252,7 +1252,7 @@ virNetworkPortGroupParseXML(virPortGroupDefPtr def, * On failure clear it out, but don't free it. */ =20 - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr virtPortNode; xmlNodePtr vlanNode; xmlNodePtr bandwidth_node; @@ -1322,7 +1322,7 @@ virNetworkForwardNatDefParseXML(const char *networkNa= me, g_autofree char *addrStart =3D NULL; g_autofree char *addrEnd =3D NULL; g_autofree char *ipv6 =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 ctxt->node =3D node; =20 @@ -1460,7 +1460,7 @@ virNetworkForwardDefParseXML(const char *networkName, g_autofree char *forwardManaged =3D NULL; g_autofree char *forwardDriverName =3D NULL; g_autofree char *type =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 ctxt->node =3D node; =20 @@ -1699,7 +1699,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, xmlNodePtr forwardNode =3D NULL; g_autofree char *ipv6nogwStr =3D NULL; g_autofree char *trustGuestRxFilters =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr bandwidthNode =3D NULL; xmlNodePtr vlanNode; xmlNodePtr metadataNode =3D NULL; diff --git a/src/conf/networkcommon_conf.c b/src/conf/networkcommon_conf.c index a4f9ce5c62..2e51c80174 100644 --- a/src/conf/networkcommon_conf.c +++ b/src/conf/networkcommon_conf.c @@ -228,7 +228,7 @@ virNetDevIPRouteParseXML(const char *errorDetail, */ =20 virNetDevIPRoutePtr def =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) char *family =3D NULL; char *address =3D NULL, *netmask =3D NULL; char *gateway =3D NULL; diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 79f3f67a1a..5a05f738aa 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -717,7 +717,7 @@ virNodeDevCapDRMParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapDRMPtr drm) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1, val; char *type =3D NULL; =20 @@ -746,7 +746,7 @@ virNodeDevCapCCWParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapCCWPtr ccw_dev) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; char *cssid =3D NULL, *ssid =3D NULL, *devno =3D NULL; =20 @@ -807,7 +807,7 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapStoragePtr storage) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr *nodes =3D NULL; size_t i; int n, ret =3D -1; @@ -900,7 +900,7 @@ virNodeDevCapSCSIParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapSCSIPtr scsi) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; =20 ctxt->node =3D node; @@ -943,7 +943,7 @@ virNodeDevCapSCSITargetParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapSCSITargetPtr scsi_target) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr *nodes =3D NULL; int ret =3D -1, n =3D 0; size_t i; @@ -1019,7 +1019,7 @@ virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt, int create, const char *virt_type) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr *nodes =3D NULL; int ret =3D -1, n =3D 0; size_t i; @@ -1119,7 +1119,7 @@ virNodeDevCapNetParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapNetPtr net) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr lnk; size_t i =3D -1; int ret =3D -1, n =3D -1; @@ -1197,7 +1197,7 @@ virNodeDevCapUSBInterfaceParseXML(xmlXPathContextPtr = ctxt, xmlNodePtr node, virNodeDevCapUSBIfPtr usb_if) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; =20 ctxt->node =3D node; @@ -1264,7 +1264,7 @@ virNodeDevCapUSBDevParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapUSBDevPtr usb_dev) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; =20 ctxt->node =3D node; @@ -1307,7 +1307,7 @@ virNodeDevCapPCIDevIommuGroupParseXML(xmlXPathContext= Ptr ctxt, xmlNodePtr iommuGroupNode, virNodeDevCapPCIDevPtr pci_dev) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr *addrNodes =3D NULL; char *numberStr =3D NULL; int nAddrNodes, ret =3D -1; @@ -1363,7 +1363,7 @@ virPCIEDeviceInfoLinkParseXML(xmlXPathContextPtr ctxt, xmlNodePtr linkNode, virPCIELinkPtr lnk) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1, speed; char *speedStr =3D NULL, *portStr =3D NULL; =20 @@ -1409,7 +1409,7 @@ virPCIEDeviceInfoParseXML(xmlXPathContextPtr ctxt, xmlNodePtr pciExpressNode, virPCIEDeviceInfoPtr pci_express) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr lnk; int ret =3D -1; =20 @@ -1579,7 +1579,7 @@ virNodeDevPCICapabilityParseXML(xmlXPathContextPtr ct= xt, virNodeDevCapPCIDevPtr pci_dev) { char *type =3D virXMLPropString(node, "type"); - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; =20 ctxt->node =3D node; @@ -1618,7 +1618,7 @@ virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapPCIDevPtr pci_dev) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr iommuGroupNode; xmlNodePtr pciExpress; xmlNodePtr *nodes =3D NULL; @@ -1733,7 +1733,7 @@ virNodeDevCapSystemParseXML(xmlXPathContextPtr ctxt, { virNodeDevCapSystemHardwarePtr hardware =3D &syscap->hardware; virNodeDevCapSystemFirmwarePtr firmware =3D &syscap->firmware; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; char *tmp; =20 @@ -1774,7 +1774,7 @@ virNodeDevCapMdevAttributeParseXML(xmlXPathContextPtr= ctxt, xmlNodePtr node, virNodeDevCapMdevPtr mdev) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autoptr(virMediatedDeviceAttr) attr =3D virMediatedDeviceAttrNew(); =20 ctxt->node =3D node; @@ -1797,7 +1797,7 @@ virNodeDevCapMdevParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapMdevPtr mdev) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; int nattrs =3D 0; g_autofree xmlNodePtr *attrs =3D NULL; diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 50d57ba8f6..6a12495cf2 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -910,7 +910,7 @@ virDomainNumaDefNodeCacheParseXML(virDomainNumaPtr def, def->mem_nodes[cur_cell].caches =3D g_new0(virDomainNumaCache, n); =20 for (i =3D 0; i < n; i++) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainNumaCachePtr cache =3D &def->mem_nodes[cur_cell].caches[i= ]; g_autofree char *tmp =3D NULL; unsigned int level; @@ -1010,7 +1010,7 @@ virDomainNumaDefParseXML(virDomainNumaPtr def, def->nmem_nodes =3D n; =20 for (i =3D 0; i < n; i++) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int rc; unsigned int cur_cell =3D i; =20 @@ -1134,7 +1134,7 @@ virDomainNumaDefParseXML(virDomainNumaPtr def, } VIR_FREE(tmp); } else if (virXMLNodeNameEqual(nodes[i], "bandwidth")) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) type =3D VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH; =20 ctxt->node =3D nodes[i]; diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 07336e914f..1ee63b9141 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -144,7 +144,7 @@ virDomainSnapshotDiskDefParseXML(xmlNodePtr node, char *type =3D NULL; char *driver =3D NULL; xmlNodePtr cur; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 ctxt->node =3D node; =20 diff --git a/src/conf/storage_adapter_conf.c b/src/conf/storage_adapter_con= f.c index 015e572630..77ecb8d5f2 100644 --- a/src/conf/storage_adapter_conf.c +++ b/src/conf/storage_adapter_conf.c @@ -178,7 +178,7 @@ virStorageAdapterParseXML(virStorageAdapterPtr adapter, xmlXPathContextPtr ctxt) { int ret =3D -1; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) char *adapter_type =3D NULL; =20 ctxt->node =3D node; diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index fac5ff7b86..001f4f2bdd 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -727,7 +727,7 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, { long long val; int ret =3D -1; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr node; g_autofree char *mode =3D NULL; =20 diff --git a/src/conf/virsavecookie.c b/src/conf/virsavecookie.c index d8c51ce0ef..eeca61f351 100644 --- a/src/conf/virsavecookie.c +++ b/src/conf/virsavecookie.c @@ -57,7 +57,7 @@ virSaveCookieParse(xmlXPathContextPtr ctxt, virObjectPtr *obj, virSaveCookieCallbacksPtr saveCookie) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; =20 *obj =3D NULL; diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c index d14488f8aa..913e34a067 100644 --- a/src/cpu/cpu_map.c +++ b/src/cpu/cpu_map.c @@ -40,7 +40,7 @@ loadData(const char *mapfile, void *data) { int ret =3D -1; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr *nodes =3D NULL; int n; size_t i; @@ -130,7 +130,7 @@ loadIncludes(xmlXPathContextPtr ctxt, void *data) { int ret =3D -1; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr *nodes =3D NULL; int n; size_t i; diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 1e5cd93abb..0a53e6968a 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1486,7 +1486,7 @@ x86ModelParseSignatures(virCPUx86ModelPtr model, xmlXPathContextPtr ctxt) { g_autofree xmlNodePtr *nodes =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) size_t i; int n; =20 diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index d75942667c..d8aebe06d9 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -207,7 +207,7 @@ lxcDomainDefNamespaceParse(xmlXPathContextPtr ctxt, lxcDomainDefPtr lxcDef =3D g_new0(lxcDomainDef, 1); g_autofree xmlNodePtr *nodes =3D NULL; bool uses_lxc_ns =3D false; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int feature; int n; size_t i; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 589f2eda58..ebfbbcc296 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3822,7 +3822,7 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsAccelPtr c= aps, char *str =3D NULL; xmlNodePtr hostCPUNode; xmlNodePtr *nodes =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) qemuMonitorCPUModelInfoPtr hostCPU =3D NULL; g_autofree char *xpath =3D g_strdup_printf("./hostCPU[@type=3D'%s']", = typeStr); int ret =3D -1; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 56999c2c46..a74f0d121f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2520,7 +2520,7 @@ qemuDomainObjPrivateXMLParseBlockjobChain(xmlNodePtr = node, virDomainXMLOptionPtr xmlopt) =20 { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *format =3D NULL; g_autofree char *type =3D NULL; g_autofree char *index =3D NULL; @@ -2694,7 +2694,7 @@ qemuDomainObjPrivateXMLParseBlockjobData(virDomainObj= Ptr vm, xmlXPathContextPtr ctxt, virDomainXMLOptionPtr xmlopt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainDiskDefPtr disk =3D NULL; g_autoptr(qemuBlockJobData) job =3D NULL; g_autofree char *name =3D NULL; @@ -2876,7 +2876,7 @@ qemuDomainObjPrivateXMLParseSlirpFeatures(xmlNodePtr = featuresNode, xmlXPathContextPtr ctxt, qemuSlirpPtr slirp) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree xmlNodePtr *nodes =3D NULL; size_t i; int n; diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 6393cc0b40..aeca738c5d 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -1298,7 +1298,7 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr n= ode, virDomainDiskDefPtr disk, virDomainXMLOptionPtr xmlopt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); g_autofree char *format =3D NULL; g_autofree char *type =3D NULL; @@ -1382,7 +1382,7 @@ qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv =3D vm->privateData; qemuDomainJobObjPtr job =3D &priv->job; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *tmp =3D NULL; =20 if (!(ctxt->node =3D virXPathNode("./job[1]", ctxt))) diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index 81b557e0a8..cef2555988 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -935,7 +935,7 @@ qemuMigrationCookieNetworkXMLParse(xmlXPathContextPtr c= txt) int n; xmlNodePtr *interfaces =3D NULL; char *vporttype; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 if (VIR_ALLOC(optr) < 0) goto error; @@ -983,7 +983,7 @@ qemuMigrationCookieNBDXMLParse(xmlXPathContextPtr ctxt) size_t i; int n; xmlNodePtr *disks =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 if (VIR_ALLOC(ret) < 0) goto error; @@ -1043,7 +1043,7 @@ qemuMigrationCookieStatisticsXMLParse(xmlXPathContext= Ptr ctxt) { qemuDomainJobInfoPtr jobInfo =3D NULL; qemuMonitorMigrationStats *stats; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 if (!(ctxt->node =3D virXPathNode("./statistics", ctxt))) return NULL; diff --git a/src/util/virstorageencryption.c b/src/util/virstorageencryptio= n.c index 94ccaf1e9a..76958b3876 100644 --- a/src/util/virstorageencryption.c +++ b/src/util/virstorageencryption.c @@ -143,7 +143,7 @@ static virStorageEncryptionSecretPtr virStorageEncryptionSecretParse(xmlXPathContextPtr ctxt, xmlNodePtr node) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virStorageEncryptionSecretPtr ret; char *type_str =3D NULL; =20 @@ -237,7 +237,7 @@ virStorageEncryptionPtr virStorageEncryptionParseNode(xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr *nodes =3D NULL; virStorageEncryptionPtr encdef =3D NULL; virStorageEncryptionPtr ret =3D NULL; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 51037c691f..97a346db28 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1781,7 +1781,7 @@ virStorageAuthDefPtr virStorageAuthDefParse(xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virStorageAuthDefPtr ret =3D NULL; xmlNodePtr secretnode =3D NULL; g_autoptr(virStorageAuthDef) authdef =3D NULL; --=20 2.26.2