[libvirt PATCH RFC 16/19] VIR_XPATH_NODE_AUTORESTORE: remove semicolon from users
Ján Tomko
jtomko at redhat.com
Mon Aug 3 16:56:53 UTC 2020
Since the macro no longer includes the 'ignore_value'
statement, stop putting another empty statement after it.
Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
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 = NULL;
g_autofree char *driver = NULL;
g_autofree char *backup = 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 = NULL;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
ctxt->node = node;
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 = NULL;
g_autofree xmlNodePtr *nodes = NULL;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
int n;
size_t i;
g_autofree char *cpuMode = 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 = &def->u.iscsi;
g_autoptr(virStorageAuthDef) authdef = NULL;
xmlNodePtr node;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
ctxt->node = sourcenode;
@@ -8793,7 +8793,7 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node,
xmlXPathContextPtr ctxt)
{
virNetDevCoalescePtr ret = NULL;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
unsigned long long tmp = 0;
g_autofree char *str = NULL;
@@ -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 = 0, j;
int n;
g_autofree xmlNodePtr *list = NULL;
@@ -9262,7 +9262,7 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLabelDefPtr **seclabels_rtn,
xmlXPathContextPtr ctxt,
unsigned int flags)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
virSecurityDeviceLabelDefPtr *seclabels = NULL;
size_t nseclabels = 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 = NULL;
ctxt->node = 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 = 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)
ctxt->node = node;
@@ -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 = NULL;
g_autofree char *size = NULL;
g_autofree virStorageSourceSlicePtr ret = g_new0(virStorageSourceSlice, 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;
ctxt->node = node;
@@ -9901,7 +9901,7 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctxt,
unsigned int flags,
virDomainXMLOptionPtr xmlopt)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
xmlNodePtr source;
g_autoptr(virStorageSource) backingStore = NULL;
g_autofree char *type = 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 = NULL;
g_autofree char *mirrorType = NULL;
g_autofree char *ready = NULL;
@@ -10408,7 +10408,7 @@ virDomainDiskDefParsePrivateData(xmlXPathContextPtr ctxt,
virDomainXMLOptionPtr xmlopt)
{
xmlNodePtr private_node = virXPathNode("./privateData", ctxt);
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
if (!xmlopt ||
!xmlopt->privateData.diskParse ||
@@ -10435,7 +10435,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
{
virDomainDiskDefPtr def;
xmlNodePtr cur;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
bool source = false;
virStorageEncryptionPtr encryption = NULL;
g_autoptr(virStorageAuthDef) authdef = NULL;
@@ -11038,7 +11038,7 @@ virDomainControllerDefParseXML(virDomainXMLOptionPtr xmlopt,
bool processedTarget = false;
int numaNode = -1;
int ports = -1;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
int rc;
g_autofree char *typeStr = NULL;
g_autofree char *idx = 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 = NULL;
@@ -11676,7 +11676,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node,
{
virDomainActualNetDefPtr actual = NULL;
int ret = -1;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
xmlNodePtr bandwidth_node = NULL;
xmlNodePtr vlanNode;
xmlNodePtr virtPortNode;
@@ -11876,7 +11876,7 @@ virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDefPtr def,
xmlXPathContextPtr ctxt)
{
int tmpVal;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
xmlNodePtr cur;
g_autofree char *tmp = NULL;
@@ -11927,7 +11927,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
xmlNodePtr tmpNode;
virHashTablePtr filterparams = NULL;
virDomainActualNetDefPtr actual = NULL;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
virDomainChrSourceReconnectDef reconnect = {0};
int rv, val;
g_autofree char *macaddr = NULL;
@@ -13255,7 +13255,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
/* Check for an optional seclabel override in <source/>. */
if (chr_def) {
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
ctxt->node = cur;
if (virSecurityDeviceLabelDefParseXML(&def->seclabels,
&def->nseclabels,
@@ -13632,7 +13632,7 @@ virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlopt,
unsigned int flags)
{
virDomainTPMDefPtr def;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
int nbackends;
g_autofree char *path = NULL;
g_autofree char *model = NULL;
@@ -13765,7 +13765,7 @@ virDomainInputDefParseXML(virDomainXMLOptionPtr xmlopt,
xmlXPathContextPtr ctxt,
unsigned int flags)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
virDomainInputDefPtr def;
g_autofree char *evdev = NULL;
g_autofree char *type = 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 = NULL;
@@ -14307,7 +14307,7 @@ virDomainGraphicsListensParseXML(virDomainGraphicsDefPtr def,
xmlXPathContextPtr ctxt,
unsigned int flags)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
virDomainGraphicsListenDef newListen = {0};
int nListens;
int ret = -1;
@@ -14464,7 +14464,7 @@ virDomainGraphicsDefParseXMLSDL(virDomainGraphicsDefPtr def,
xmlNodePtr node,
xmlXPathContextPtr ctxt)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
int enableVal;
xmlNodePtr glNode;
g_autofree char *fullscreen = virXMLPropString(node, "fullscreen");
@@ -14853,7 +14853,7 @@ virDomainGraphicsDefParseXMLEGLHeadless(virDomainGraphicsDefPtr def,
xmlNodePtr node,
xmlXPathContextPtr ctxt)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
xmlNodePtr glNode;
ctxt->node = node;
@@ -14998,7 +14998,7 @@ virDomainSoundDefParseXML(virDomainXMLOptionPtr xmlopt,
unsigned int flags)
{
virDomainSoundDefPtr def;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
g_autofree char *model = NULL;
if (VIR_ALLOC(def) < 0)
@@ -15146,7 +15146,7 @@ virDomainRNGDefParseXML(virDomainXMLOptionPtr xmlopt,
unsigned int flags)
{
virDomainRNGDefPtr def;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
int nbackends;
g_autofree xmlNodePtr *backends = NULL;
g_autofree char *model = NULL;
@@ -15259,7 +15259,7 @@ virDomainMemballoonDefParseXML(virDomainXMLOptionPtr xmlopt,
unsigned int flags)
{
virDomainMemballoonDefPtr def;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
unsigned int period = 0;
g_autofree char *model = NULL;
g_autofree char *deflate = NULL;
@@ -15344,7 +15344,7 @@ virDomainShmemDefParseXML(virDomainXMLOptionPtr xmlopt,
virDomainShmemDefPtr def = NULL;
virDomainShmemDefPtr ret = NULL;
xmlNodePtr msi = NULL;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
xmlNodePtr server = NULL;
g_autofree char *tmp = NULL;
@@ -15447,7 +15447,7 @@ virSysinfoBIOSParseXML(xmlNodePtr node,
xmlXPathContextPtr ctxt,
virSysinfoBIOSDefPtr *bios)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
int ret = -1;
virSysinfoBIOSDefPtr def;
@@ -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 = -1;
virSysinfoSystemDefPtr def;
g_autofree char *tmpUUID = NULL;
@@ -15584,7 +15584,7 @@ virSysinfoBaseBoardParseXML(xmlXPathContextPtr ctxt,
size_t *nbaseBoard)
{
size_t i, nboards = 0;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
int n;
g_autofree virSysinfoBaseBoardDefPtr boards = NULL;
g_autofree xmlNodePtr *nodes = NULL;
@@ -15633,7 +15633,7 @@ virSysinfoOEMStringsParseXML(xmlNodePtr node,
xmlXPathContextPtr ctxt,
virSysinfoOEMStringsDefPtr *oem)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
int ret = -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 = -1;
virSysinfoChassisDefPtr def;
@@ -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 = 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 = NULL;
int type;
@@ -16029,7 +16029,7 @@ virDomainVideoDefParseXML(virDomainXMLOptionPtr xmlopt,
{
virDomainVideoDefPtr def;
xmlNodePtr cur;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
g_autofree char *type = NULL;
g_autofree char *driver_name = NULL;
g_autofree char *heads = NULL;
@@ -16184,7 +16184,7 @@ virDomainHostdevDefParseXML(virDomainXMLOptionPtr xmlopt,
unsigned int flags)
{
virDomainHostdevDefPtr def;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
g_autofree char *mode = virXMLPropString(node, "mode");
g_autofree char *type = virXMLPropString(node, "type");
@@ -16448,7 +16448,7 @@ virDomainRedirFilterDefParseXML(xmlNodePtr node,
{
int n;
size_t i;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
virDomainRedirFilterDefPtr def = NULL;
g_autofree xmlNodePtr *nodes = NULL;
@@ -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 = NULL;
ctxt->node = node;
@@ -16640,10 +16640,11 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node,
xmlXPathContextPtr ctxt,
virDomainMemoryDefPtr def)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
- ctxt->node = node;
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
int rv;
+ ctxt->node = node;
+
/* initialize to value which marks that the user didn't specify it */
def->targetNode = -1;
@@ -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 = NULL;
@@ -16753,7 +16754,7 @@ virDomainMemoryDefParseXML(virDomainXMLOptionPtr xmlopt,
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 = NULL;
@@ -16928,7 +16929,7 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr xmlopt,
xmlXPathContextPtr ctxt,
unsigned int flags)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
xmlNodePtr cid;
int val;
g_autofree char *tmp = NULL;
@@ -18851,7 +18852,7 @@ virDomainIdmapDefParseXML(xmlXPathContextPtr ctxt,
{
size_t i;
virDomainIdMapEntryPtr idmap = NULL;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
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 = NULL;
ctxt->node = node;
@@ -19285,7 +19286,7 @@ static virDomainResourceDefPtr
virDomainResourceDefParse(xmlNodePtr node,
xmlXPathContextPtr ctxt)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
virDomainResourceDefPtr def = NULL;
ctxt->node = 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 = NULL;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
unsigned int level = 0;
size_t i = 0;
int n = 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 = NULL;
ssize_t i = 0;
int n;
@@ -20902,7 +20903,7 @@ virDomainMemorytuneDefParseMemory(xmlXPathContextPtr 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 = 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 = NULL;
virDomainResctrlDefPtr newresctrl = NULL;
g_autoptr(virBitmap) vcpus = 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 = 0;
@@ -424,7 +424,7 @@ static int
virInterfaceDefParseIfAdressing(virInterfaceDefPtr def,
xmlXPathContextPtr ctxt)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
xmlNodePtr *protoNodes = NULL;
int nProtoNodes, pp, ret = -1;
char *tmp;
@@ -553,7 +553,7 @@ virInterfaceDefParseBondItfs(virInterfaceDefPtr def,
xmlXPathContextPtr ctxt)
{
xmlNodePtr *interfaces = 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;
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, virNetDevVlanPtr def)
{
int ret = -1;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
char *trunk = NULL;
char *nativeMode = NULL;
xmlNodePtr *tagNodes = 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)
ctxt->node = node;
@@ -937,7 +937,7 @@ virNetworkDNSDefParseXML(const char *networkName,
g_autofree char *enable = NULL;
int nhosts, nsrvs, ntxts, nfwds;
size_t i;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
ctxt->node = node;
@@ -1081,7 +1081,7 @@ virNetworkIPDefParseXML(const char *networkName,
* On failure clear it out, but don't free it.
*/
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
xmlNodePtr dhcp;
g_autofree char *address = NULL;
g_autofree char *netmask = NULL;
@@ -1252,7 +1252,7 @@ virNetworkPortGroupParseXML(virPortGroupDefPtr def,
* On failure clear it out, but don't free it.
*/
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
xmlNodePtr virtPortNode;
xmlNodePtr vlanNode;
xmlNodePtr bandwidth_node;
@@ -1322,7 +1322,7 @@ virNetworkForwardNatDefParseXML(const char *networkName,
g_autofree char *addrStart = NULL;
g_autofree char *addrEnd = NULL;
g_autofree char *ipv6 = NULL;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
ctxt->node = node;
@@ -1460,7 +1460,7 @@ virNetworkForwardDefParseXML(const char *networkName,
g_autofree char *forwardManaged = NULL;
g_autofree char *forwardDriverName = NULL;
g_autofree char *type = NULL;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
ctxt->node = node;
@@ -1699,7 +1699,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt,
xmlNodePtr forwardNode = NULL;
g_autofree char *ipv6nogwStr = NULL;
g_autofree char *trustGuestRxFilters = NULL;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
xmlNodePtr bandwidthNode = NULL;
xmlNodePtr vlanNode;
xmlNodePtr metadataNode = 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,
*/
virNetDevIPRoutePtr def = NULL;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
char *family = NULL;
char *address = NULL, *netmask = NULL;
char *gateway = 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 = -1, val;
char *type = NULL;
@@ -746,7 +746,7 @@ virNodeDevCapCCWParseXML(xmlXPathContextPtr ctxt,
xmlNodePtr node,
virNodeDevCapCCWPtr ccw_dev)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
int ret = -1;
char *cssid = NULL, *ssid = NULL, *devno = NULL;
@@ -807,7 +807,7 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt,
xmlNodePtr node,
virNodeDevCapStoragePtr storage)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
xmlNodePtr *nodes = NULL;
size_t i;
int n, ret = -1;
@@ -900,7 +900,7 @@ virNodeDevCapSCSIParseXML(xmlXPathContextPtr ctxt,
xmlNodePtr node,
virNodeDevCapSCSIPtr scsi)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
int ret = -1;
ctxt->node = 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 = NULL;
int ret = -1, n = 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 = NULL;
int ret = -1, n = 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 = -1;
int ret = -1, n = -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 = -1;
ctxt->node = 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 = -1;
ctxt->node = node;
@@ -1307,7 +1307,7 @@ virNodeDevCapPCIDevIommuGroupParseXML(xmlXPathContextPtr ctxt,
xmlNodePtr iommuGroupNode,
virNodeDevCapPCIDevPtr pci_dev)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
xmlNodePtr *addrNodes = NULL;
char *numberStr = NULL;
int nAddrNodes, ret = -1;
@@ -1363,7 +1363,7 @@ virPCIEDeviceInfoLinkParseXML(xmlXPathContextPtr ctxt,
xmlNodePtr linkNode,
virPCIELinkPtr lnk)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
int ret = -1, speed;
char *speedStr = NULL, *portStr = NULL;
@@ -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 = -1;
@@ -1579,7 +1579,7 @@ virNodeDevPCICapabilityParseXML(xmlXPathContextPtr ctxt,
virNodeDevCapPCIDevPtr pci_dev)
{
char *type = virXMLPropString(node, "type");
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
int ret = -1;
ctxt->node = 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 = NULL;
@@ -1733,7 +1733,7 @@ virNodeDevCapSystemParseXML(xmlXPathContextPtr ctxt,
{
virNodeDevCapSystemHardwarePtr hardware = &syscap->hardware;
virNodeDevCapSystemFirmwarePtr firmware = &syscap->firmware;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
int ret = -1;
char *tmp;
@@ -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 = virMediatedDeviceAttrNew();
ctxt->node = node;
@@ -1797,7 +1797,7 @@ virNodeDevCapMdevParseXML(xmlXPathContextPtr ctxt,
xmlNodePtr node,
virNodeDevCapMdevPtr mdev)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
int ret = -1;
int nattrs = 0;
g_autofree xmlNodePtr *attrs = 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 = g_new0(virDomainNumaCache, n);
for (i = 0; i < n; i++) {
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
virDomainNumaCachePtr cache = &def->mem_nodes[cur_cell].caches[i];
g_autofree char *tmp = NULL;
unsigned int level;
@@ -1010,7 +1010,7 @@ virDomainNumaDefParseXML(virDomainNumaPtr def,
def->nmem_nodes = n;
for (i = 0; i < n; i++) {
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
int rc;
unsigned int cur_cell = i;
@@ -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 = VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH;
ctxt->node = 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 = NULL;
char *driver = NULL;
xmlNodePtr cur;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
ctxt->node = node;
diff --git a/src/conf/storage_adapter_conf.c b/src/conf/storage_adapter_conf.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 = -1;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
char *adapter_type = NULL;
ctxt->node = 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 = -1;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
xmlNodePtr node;
g_autofree char *mode = NULL;
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 = -1;
*obj = 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 = -1;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
xmlNodePtr *nodes = NULL;
int n;
size_t i;
@@ -130,7 +130,7 @@ loadIncludes(xmlXPathContextPtr ctxt,
void *data)
{
int ret = -1;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
xmlNodePtr *nodes = 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 = NULL;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
size_t i;
int n;
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 = g_new0(lxcDomainDef, 1);
g_autofree xmlNodePtr *nodes = NULL;
bool uses_lxc_ns = 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 caps,
char *str = NULL;
xmlNodePtr hostCPUNode;
xmlNodePtr *nodes = NULL;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
qemuMonitorCPUModelInfoPtr hostCPU = NULL;
g_autofree char *xpath = g_strdup_printf("./hostCPU[@type='%s']", typeStr);
int ret = -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)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
g_autofree char *format = NULL;
g_autofree char *type = NULL;
g_autofree char *index = NULL;
@@ -2694,7 +2694,7 @@ qemuDomainObjPrivateXMLParseBlockjobData(virDomainObjPtr vm,
xmlXPathContextPtr ctxt,
virDomainXMLOptionPtr xmlopt)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
virDomainDiskDefPtr disk = NULL;
g_autoptr(qemuBlockJobData) job = NULL;
g_autofree char *name = 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 = 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 node,
virDomainDiskDefPtr disk,
virDomainXMLOptionPtr xmlopt)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
g_autofree char *format = NULL;
g_autofree char *type = NULL;
@@ -1382,7 +1382,7 @@ qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm,
{
qemuDomainObjPrivatePtr priv = vm->privateData;
qemuDomainJobObjPtr job = &priv->job;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
g_autofree char *tmp = NULL;
if (!(ctxt->node = virXPathNode("./job[1]", ctxt)))
diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.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 ctxt)
int n;
xmlNodePtr *interfaces = NULL;
char *vporttype;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
if (VIR_ALLOC(optr) < 0)
goto error;
@@ -983,7 +983,7 @@ qemuMigrationCookieNBDXMLParse(xmlXPathContextPtr ctxt)
size_t i;
int n;
xmlNodePtr *disks = NULL;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
if (VIR_ALLOC(ret) < 0)
goto error;
@@ -1043,7 +1043,7 @@ qemuMigrationCookieStatisticsXMLParse(xmlXPathContextPtr ctxt)
{
qemuDomainJobInfoPtr jobInfo = NULL;
qemuMonitorMigrationStats *stats;
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
if (!(ctxt->node = virXPathNode("./statistics", ctxt)))
return NULL;
diff --git a/src/util/virstorageencryption.c b/src/util/virstorageencryption.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 = NULL;
@@ -237,7 +237,7 @@ virStorageEncryptionPtr
virStorageEncryptionParseNode(xmlNodePtr node,
xmlXPathContextPtr ctxt)
{
- VIR_XPATH_NODE_AUTORESTORE(ctxt);
+ VIR_XPATH_NODE_AUTORESTORE(ctxt)
xmlNodePtr *nodes = NULL;
virStorageEncryptionPtr encdef = NULL;
virStorageEncryptionPtr ret = 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 = NULL;
xmlNodePtr secretnode = NULL;
g_autoptr(virStorageAuthDef) authdef = NULL;
--
2.26.2
More information about the libvir-list
mailing list