[libvirt PATCH 00/11] Automatic mutex management
libvirt currently manages mutexes manually. Manual mutex management suffers from the same drawbacks as manual memory management, and at least one lock-unlock mismatch exists currently in the code base, see https://listman.redhat.com/archives/libvir-list/2021-August/msg00125.html. This series lays the ground work for automatic mutex management in libvirt. Later series will continue to replace calls to virMutex{Lock,Unlock} and virObject{Lock,Unlock}. Patches 1 - 3 deal with a bug in clang (see patch 1 for explanation), patches 4 - 6 introduce a new type, virLockGuard, that handles the automatic mutex management, and patches 7-11 demonstrate the application of this new type. Patches that eliminate the majority of calls to virMutex{Lock,Unlock} are on stand-by, as well as patches that provide virLockGuard support for virObject and will be send once this series is accepted. Regards, Tim Tim Wiederhake (11): glibcompat: Add wrapper for g_auto* VIR_XPATH_NODE_AUTORESTORE: Add semicolon virxml: Simplify VIR_XPATH_NODE_AUTORESTORE internal: Add CONCAT macro virthread: Introduce virLockGuard virthread: Introduce WITH_VIR_MUTEX_LOCK_GUARD virChrdevFDStreamCloseCb: Use virLockGuard virChrdevFree: Use virLockGuard virChrdevOpen: Use virLockGuard networkBridgeNameValidate: Use virLockGuard networkBridgeNameValidate: Cleanup src/conf/backup_conf.c | 2 +- src/conf/checkpoint_conf.c | 2 +- src/conf/cpu_conf.c | 2 +- src/conf/domain_conf.c | 140 ++++++++++++++--------------- 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 | 42 ++++----- src/conf/numa_conf.c | 6 +- src/conf/snapshot_conf.c | 2 +- src/conf/storage_adapter_conf.c | 2 +- src/conf/storage_conf.c | 4 +- src/conf/storage_encryption_conf.c | 4 +- src/conf/storage_source_conf.c | 2 +- src/conf/virchrdev.c | 26 ++---- src/conf/virsavecookie.c | 2 +- src/cpu/cpu_map.c | 4 +- src/cpu/cpu_x86.c | 2 +- src/internal.h | 3 + src/libvirt_private.syms | 3 + src/lxc/lxc_domain.c | 2 +- src/network/bridge_driver.c | 11 +-- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_domain.c | 8 +- src/qemu/qemu_domainjob.c | 2 +- src/qemu/qemu_migration_cookie.c | 8 +- src/util/glibcompat.h | 20 +++++ src/util/virthread.c | 26 ++++++ src/util/virthread.h | 30 +++++++ src/util/virxml.h | 6 +- 31 files changed, 228 insertions(+), 161 deletions(-) -- 2.31.1
See comment for rationale. Signed-off-by: Tim Wiederhake <twiederh@redhat.com> --- src/util/glibcompat.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/util/glibcompat.h b/src/util/glibcompat.h index 697687b967..fe495c5c32 100644 --- a/src/util/glibcompat.h +++ b/src/util/glibcompat.h @@ -86,3 +86,23 @@ char *vir_g_strdup_vprintf(const char *msg, va_list args) #define g_fsync vir_g_fsync void vir_g_source_unref(GSource *src, GMainContext *ctx); + +/* + * Clang falsely tags variable definitions as unused if the only access happens + * during the variables destruction at scope exit. See + * https://bugs.llvm.org/show_bug.cgi?id=3888 and + * https://bugs.llvm.org/show_bug.cgi?id=43482. + */ +#if defined(__clang__) +# define vir_g_auto(X) g_auto(X) G_GNUC_UNUSED +# define vir_g_autolist(X) g_autolist(X) G_GNUC_UNUSED +# define vir_g_autoptr(X) g_autoptr(X) G_GNUC_UNUSED +# define vir_g_autoqueue(X) g_autoqueue(X) G_GNUC_UNUSED +# define vir_g_autoslist(X) g_autoslist(X) G_GNUC_UNUSED +#else +# define vir_g_auto(X) g_auto(X) +# define vir_g_autolist(X) g_autolist(X) +# define vir_g_autoptr(X) g_autoptr(X) +# define vir_g_autoqueue(X) g_autoqueue(X) +# define vir_g_autoslist(X) g_autoslist(X) +#endif /* __clang__ */ -- 2.31.1
On Wed, Aug 25, 2021 at 02:43:20PM +0200, Tim Wiederhake wrote:
See comment for rationale.
Signed-off-by: Tim Wiederhake <twiederh@redhat.com> --- src/util/glibcompat.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
diff --git a/src/util/glibcompat.h b/src/util/glibcompat.h index 697687b967..fe495c5c32 100644 --- a/src/util/glibcompat.h +++ b/src/util/glibcompat.h @@ -86,3 +86,23 @@ char *vir_g_strdup_vprintf(const char *msg, va_list args) #define g_fsync vir_g_fsync
void vir_g_source_unref(GSource *src, GMainContext *ctx); + +/* + * Clang falsely tags variable definitions as unused if the only access happens + * during the variables destruction at scope exit. See + * https://bugs.llvm.org/show_bug.cgi?id=3888 and + * https://bugs.llvm.org/show_bug.cgi?id=43482. + */ +#if defined(__clang__) +# define vir_g_auto(X) g_auto(X) G_GNUC_UNUSED +# define vir_g_autolist(X) g_autolist(X) G_GNUC_UNUSED +# define vir_g_autoptr(X) g_autoptr(X) G_GNUC_UNUSED +# define vir_g_autoqueue(X) g_autoqueue(X) G_GNUC_UNUSED +# define vir_g_autoslist(X) g_autoslist(X) G_GNUC_UNUSED +#else +# define vir_g_auto(X) g_auto(X) +# define vir_g_autolist(X) g_autolist(X) +# define vir_g_autoptr(X) g_autoptr(X) +# define vir_g_autoqueue(X) g_autoqueue(X) +# define vir_g_autoslist(X) g_autoslist(X) +#endif /* __clang__ */
I don't think this belongs into this file. It is meant to workaround bugs in glib, not in compilers. In addition I don't think we would like to mix vir_g_auto and g_auto within libvirt codebase. If we need to introduce our own wrappers we should undefine the original symbol and replace it like we do with g_fsync for example: Pavel
On a Wednesday in 2021, Tim Wiederhake wrote:
See comment for rationale.
Missing commit message ;)
Signed-off-by: Tim Wiederhake <twiederh@redhat.com> --- src/util/glibcompat.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
diff --git a/src/util/glibcompat.h b/src/util/glibcompat.h index 697687b967..fe495c5c32 100644 --- a/src/util/glibcompat.h +++ b/src/util/glibcompat.h @@ -86,3 +86,23 @@ char *vir_g_strdup_vprintf(const char *msg, va_list args) #define g_fsync vir_g_fsync
void vir_g_source_unref(GSource *src, GMainContext *ctx); + +/* + * Clang falsely tags variable definitions as unused if the only access happens
In Clang's defense, the warning is legitimate and has caught many unused variables. It's our usage that is weird here.
+ * during the variables destruction at scope exit. See + * https://bugs.llvm.org/show_bug.cgi?id=3888 and + * https://bugs.llvm.org/show_bug.cgi?id=43482. + */ +#if defined(__clang__) +# define vir_g_auto(X) g_auto(X) G_GNUC_UNUSED +# define vir_g_autolist(X) g_autolist(X) G_GNUC_UNUSED +# define vir_g_autoptr(X) g_autoptr(X) G_GNUC_UNUSED +# define vir_g_autoqueue(X) g_autoqueue(X) G_GNUC_UNUSED +# define vir_g_autoslist(X) g_autoslist(X) G_GNUC_UNUSED
These are not needed since in all cases, the G_GNUC_UNUSED can be used unconditionally for both gcc and CLang in the respective macros. Jano
+#else +# define vir_g_auto(X) g_auto(X) +# define vir_g_autolist(X) g_autolist(X) +# define vir_g_autoptr(X) g_autoptr(X) +# define vir_g_autoqueue(X) g_autoqueue(X) +# define vir_g_autoslist(X) g_autoslist(X) +#endif /* __clang__ */ -- 2.31.1
On Wed, Aug 25, 2021 at 02:43:20PM +0200, Tim Wiederhake wrote:
See comment for rationale.
Signed-off-by: Tim Wiederhake <twiederh@redhat.com> --- src/util/glibcompat.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
diff --git a/src/util/glibcompat.h b/src/util/glibcompat.h index 697687b967..fe495c5c32 100644 --- a/src/util/glibcompat.h +++ b/src/util/glibcompat.h @@ -86,3 +86,23 @@ char *vir_g_strdup_vprintf(const char *msg, va_list args) #define g_fsync vir_g_fsync
void vir_g_source_unref(GSource *src, GMainContext *ctx); + +/* + * Clang falsely tags variable definitions as unused if the only access happens + * during the variables destruction at scope exit. See + * https://bugs.llvm.org/show_bug.cgi?id=3888 and + * https://bugs.llvm.org/show_bug.cgi?id=43482. + */ +#if defined(__clang__) +# define vir_g_auto(X) g_auto(X) G_GNUC_UNUSED +# define vir_g_autolist(X) g_autolist(X) G_GNUC_UNUSED +# define vir_g_autoptr(X) g_autoptr(X) G_GNUC_UNUSED +# define vir_g_autoqueue(X) g_autoqueue(X) G_GNUC_UNUSED +# define vir_g_autoslist(X) g_autoslist(X) G_GNUC_UNUSED +#else +# define vir_g_auto(X) g_auto(X) +# define vir_g_autolist(X) g_autolist(X) +# define vir_g_autoptr(X) g_autoptr(X) +# define vir_g_autoqueue(X) g_autoqueue(X) +# define vir_g_autoslist(X) g_autoslist(X) +#endif /* __clang__ */
I don't think we should be adding any of these. If there's a fix needed then do it in GLib instead. If old glib issues warnings, then disable the warning in question when building with clang + old glib. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
This is preparation for the next patch which will make the use of a semicolon after VIR_XPATH_NODE_AUTORESTORE mandatory. Signed-off-by: Tim Wiederhake <twiederh@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 | 140 ++++++++++++++--------------- 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 | 42 ++++----- src/conf/numa_conf.c | 6 +- src/conf/snapshot_conf.c | 2 +- src/conf/storage_adapter_conf.c | 2 +- src/conf/storage_conf.c | 4 +- src/conf/storage_encryption_conf.c | 4 +- src/conf/storage_source_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 | 8 +- src/qemu/qemu_domainjob.c | 2 +- src/qemu/qemu_migration_cookie.c | 8 +- 23 files changed, 132 insertions(+), 132 deletions(-) diff --git a/src/conf/backup_conf.c b/src/conf/backup_conf.c index 694553a544..9c67f5c232 100644 --- a/src/conf/backup_conf.c +++ b/src/conf/backup_conf.c @@ -102,7 +102,7 @@ virDomainBackupDiskDefParseXML(xmlNodePtr node, unsigned int flags, virDomainXMLOption *xmlopt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree char *type = NULL; g_autofree char *format = NULL; g_autofree char *idx = NULL; diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 175a95fed7..aebdc2cb6d 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -96,7 +96,7 @@ virDomainCheckpointDiskDefParseXML(xmlNodePtr node, virDomainCheckpointDiskDef *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 1674cd6957..c42083d018 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -320,7 +320,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 6127513117..039199542e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1695,7 +1695,7 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root, g_autofree char *write_bytes_sec = NULL; g_autofree char *read_iops_sec = NULL; g_autofree char *write_iops_sec = NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = root; @@ -6649,7 +6649,7 @@ virDomainDeviceInfoParseXML(virDomainXMLOption *xmlopt, xmlNodePtr rom = NULL; int ret = -1; g_autofree char *aliasStr = NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); virDomainDeviceInfoClear(info); ctxt->node = node; @@ -6721,7 +6721,7 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node, xmlNodePtr productNode; xmlNodePtr addressNode; virTristateBool autoAddress; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; @@ -6823,7 +6823,7 @@ virDomainHostdevSubsysPCIDefParseXML(xmlNodePtr node, g_autofree char *filtering = NULL; xmlNodePtr address = NULL; xmlNodePtr origstates = NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; @@ -6922,7 +6922,7 @@ virDomainStorageNetworkParseHosts(xmlNodePtr node, g_autofree xmlNodePtr *hostnodes = NULL; ssize_t nhostnodes; size_t i; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; @@ -6967,7 +6967,7 @@ virDomainHostdevSubsysSCSIHostDefParseXML(xmlNodePtr sourcenode, { virDomainHostdevSubsysSCSIHost *scsihostsrc = &scsisrc->u.host; xmlNodePtr addressnode = NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = sourcenode; @@ -7019,7 +7019,7 @@ virDomainHostdevSubsysSCSIiSCSIDefParseXML(xmlNodePtr sourcenode, virDomainHostdevSubsysSCSIiSCSI *iscsisrc = &def->u.iscsi; g_autoptr(virStorageAuthDef) authdef = NULL; xmlNodePtr node; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = sourcenode; @@ -7509,7 +7509,7 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevCoalesce **coalesce) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); unsigned long long tmp = 0; g_autofree char *str = NULL; @@ -7880,7 +7880,7 @@ virSecurityLabelDefsParseXML(virDomainDef *def, virDomainXMLOption *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; @@ -7977,7 +7977,7 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLabelDef ***seclabels_rtn, xmlXPathContextPtr ctxt, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); virSecurityDeviceLabelDef **seclabels = NULL; size_t nseclabels = 0; int n; @@ -8069,7 +8069,7 @@ virDomainLeaseDefParseXML(xmlNodePtr node, g_autofree char *key = NULL; g_autofree char *path = NULL; xmlNodePtr targetNode = NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; def = g_new0(virDomainLeaseDef, 1); @@ -8160,7 +8160,7 @@ static virStorageNetCookieDef * virDomainStorageNetCookieParse(xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autoptr(virStorageNetCookieDef) cookie = NULL; ctxt->node = node; @@ -8187,7 +8187,7 @@ virDomainStorageNetCookiesParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virStorageSource *src) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree xmlNodePtr *nodes = NULL; ssize_t nnodes; size_t i; @@ -8423,7 +8423,7 @@ virDomainDiskSourcePRParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virStoragePRDef **pr) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; @@ -8476,7 +8476,7 @@ static virStorageSourceSlice * 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 virStorageSourceSlice *ret = g_new0(virStorageSourceSlice, 1); @@ -8542,7 +8542,7 @@ virDomainStorageSourceParse(xmlNodePtr node, unsigned int flags, virDomainXMLOption *xmlopt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr tmp; ctxt->node = node; @@ -8624,7 +8624,7 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctxt, unsigned int flags, virDomainXMLOption *xmlopt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr source; g_autoptr(virStorageSource) backingStore = NULL; g_autofree char *type = NULL; @@ -8767,7 +8767,7 @@ virDomainDiskDefMirrorParse(virDomainDiskDef *def, virDomainXMLOption *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; @@ -8872,7 +8872,7 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *def, xmlNodePtr cur, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = cur; @@ -8940,7 +8940,7 @@ virDomainDiskDefDriverSourceParseXML(virStorageSource *src, xmlXPathContextPtr ctxt) { g_autofree char *tmp = NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = cur; @@ -8973,7 +8973,7 @@ virDomainDiskDefParsePrivateData(xmlXPathContextPtr ctxt, virDomainXMLOption *xmlopt) { xmlNodePtr private_node = virXPathNode("./privateData", ctxt); - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); if (!xmlopt || !xmlopt->privateData.diskParse || @@ -8996,7 +8996,7 @@ virDomainDiskDefParseSourceXML(virDomainXMLOption *xmlopt, unsigned int flags) { g_autoptr(virStorageSource) src = virStorageSourceNew(); - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree char *type = NULL; xmlNodePtr tmp; @@ -9076,7 +9076,7 @@ virDomainDiskDefParseXML(virDomainXMLOption *xmlopt, unsigned int flags) { g_autoptr(virDomainDiskDef) def = NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr sourceNode; xmlNodePtr targetNode; xmlNodePtr geometryNode; @@ -9433,7 +9433,7 @@ virDomainControllerDefParseXML(virDomainXMLOption *xmlopt, int nmodelNodes = 0; int numaNode = -1; int ports; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); int rc; g_autofree char *idx = NULL; g_autofree char *model = NULL; @@ -9701,7 +9701,7 @@ virDomainFSDefParseXML(virDomainXMLOption *xmlopt, xmlXPathContextPtr ctxt, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); virDomainFSDef *def; xmlNodePtr driver_node = NULL; xmlNodePtr source_node = NULL; @@ -9961,7 +9961,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node, { virDomainActualNetDef *actual = NULL; int ret = -1; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr bandwidth_node = NULL; xmlNodePtr vlanNode; xmlNodePtr virtPortNode; @@ -10141,7 +10141,7 @@ virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDef *def, xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr cur; ctxt->node = node; @@ -10208,7 +10208,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, xmlNodePtr tmpNode; GHashTable *filterparams = NULL; virDomainActualNetDef *actual = NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); virDomainChrSourceReconnectDef reconnect = {0}; int rv, val; g_autofree char *macaddr = NULL; @@ -11025,7 +11025,7 @@ virDomainChrDefParseTargetXML(virDomainChrDef *def, g_autofree char *targetModel = NULL; g_autofree char *addrStr = NULL; g_autofree char *portStr = NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = cur; @@ -11294,7 +11294,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef *def, int nprotocols = 0; g_autofree xmlNodePtr *sources = NULL; int nsources = 0; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = cur; @@ -11515,7 +11515,7 @@ virDomainChrDefParseXML(virDomainXMLOption *xmlopt, const char *nodeName; virDomainChrDef *def; g_autofree char *type = NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; @@ -11592,7 +11592,7 @@ virDomainSmartcardDefParseXML(virDomainXMLOption *xmlopt, g_autofree char *type = NULL; g_autofree xmlNodePtr *certificates = NULL; int n = 0; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; def = g_new0(virDomainSmartcardDef, 1); @@ -11722,7 +11722,7 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt, unsigned int flags) { virDomainTPMDef *def; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); int nbackends; g_autofree char *path = NULL; g_autofree char *model = NULL; @@ -11865,7 +11865,7 @@ virDomainInputDefParseXML(virDomainXMLOption *xmlopt, xmlXPathContextPtr ctxt, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); virDomainInputDef *def; g_autofree char *type = NULL; g_autofree char *bus = NULL; @@ -12090,7 +12090,7 @@ virDomainTimerDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt) { virDomainTimerDef *def; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr catchup; int ret; g_autofree char *name = NULL; @@ -12420,7 +12420,7 @@ virDomainGraphicsListensParseXML(virDomainGraphicsDef *def, xmlXPathContextPtr ctxt, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); virDomainGraphicsListenDef newListen = {0}; int nListens; int ret = -1; @@ -12503,7 +12503,7 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDef *def, g_autofree char *websocketGenerated = virXMLPropString(node, "websocketGenerated"); g_autofree char *autoport = virXMLPropString(node, "autoport"); xmlNodePtr audioNode; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); if (virDomainGraphicsListensParseXML(def, node, ctxt, flags) < 0) return -1; @@ -12573,7 +12573,7 @@ virDomainGraphicsDefParseXMLSDL(virDomainGraphicsDef *def, xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr glNode; virTristateBool fullscreen; @@ -12670,7 +12670,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDef *def, size_t i = 0; virTristateBool autoport; xmlNodePtr cur; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; @@ -12827,7 +12827,7 @@ virDomainGraphicsDefParseXMLEGLHeadless(virDomainGraphicsDef *def, xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr glNode; ctxt->node = node; @@ -12955,7 +12955,7 @@ virDomainSoundDefParseXML(virDomainXMLOption *xmlopt, unsigned int flags) { virDomainSoundDef *def; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr audioNode; def = g_new0(virDomainSoundDef, 1); @@ -13199,7 +13199,7 @@ virDomainAudioDefParseXML(virDomainXMLOption *xmlopt G_GNUC_UNUSED, xmlXPathContextPtr ctxt) { virDomainAudioDef *def; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr inputNode, outputNode; def = g_new0(virDomainAudioDef, 1); @@ -13387,7 +13387,7 @@ virDomainRNGDefParseXML(virDomainXMLOption *xmlopt, unsigned int flags) { virDomainRNGDef *def; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); int nbackends; g_autofree xmlNodePtr *backends = NULL; g_autofree char *model = NULL; @@ -13499,7 +13499,7 @@ virDomainMemballoonDefParseXML(virDomainXMLOption *xmlopt, unsigned int flags) { virDomainMemballoonDef *def; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr stats; ctxt->node = node; @@ -13575,7 +13575,7 @@ virDomainShmemDefParseXML(virDomainXMLOption *xmlopt, xmlNodePtr model; xmlNodePtr msi; xmlNodePtr server; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; @@ -13645,7 +13645,7 @@ virSysinfoBIOSParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virSysinfoBIOSDef **bios) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); int ret = -1; virSysinfoBIOSDef *def; @@ -13707,7 +13707,7 @@ virSysinfoSystemParseXML(xmlNodePtr node, unsigned char *domUUID, bool uuid_generated) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); int ret = -1; virSysinfoSystemDef *def; g_autofree char *tmpUUID = NULL; @@ -13780,7 +13780,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 virSysinfoBaseBoardDef *boards = NULL; g_autofree xmlNodePtr *nodes = NULL; @@ -13829,7 +13829,7 @@ virSysinfoOEMStringsParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virSysinfoOEMStringsDef **oem) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); int ret = -1; virSysinfoOEMStringsDef *def; int nstrings; @@ -13867,7 +13867,7 @@ virSysinfoChassisParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virSysinfoChassisDef **chassisdef) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); int ret = -1; virSysinfoChassisDef *def; @@ -13951,7 +13951,7 @@ virSysinfoParseFWCfgDef(virSysinfoDef *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; @@ -14012,7 +14012,7 @@ virSysinfoParseXML(xmlNodePtr node, unsigned char *domUUID, bool uuid_generated) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); virSysinfoDef *def; g_autofree char *typeStr = NULL; int type; @@ -14170,7 +14170,7 @@ virDomainVideoDriverDefParseXML(xmlNodePtr node, { g_autofree virDomainVideoDriverDef *def = NULL; xmlNodePtr driver = NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; @@ -14197,7 +14197,7 @@ virDomainVideoDefParseXML(virDomainXMLOption *xmlopt, xmlNodePtr driver; xmlNodePtr accel_node; xmlNodePtr res_node; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree char *type = NULL; g_autofree char *heads = NULL; g_autofree char *vram = NULL; @@ -14296,7 +14296,7 @@ virDomainHostdevDefParseXML(virDomainXMLOption *xmlopt, unsigned int flags) { virDomainHostdevDef *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"); @@ -14520,7 +14520,7 @@ virDomainRedirFilterDefParseXML(xmlNodePtr node, { int n; size_t i; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); virDomainRedirFilterDef *def = NULL; g_autofree xmlNodePtr *nodes = NULL; @@ -14642,7 +14642,7 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virDomainMemoryDef *def) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree char *nodemask = NULL; ctxt->node = node; @@ -14696,7 +14696,7 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virDomainMemoryDef *def) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); int rv; ctxt->node = node; @@ -14788,7 +14788,7 @@ static virDomainSecDef * virDomainSecDefParseXML(xmlNodePtr lsecNode, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autoptr(virDomainSecDef) sec = g_new0(virDomainSecDef, 1); ctxt->node = lsecNode; @@ -14824,7 +14824,7 @@ virDomainMemoryDefParseXML(virDomainXMLOption *xmlopt, xmlXPathContextPtr ctxt, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr node; virDomainMemoryDef *def; g_autofree char *tmp = NULL; @@ -14889,7 +14889,7 @@ static virDomainIOMMUDef * virDomainIOMMUDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr driver; g_autofree virDomainIOMMUDef *iommu = NULL; @@ -14933,7 +14933,7 @@ virDomainVsockDefParseXML(virDomainXMLOption *xmlopt, xmlXPathContextPtr ctxt, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr cid; g_autoptr(virDomainVsockDef) vsock = NULL; @@ -16905,7 +16905,7 @@ virDomainIdmapDefParseXML(xmlXPathContextPtr ctxt, { size_t i; virDomainIdMapEntry *idmap = NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); idmap = g_new0(virDomainIdMapEntry, num); @@ -17248,7 +17248,7 @@ virDomainHugepagesParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virDomainHugePage *hugepage) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree char *nodeset = NULL; ctxt->node = node; @@ -17283,7 +17283,7 @@ static virDomainResourceDef * virDomainResourceDefParse(xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); virDomainResourceDef *def = NULL; char *partition = NULL; char *appid = NULL; @@ -18397,7 +18397,7 @@ virDomainCachetuneDefParseCache(xmlXPathContextPtr ctxt, xmlNodePtr node, virResctrlAlloc *alloc) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); unsigned int level; unsigned int cache; virCacheType type; @@ -18508,7 +18508,7 @@ virDomainResctrlMonDefParse(virDomainDef *def, virDomainResctrlDef *resctrl) { virDomainResctrlMonDef *domresmon = NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); unsigned int level = 0; size_t i = 0; int n = 0; @@ -18635,7 +18635,7 @@ virDomainCachetuneDefParse(virDomainDef *def, xmlNodePtr node, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); virDomainResctrlDef *resctrl = NULL; ssize_t i = 0; int n; @@ -18963,7 +18963,7 @@ virDomainMemorytuneDefParseMemory(xmlXPathContextPtr ctxt, xmlNodePtr node, virResctrlAlloc *alloc) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); unsigned int id; unsigned int bandwidth; @@ -18989,7 +18989,7 @@ virDomainMemorytuneDefParse(virDomainDef *def, xmlNodePtr node, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); virDomainResctrlDef *resctrl = NULL; virDomainResctrlDef *newresctrl = NULL; g_autoptr(virBitmap) vcpus = NULL; diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index b45dc37379..ccb8cec4dd 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -262,7 +262,7 @@ static int virInterfaceDefParseDhcp(virInterfaceProtocolDef *def, xmlNodePtr dhcp, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); char *tmp; int ret = 0; @@ -420,7 +420,7 @@ static int virInterfaceDefParseIfAdressing(virInterfaceDef *def, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr *protoNodes = NULL; int nProtoNodes, pp, ret = -1; char *tmp; @@ -544,7 +544,7 @@ virInterfaceDefParseBondItfs(virInterfaceDef *def, xmlXPathContextPtr ctxt) { xmlNodePtr *interfaces = NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); virInterfaceDef *itf; int nbItf; size_t i; @@ -682,7 +682,7 @@ virInterfaceDefParseXML(xmlXPathContextPtr ctxt, virInterfaceDef *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 9d7cc732ba..734a61843f 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 *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 f23599abac..6606331390 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -774,7 +774,7 @@ virNetworkDNSSrvDefParseXML(const char *networkName, bool partialOkay) { int ret; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; @@ -932,7 +932,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; @@ -1072,7 +1072,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; @@ -1243,7 +1243,7 @@ virNetworkPortGroupParseXML(virPortGroupDef *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; @@ -1312,7 +1312,7 @@ virNetworkForwardNatDefParseXML(const char *networkName, g_autofree xmlNodePtr *natPortNodes = NULL; g_autofree char *addrStart = NULL; g_autofree char *addrEnd = NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; @@ -1441,7 +1441,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; @@ -1677,7 +1677,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 2f543ced70..c5e55dff33 100644 --- a/src/conf/networkcommon_conf.c +++ b/src/conf/networkcommon_conf.c @@ -222,7 +222,7 @@ virNetDevIPRouteParseXML(const char *errorDetail, * of an array. On failure clear: it out, but don't free it. */ - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree char *family = NULL; g_autofree char *address = NULL; g_autofree char *netmask = NULL; diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index b4c1acb6a5..642e9cb89f 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -778,7 +778,7 @@ virNodeDevCapDRMParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapDRM *drm) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); int val; g_autofree char *type = NULL; @@ -866,7 +866,7 @@ virNodeDevAPMatrixCapabilityParseXML(xmlXPathContextPtr ctxt, virNodeDevCapAPMatrix *apm_dev) { g_autofree char *type = virXMLPropString(node, "type"); - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; @@ -893,7 +893,7 @@ virNodeDevCSSCapabilityParseXML(xmlXPathContextPtr ctxt, virNodeDevCapCCW *ccw_dev) { g_autofree char *type = virXMLPropString(node, "type"); - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; @@ -920,7 +920,7 @@ virNodeDevCapCCWParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapCCW *ccw_dev) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree xmlNodePtr *nodes = NULL; int n = 0; size_t i = 0; @@ -1011,7 +1011,7 @@ virNodeDevCapAPCardParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapAPCard *ap_card) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; return virNodeDevCapAPAdapterParseXML(ctxt, def, &ap_card->ap_adapter); @@ -1025,7 +1025,7 @@ virNodeDevCapAPQueueParseXML(xmlXPathContextPtr ctxt, virNodeDevCapAPQueue *ap_queue) { int ret = -1; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree char *dom = NULL; ctxt->node = node; @@ -1065,7 +1065,7 @@ virNodeDevCapAPMatrixParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapAPMatrix *ap_matrix) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree xmlNodePtr *nodes = NULL; int n = 0; size_t i = 0; @@ -1090,7 +1090,7 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapStorage *storage) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree xmlNodePtr *nodes = NULL; size_t i; int n; @@ -1176,7 +1176,7 @@ virNodeDevCapSCSIParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapSCSI *scsi) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; @@ -1216,7 +1216,7 @@ virNodeDevCapSCSITargetParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapSCSITarget *scsi_target) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree xmlNodePtr *nodes = NULL; int n = 0; size_t i; @@ -1285,7 +1285,7 @@ virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt, int create, const char *virt_type) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree xmlNodePtr *nodes = NULL; int n = 0; size_t i; @@ -1378,7 +1378,7 @@ virNodeDevCapNetParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapNet *net) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr lnk; size_t i = -1; int n = -1; @@ -1449,7 +1449,7 @@ virNodeDevCapUSBInterfaceParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapUSBIf *usb_if) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; @@ -1513,7 +1513,7 @@ virNodeDevCapUSBDevParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapUSBDev *usb_dev) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; @@ -1553,7 +1553,7 @@ virNodeDevCapPCIDevIommuGroupParseXML(xmlXPathContextPtr ctxt, xmlNodePtr iommuGroupNode, virNodeDevCapPCIDev *pci_dev) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree xmlNodePtr *addrNodes = NULL; int nAddrNodes; size_t i; @@ -1604,7 +1604,7 @@ virPCIEDeviceInfoParseXML(xmlXPathContextPtr ctxt, xmlNodePtr pciExpressNode, virPCIEDeviceInfo *pci_express) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr lnk; ctxt->node = pciExpressNode; @@ -1697,7 +1697,7 @@ virNodeDevPCICapabilityParseXML(xmlXPathContextPtr ctxt, virNodeDevCapPCIDev *pci_dev) { g_autofree char *type = virXMLPropString(node, "type"); - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; @@ -1735,7 +1735,7 @@ virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapPCIDev *pci_dev) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr iommuGroupNode; xmlNodePtr pciExpress; g_autofree xmlNodePtr *nodes = NULL; @@ -1844,7 +1844,7 @@ virNodeDevCapSystemParseXML(xmlXPathContextPtr ctxt, { virNodeDevCapSystemHardware *hardware = &syscap->hardware; virNodeDevCapSystemFirmware *firmware = &syscap->firmware; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree char *tmp = NULL; ctxt->node = node; @@ -1880,7 +1880,7 @@ virNodeDevCapMdevAttributeParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapMdev *mdev) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autoptr(virMediatedDeviceAttr) attr = virMediatedDeviceAttrNew(); ctxt->node = node; @@ -1903,7 +1903,7 @@ virNodeDevCapMdevParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapMdev *mdev) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); int nattrs = 0; g_autofree xmlNodePtr *attrs = NULL; size_t i; diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 9a9b5f4b60..5fb4efb34f 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -829,7 +829,7 @@ virDomainNumaDefNodeCacheParseXML(virDomainNuma *def, def->mem_nodes[cur_cell].caches = g_new0(virNumaCache, n); for (i = 0; i < n; i++) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); virNumaCache *cache = &def->mem_nodes[cur_cell].caches[i]; g_autofree char *tmp = NULL; unsigned int level; @@ -928,7 +928,7 @@ virDomainNumaDefParseXML(virDomainNuma *def, def->nmem_nodes = n; for (i = 0; i < n; i++) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree char *tmp = NULL; int rc; unsigned int cur_cell; @@ -1026,7 +1026,7 @@ virDomainNumaDefParseXML(virDomainNuma *def, VIR_XML_PROP_REQUIRED, &value) < 0) return -1; } else if (virXMLNodeNameEqual(interconnect[i], "bandwidth")) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); type = VIR_NUMA_INTERCONNECT_TYPE_BANDWIDTH; ctxt->node = interconnect[i]; diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index fc6f0a859d..e1eab609d7 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 135deeb933..dcc4cf8a55 100644 --- a/src/conf/storage_adapter_conf.c +++ b/src/conf/storage_adapter_conf.c @@ -169,7 +169,7 @@ virStorageAdapterParseXML(virStorageAdapter *adapter, xmlXPathContextPtr ctxt) { int type; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index c78456695c..b2fcde531c 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -533,7 +533,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, g_autofree char *ver = NULL; g_autofree xmlNodePtr *nodeset = NULL; g_autofree char *sourcedir = NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; @@ -693,7 +693,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/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c index 9112b96cc7..fabe3334cf 100644 --- a/src/conf/storage_encryption_conf.c +++ b/src/conf/storage_encryption_conf.c @@ -140,7 +140,7 @@ static virStorageEncryptionSecret * virStorageEncryptionSecretParse(xmlXPathContextPtr ctxt, xmlNodePtr node) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); virStorageEncryptionSecret *ret; g_autofree char *type_str = NULL; @@ -213,7 +213,7 @@ virStorageEncryption * virStorageEncryptionParseNode(xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr *nodes = NULL; virStorageEncryption *encdef = NULL; virStorageEncryption *ret = NULL; diff --git a/src/conf/storage_source_conf.c b/src/conf/storage_source_conf.c index 5ca06fa30a..5e1960cee8 100644 --- a/src/conf/storage_source_conf.c +++ b/src/conf/storage_source_conf.c @@ -234,7 +234,7 @@ virStorageAuthDef * virStorageAuthDefParse(xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); virStorageAuthDef *ret = NULL; xmlNodePtr secretnode = NULL; g_autoptr(virStorageAuthDef) authdef = NULL; diff --git a/src/conf/virsavecookie.c b/src/conf/virsavecookie.c index 6cb7fafb1f..f95b85913e 100644 --- a/src/conf/virsavecookie.c +++ b/src/conf/virsavecookie.c @@ -57,7 +57,7 @@ virSaveCookieParse(xmlXPathContextPtr ctxt, virObject **obj, virSaveCookieCallbacks *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 6baaa77776..dd7e99f525 100644 --- a/src/cpu/cpu_map.c +++ b/src/cpu/cpu_map.c @@ -39,7 +39,7 @@ loadData(const char *mapfile, cpuMapLoadCallback callback, void *data) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree xmlNodePtr *nodes = NULL; int n; size_t i; @@ -113,7 +113,7 @@ loadIncludes(xmlXPathContextPtr ctxt, cpuMapLoadCallback modelCB, void *data) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree xmlNodePtr *nodes = NULL; int n; size_t i; diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 1b829e5658..7a1b54e9d0 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1509,7 +1509,7 @@ x86ModelParseSignatures(virCPUx86Model *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 0920e91fd1..33f4066a51 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -210,7 +210,7 @@ lxcDomainDefNamespaceParse(xmlXPathContextPtr ctxt, { lxcDomainDef *lxcDef = NULL; g_autofree xmlNodePtr *nodes = NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); int n; size_t i; int ret = -1; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 286d34ae54..e1930d60af 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3750,7 +3750,7 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsAccel *caps, char *str = NULL; xmlNodePtr hostCPUNode; g_autofree xmlNodePtr *nodes = NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autoptr(qemuMonitorCPUModelInfo) 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 50a921c80d..ab39816a73 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -231,7 +231,7 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr node, virDomainDiskDef *disk, virDomainXMLOption *xmlopt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); qemuDomainDiskPrivate *diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); g_autofree char *format = NULL; g_autofree char *type = NULL; @@ -2645,7 +2645,7 @@ qemuDomainObjPrivateXMLParseBlockjobChain(xmlNodePtr node, virDomainXMLOption *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; @@ -2845,7 +2845,7 @@ qemuDomainObjPrivateXMLParseBlockjobData(virDomainObj *vm, xmlXPathContextPtr ctxt, virDomainXMLOption *xmlopt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); virDomainDiskDef *disk = NULL; g_autoptr(qemuBlockJobData) job = NULL; g_autofree char *name = NULL; @@ -3027,7 +3027,7 @@ qemuDomainObjPrivateXMLParseSlirpFeatures(xmlNodePtr featuresNode, xmlXPathContextPtr ctxt, qemuSlirp *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 03a8d9ba5f..21d41c552e 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -1244,7 +1244,7 @@ qemuDomainObjPrivateXMLParseJob(virDomainObj *vm, { qemuDomainObjPrivate *priv = vm->privateData; qemuDomainJobObj *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 b67728f9c0..336bccc605 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -963,7 +963,7 @@ qemuMigrationCookieNetworkXMLParse(xmlXPathContextPtr ctxt) size_t i; int n; g_autofree xmlNodePtr *interfaces = NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); if ((n = virXPathNodeSet("./network/interface", ctxt, &interfaces)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1001,7 +1001,7 @@ qemuMigrationCookieNBDXMLParse(xmlXPathContextPtr ctxt) size_t i; int n; g_autofree xmlNodePtr *disks = NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); port = virXPathString("string(./nbd/@port)", ctxt); if (port && virStrToLong_i(port, NULL, 10, &ret->port) < 0) { @@ -1050,7 +1050,7 @@ qemuMigrationCookieStatisticsXMLParse(xmlXPathContextPtr ctxt) { qemuDomainJobInfo *jobInfo = NULL; qemuMonitorMigrationStats *stats; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); if (!(ctxt->node = virXPathNode("./statistics", ctxt))) return NULL; @@ -1221,7 +1221,7 @@ qemuMigrationCookieBlockDirtyBitmapsParse(xmlXPathContextPtr ctxt, g_autofree xmlNodePtr *disknodes = NULL; int ndisknodes; size_t i; - VIR_XPATH_NODE_AUTORESTORE(ctxt) + VIR_XPATH_NODE_AUTORESTORE(ctxt); if ((ndisknodes = virXPathNodeSet("./blockDirtyBitmaps/disk", ctxt, &disknodes)) < 0) return -1; -- 2.31.1
On a Wednesday in 2021, Tim Wiederhake wrote:
This is preparation for the next patch which will make the use of a semicolon after VIR_XPATH_NODE_AUTORESTORE mandatory.
Signed-off-by: Tim Wiederhake <twiederh@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 | 140 ++++++++++++++--------------- 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 | 42 ++++----- src/conf/numa_conf.c | 6 +- src/conf/snapshot_conf.c | 2 +- src/conf/storage_adapter_conf.c | 2 +- src/conf/storage_conf.c | 4 +- src/conf/storage_encryption_conf.c | 4 +- src/conf/storage_source_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 | 8 +- src/qemu/qemu_domainjob.c | 2 +- src/qemu/qemu_migration_cookie.c | 8 +- 23 files changed, 132 insertions(+), 132 deletions(-)
This does not compile on its own, please squash it into the patch that mandates the semicolon. (IIRC I was not able to write a version of the macro that would accept both on both compilers) Jano
Signed-off-by: Tim Wiederhake <twiederh@redhat.com> --- src/util/virxml.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/util/virxml.h b/src/util/virxml.h index 06fb7aebd8..b4716630b9 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -358,10 +358,8 @@ G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virXPathContextNodeSave, virXPathContextNodeRes * node pointer is reset to the original value when this macro was used. */ #define VIR_XPATH_NODE_AUTORESTORE(_ctxt) \ - VIR_WARNINGS_NO_UNUSED_VARIABLE \ - g_auto(virXPathContextNodeSave) _ctxt ## CtxtSave = { .ctxt = _ctxt,\ - .node = _ctxt->node}; \ - VIR_WARNINGS_RESET + vir_g_auto(virXPathContextNodeSave) _ctxt ## CtxtSave = { .ctxt = _ctxt, \ + .node = _ctxt->node} G_DEFINE_AUTOPTR_CLEANUP_FUNC(xmlDoc, xmlFreeDoc); G_DEFINE_AUTOPTR_CLEANUP_FUNC(xmlXPathContext, xmlXPathFreeContext); -- 2.31.1
On a Wednesday in 2021, Tim Wiederhake wrote:
Signed-off-by: Tim Wiederhake <twiederh@redhat.com> --- src/util/virxml.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/util/virxml.h b/src/util/virxml.h index 06fb7aebd8..b4716630b9 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -358,10 +358,8 @@ G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virXPathContextNodeSave, virXPathContextNodeRes * node pointer is reset to the original value when this macro was used. */ #define VIR_XPATH_NODE_AUTORESTORE(_ctxt) \ - VIR_WARNINGS_NO_UNUSED_VARIABLE \ - g_auto(virXPathContextNodeSave) _ctxt ## CtxtSave = { .ctxt = _ctxt,\ - .node = _ctxt->node}; \ - VIR_WARNINGS_RESET + vir_g_auto(virXPathContextNodeSave) _ctxt ## CtxtSave = { .ctxt = _ctxt, \ + .node = _ctxt->node}
Instead of creating the vir_g_auto macro, you can simply put the G_GNUC_UNUSED in the declaration here: g_auto(virXPathContextNodeSave) _ctxt ## CtxtSave G_GNUC_UNUSED = ... (I don't remember why I did not figure that out in the first place.) Jano
Using the two-step idiom to force resolution of other macros, e.g.: #define bar BAR CONCAT_(foo, bar) // foobar CONCAT(foo, bar) // fooBAR Signed-off-by: Tim Wiederhake <twiederh@redhat.com> --- src/internal.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/internal.h b/src/internal.h index e1250a59fe..48188e6fa3 100644 --- a/src/internal.h +++ b/src/internal.h @@ -93,6 +93,9 @@ #define NUL_TERMINATE(buf) do { (buf)[sizeof(buf)-1] = '\0'; } while (0) +#define CONCAT_(a, b) a ## b +#define CONCAT(a, b) CONCAT_(a, b) + #ifdef WIN32 # ifndef O_CLOEXEC # define O_CLOEXEC _O_NOINHERIT -- 2.31.1
Locks a virMutex on creation and unlocks it in its destructor. Typical usage: void function(virMutex *m) { vir_g_autoptr(virLockGuard) lock = virLockGuardNew(m); /* `m` is locked, and released automatically on scope exit */ ... while (expression) { vir_g_autoptr(virLockGuard) lock2 = virLockGuardNew(...); /* similar */ } } Signed-off-by: Tim Wiederhake <twiederh@redhat.com> --- src/libvirt_private.syms | 3 +++ src/util/virthread.c | 26 ++++++++++++++++++++++++++ src/util/virthread.h | 10 ++++++++++ 3 files changed, 39 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fa11ee3df5..d8170a59af 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3367,6 +3367,9 @@ virCondInit; virCondSignal; virCondWait; virCondWaitUntil; +virLockGuardFree; +virLockGuardNew; +virLockGuardUnlock; virMutexDestroy; virMutexInit; virMutexInitRecursive; diff --git a/src/util/virthread.c b/src/util/virthread.c index e89c1a09fb..a5a948985f 100644 --- a/src/util/virthread.c +++ b/src/util/virthread.c @@ -96,6 +96,32 @@ void virMutexUnlock(virMutex *m) pthread_mutex_unlock(&m->lock); } +virLockGuard *virLockGuardNew(virMutex *m) +{ + virLockGuard *l = g_new0(virLockGuard, 1); + l->mutex = m; + + virMutexLock(l->mutex); + return l; +} + +void virLockGuardFree(virLockGuard *l) +{ + if (!l) + return; + + virLockGuardUnlock(l); + g_free(l); +} + +void virLockGuardUnlock(virLockGuard *l) +{ + if (!l) + return; + + virMutexUnlock(g_steal_pointer(&l->mutex)); +} + int virRWLockInit(virRWLock *m) { diff --git a/src/util/virthread.h b/src/util/virthread.h index 55c8263ae6..b394dbd226 100644 --- a/src/util/virthread.h +++ b/src/util/virthread.h @@ -31,6 +31,11 @@ struct virMutex { pthread_mutex_t lock; }; +typedef struct virLockGuard virLockGuard; +struct virLockGuard { + virMutex *mutex; +}; + typedef struct virRWLock virRWLock; struct virRWLock { pthread_rwlock_t lock; @@ -121,6 +126,11 @@ void virMutexLock(virMutex *m); void virMutexUnlock(virMutex *m); +virLockGuard *virLockGuardNew(virMutex *m); +void virLockGuardFree(virLockGuard *l); +void virLockGuardUnlock(virLockGuard *l); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virLockGuard, virLockGuardFree); + int virRWLockInit(virRWLock *m) G_GNUC_WARN_UNUSED_RESULT; void virRWLockDestroy(virRWLock *m); -- 2.31.1
On a Wednesday in 2021, Tim Wiederhake wrote:
Locks a virMutex on creation and unlocks it in its destructor.
Typical usage:
void function(virMutex *m) { vir_g_autoptr(virLockGuard) lock = virLockGuardNew(m);
Since the developer does not need to refer to the 'lock' variable, wrapping it in a VIR_MUTEX_LOCK macro would be more convenient. (Even though it would not be usable outside the variable declaration section, due to our enabled warnings) Jano
/* `m` is locked, and released automatically on scope exit */
... while (expression) { vir_g_autoptr(virLockGuard) lock2 = virLockGuardNew(...); /* similar */ } }
Signed-off-by: Tim Wiederhake <twiederh@redhat.com> --- src/libvirt_private.syms | 3 +++ src/util/virthread.c | 26 ++++++++++++++++++++++++++ src/util/virthread.h | 10 ++++++++++ 3 files changed, 39 insertions(+)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fa11ee3df5..d8170a59af 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3367,6 +3367,9 @@ virCondInit; virCondSignal; virCondWait; virCondWaitUntil; +virLockGuardFree; +virLockGuardNew; +virLockGuardUnlock; virMutexDestroy; virMutexInit; virMutexInitRecursive; diff --git a/src/util/virthread.c b/src/util/virthread.c index e89c1a09fb..a5a948985f 100644 --- a/src/util/virthread.c +++ b/src/util/virthread.c @@ -96,6 +96,32 @@ void virMutexUnlock(virMutex *m) pthread_mutex_unlock(&m->lock); }
+virLockGuard *virLockGuardNew(virMutex *m) +{ + virLockGuard *l = g_new0(virLockGuard, 1); + l->mutex = m; + + virMutexLock(l->mutex); + return l; +} + +void virLockGuardFree(virLockGuard *l) +{ + if (!l) + return; + + virLockGuardUnlock(l); + g_free(l); +} + +void virLockGuardUnlock(virLockGuard *l) +{ + if (!l) + return; + + virMutexUnlock(g_steal_pointer(&l->mutex)); +} +
int virRWLockInit(virRWLock *m) { diff --git a/src/util/virthread.h b/src/util/virthread.h index 55c8263ae6..b394dbd226 100644 --- a/src/util/virthread.h +++ b/src/util/virthread.h @@ -31,6 +31,11 @@ struct virMutex { pthread_mutex_t lock; };
+typedef struct virLockGuard virLockGuard; +struct virLockGuard { + virMutex *mutex; +}; + typedef struct virRWLock virRWLock; struct virRWLock { pthread_rwlock_t lock; @@ -121,6 +126,11 @@ void virMutexLock(virMutex *m); void virMutexUnlock(virMutex *m);
+virLockGuard *virLockGuardNew(virMutex *m); +void virLockGuardFree(virLockGuard *l); +void virLockGuardUnlock(virLockGuard *l); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virLockGuard, virLockGuardFree); + int virRWLockInit(virRWLock *m) G_GNUC_WARN_UNUSED_RESULT; void virRWLockDestroy(virRWLock *m);
-- 2.31.1
Modeled after "WITH_QEMU_LOCK_GUARD" (see qemu's include/qemu/lockable.h). Uses "__LINE__" instead of "__COUNTER__", as the latter is a GNU extension. See comment for typical usage. Signed-off-by: Tim Wiederhake <twiederh@redhat.com> --- src/util/virthread.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/util/virthread.h b/src/util/virthread.h index b394dbd226..00a9987a79 100644 --- a/src/util/virthread.h +++ b/src/util/virthread.h @@ -209,3 +209,23 @@ int virThreadLocalSet(virThreadLocal *l, void*) G_GNUC_WARN_UNUSED_RESULT; return 0; \ } \ struct classname ## EatSemicolon + +/** + * WITH_VIR_MUTEX_LOCK_GUARD: + * + * This macro defines a lock scope such that entering the scope takes the lock + * and leaving the scope releases the lock. Return statements are allowed + * within the scope and release the lock. Break and continue statements leave + * the scope early and release the lock. + * + * virMutex *mutex = ...; + * + * WITH_VIR_MUTEX_LOCK_GUARD(mutex) { + * // `mutex` is locked, and released automatically on scope exit + * ... + * } + */ +#define WITH_VIR_MUTEX_LOCK_GUARD(m) \ + for (g_autoptr(virLockGuard) CONCAT(var, __LINE__) = virLockGuardNew(m); \ + CONCAT(var, __LINE__); \ + CONCAT(var, __LINE__) = (virLockGuardFree(CONCAT(var, __LINE__)), NULL)) -- 2.31.1
On a Wednesday in 2021, Tim Wiederhake wrote:
Modeled after "WITH_QEMU_LOCK_GUARD" (see qemu's include/qemu/lockable.h). Uses "__LINE__" instead of "__COUNTER__", as the latter is a GNU extension.
We mandate gnu99 in meson.build. But it seems both would work.
See comment for typical usage.
Signed-off-by: Tim Wiederhake <twiederh@redhat.com> --- src/util/virthread.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
diff --git a/src/util/virthread.h b/src/util/virthread.h index b394dbd226..00a9987a79 100644 --- a/src/util/virthread.h +++ b/src/util/virthread.h @@ -209,3 +209,23 @@ int virThreadLocalSet(virThreadLocal *l, void*) G_GNUC_WARN_UNUSED_RESULT; return 0; \ } \ struct classname ## EatSemicolon + +/** + * WITH_VIR_MUTEX_LOCK_GUARD:
I'd prefer the VIR_ prefix at the start. Also, VIR_MUTEX_WITH should be enough to describe its functionality. Jano
+ * + * This macro defines a lock scope such that entering the scope takes the lock + * and leaving the scope releases the lock. Return statements are allowed + * within the scope and release the lock. Break and continue statements leave + * the scope early and release the lock. + * + * virMutex *mutex = ...; + * + * WITH_VIR_MUTEX_LOCK_GUARD(mutex) { + * // `mutex` is locked, and released automatically on scope exit + * ... + * } + */ +#define WITH_VIR_MUTEX_LOCK_GUARD(m) \ + for (g_autoptr(virLockGuard) CONCAT(var, __LINE__) = virLockGuardNew(m); \ + CONCAT(var, __LINE__); \ + CONCAT(var, __LINE__) = (virLockGuardFree(CONCAT(var, __LINE__)), NULL)) -- 2.31.1
Signed-off-by: Tim Wiederhake <twiederh@redhat.com> --- src/conf/virchrdev.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index 5d6de68427..8ca1c1062c 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -237,12 +237,10 @@ static void virChrdevFDStreamCloseCb(virStreamPtr st G_GNUC_UNUSED, void *opaque) { virChrdevStreamInfo *priv = opaque; - virMutexLock(&priv->devs->lock); + vir_g_autoptr(virLockGuard) lock = virLockGuardNew(&priv->devs->lock); /* remove entry from hash */ virHashRemoveEntry(priv->devs->hash, priv->path); - - virMutexUnlock(&priv->devs->lock); } /** -- 2.31.1
Signed-off-by: Tim Wiederhake <twiederh@redhat.com> --- src/conf/virchrdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index 8ca1c1062c..a95b8976ac 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -291,10 +291,10 @@ void virChrdevFree(virChrdevs *devs) if (!devs) return; - virMutexLock(&devs->lock); - virHashForEachSafe(devs->hash, virChrdevFreeClearCallbacks, NULL); - virHashFree(devs->hash); - virMutexUnlock(&devs->lock); + WITH_VIR_MUTEX_LOCK_GUARD(&devs->lock) { + virHashForEachSafe(devs->hash, virChrdevFreeClearCallbacks, NULL); + virHashFree(devs->hash); + } virMutexDestroy(&devs->lock); g_free(devs); -- 2.31.1
Signed-off-by: Tim Wiederhake <twiederh@redhat.com> --- src/conf/virchrdev.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index a95b8976ac..7acbfd7f6a 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -326,6 +326,7 @@ int virChrdevOpen(virChrdevs *devs, char *path; int ret; bool added = false; + vir_g_autoptr(virLockGuard) lock = NULL; switch (source->type) { case VIR_DOMAIN_CHR_TYPE_PTY: @@ -346,12 +347,11 @@ int virChrdevOpen(virChrdevs *devs, return -1; } - virMutexLock(&devs->lock); + lock = virLockGuardNew(&devs->lock); if ((ent = virHashLookup(devs->hash, path))) { if (!force) { /* entry found, device is busy */ - virMutexUnlock(&devs->lock); return 1; } else { /* terminate existing connection */ @@ -369,16 +369,12 @@ int virChrdevOpen(virChrdevs *devs, } /* create the lock file */ - if ((ret = virChrdevLockFileCreate(path)) < 0) { - virMutexUnlock(&devs->lock); + if ((ret = virChrdevLockFileCreate(path)) < 0) return ret; - } /* obtain a reference to the stream */ - if (virStreamRef(st) < 0) { - virMutexUnlock(&devs->lock); + if (virStreamRef(st) < 0) return -1; - } cbdata = g_new0(virChrdevStreamInfo, 1); ent = g_new0(virChrdevHashEntry, 1); @@ -417,7 +413,6 @@ int virChrdevOpen(virChrdevs *devs, cbdata, virChrdevFDStreamCloseCbFree); - virMutexUnlock(&devs->lock); return 0; error: @@ -429,7 +424,6 @@ int virChrdevOpen(virChrdevs *devs, if (cbdata) VIR_FREE(cbdata->path); VIR_FREE(cbdata); - virMutexUnlock(&devs->lock); virChrdevHashEntryFree(ent); return -1; } -- 2.31.1
Signed-off-by: Tim Wiederhake <twiederh@redhat.com> --- src/network/bridge_driver.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index e8b9ffa1fc..5ccc3817d4 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3143,7 +3143,7 @@ static int networkBridgeNameValidate(virNetworkObjList *nets, virNetworkDef *def) { - virMutexLock(&bridgeNameValidateMutex); + vir_g_autoptr(virLockGuard) lock = virLockGuardNew(&bridgeNameValidateMutex); if (def->bridge && !strstr(def->bridge, "%d")) { if (virNetworkObjBridgeInUse(nets, def->bridge, def->name)) { @@ -3158,11 +3158,9 @@ networkBridgeNameValidate(virNetworkObjList *nets, goto error; } - virMutexUnlock(&bridgeNameValidateMutex); return 0; error: - virMutexUnlock(&bridgeNameValidateMutex); return -1; } -- 2.31.1
Signed-off-by: Tim Wiederhake <twiederh@redhat.com> --- src/network/bridge_driver.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 5ccc3817d4..7c46a65c72 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3150,18 +3150,15 @@ networkBridgeNameValidate(virNetworkObjList *nets, virReportError(VIR_ERR_INTERNAL_ERROR, _("bridge name '%s' already in use."), def->bridge); - goto error; + return -1; } } else { /* Allocate a bridge name */ if (networkFindUnusedBridgeName(nets, def) < 0) - goto error; + return -1; } return 0; - - error: - return -1; } -- 2.31.1
participants (4)
-
Daniel P. Berrangé -
Ján Tomko -
Pavel Hrdina -
Tim Wiederhake