Require a semicolon for VIR_ONCE_GLOBAL_INIT calls

Missing semicolon at the end of macros can confuse some analyzers
(like cppcheck <filename>). VIR_ONCE_GLOBAL_INIT is almost
exclusively called without an ending semicolon, but let's
standardize on using one like the other macros.

Add a dummy struct definition at the end of the macro, so
the compiler will require callers to add a semicolon.

Reviewed-by: John Ferlan <jferlan@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>

diff --git a/src/bhyve/bhyve_conf.c b/src/bhyve/bhyve_conf.c
index 0cdb3b1d727c538a40e0aa32187fd6b64dd7869d..ee9427ea18884ebc30794e445903b954f284f0eb 100644 (file)
--- a/src/bhyve/bhyve_conf.c
+++ b/src/bhyve/bhyve_conf.c
@@ -43,7 +43,7 @@ static int virBhyveConfigOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virBhyveConfig)
+VIR_ONCE_GLOBAL_INIT(virBhyveConfig);
 
 virBhyveDriverConfigPtr
 virBhyveDriverConfigNew(void)

diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index be39b35da2596507334bf8309e0ac16e187a9859..716ac6e2e7ecbdb62804a1b53725ccf3eb6782ba 100644 (file)
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -63,7 +63,7 @@ static int virCapabilitiesOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virCapabilities)
+VIR_ONCE_GLOBAL_INIT(virCapabilities);
 
 /**
  * virCapabilitiesNew:

diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index d002ddb5027a63315f55ed11ca938a704daee63e..6352eda343b4bcf9e5fac0943cb08ff461c2aaf4 100644 (file)
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -49,7 +49,7 @@ static int virDomainCapsOnceInit(void)
 }
 
 
-VIR_ONCE_GLOBAL_INIT(virDomainCaps)
+VIR_ONCE_GLOBAL_INIT(virDomainCaps);
 
 
 static void

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 1df536f6e732abf98b56236d0f4e721085a926a6..1fc4c8a35ace9bb9575bbbecba54a02832ab36fd 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1067,7 +1067,7 @@ static int virDomainObjOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virDomainObj)
+VIR_ONCE_GLOBAL_INIT(virDomainObj);
 
 
 static void

diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
index 1bba4a25204d4b25f89c2edccb835ae7c0e5adf1..b33589f472adf912de36ebcd7a21273e065cfd3f 100644 (file)
--- a/src/conf/domain_event.c
+++ b/src/conf/domain_event.c
@@ -338,7 +338,7 @@ virDomainEventsOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virDomainEvents)
+VIR_ONCE_GLOBAL_INIT(virDomainEvents);
 
 
 static void

diff --git a/src/conf/network_event.c b/src/conf/network_event.c
index e3d2f2b6b34bdb3ae6597d7d97b8866eb1c9496b..41cabe340a12f554430abb8de7fcfd34565ef5e8 100644 (file)
--- a/src/conf/network_event.c
+++ b/src/conf/network_event.c
@@ -64,7 +64,7 @@ virNetworkEventsOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetworkEvents)
+VIR_ONCE_GLOBAL_INIT(virNetworkEvents);
 
 static void
 virNetworkEventDispose(void *obj)

diff --git a/src/conf/node_device_event.c b/src/conf/node_device_event.c
index e85bcbba0dc6c83a104450d2cd50add8e1cf9841..c6915be593814e6154b5289ffe8a4d6b5a88fe64 100644 (file)
--- a/src/conf/node_device_event.c
+++ b/src/conf/node_device_event.c
@@ -78,7 +78,7 @@ virNodeDeviceEventsOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNodeDeviceEvents)
+VIR_ONCE_GLOBAL_INIT(virNodeDeviceEvents);
 
 static void
 virNodeDeviceEventDispose(void *obj)

diff --git a/src/conf/object_event.c b/src/conf/object_event.c
index 667852fe22ca24c12fd554c07f39b9038670b6a4..5d84598d5900de5c1d4d65089008694f283d25a6 100644 (file)
--- a/src/conf/object_event.c
+++ b/src/conf/object_event.c
@@ -99,7 +99,7 @@ virObjectEventOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virObjectEvent)
+VIR_ONCE_GLOBAL_INIT(virObjectEvent);
 
 /**
  * virClassForObjectEvent:

diff --git a/src/conf/secret_event.c b/src/conf/secret_event.c
index 3395aa128d07cf344b39f48d7e888691a2ec50e5..1c34dcfbc96d3ad63e508deecdbc153ee66c41c5 100644 (file)
--- a/src/conf/secret_event.c
+++ b/src/conf/secret_event.c
@@ -77,7 +77,7 @@ virSecretEventsOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virSecretEvents)
+VIR_ONCE_GLOBAL_INIT(virSecretEvents);
 
 static void
 virSecretEventDispose(void *obj)

diff --git a/src/conf/storage_event.c b/src/conf/storage_event.c
index 32a12eb63f6dadd74b5c73d683e57cf29f20a57e..de36ec3af91cb947efd64232ac15d4ec22aa5ef7 100644 (file)
--- a/src/conf/storage_event.c
+++ b/src/conf/storage_event.c
@@ -78,7 +78,7 @@ virStoragePoolEventsOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virStoragePoolEvents)
+VIR_ONCE_GLOBAL_INIT(virStoragePoolEvents);
 
 static void
 virStoragePoolEventDispose(void *obj)

diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c
index 384d97d768d24e85bb3e9b646154129aeb4ecd36..0e943d0a6c51af54d9c80796938664a6fe495ad5 100644 (file)
--- a/src/conf/virdomainobjlist.c
+++ b/src/conf/virdomainobjlist.c
@@ -60,7 +60,7 @@ static int virDomainObjListOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virDomainObjList)
+VIR_ONCE_GLOBAL_INIT(virDomainObjList);
 
 virDomainObjListPtr virDomainObjListNew(void)
 {

diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c
index 028d699b323515ab185cff872362618137f9ca72..c8d931a4b64024296b817b1d14d94eacc1d8837f 100644 (file)
--- a/src/conf/virinterfaceobj.c
+++ b/src/conf/virinterfaceobj.c
@@ -67,7 +67,7 @@ virInterfaceObjOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virInterfaceObj)
+VIR_ONCE_GLOBAL_INIT(virInterfaceObj);
 
 
 static void

diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c
index 3749dda751079aecd8ec0b1e52ae7b4506d9cf7a..ae1264325a425b8d5820660d9d2f94af39ad83a4 100644 (file)
--- a/src/conf/virnetworkobj.c
+++ b/src/conf/virnetworkobj.c
@@ -84,7 +84,7 @@ virNetworkObjOnceInit(void)
 }
 
 
-VIR_ONCE_GLOBAL_INIT(virNetworkObj)
+VIR_ONCE_GLOBAL_INIT(virNetworkObj);
 
 virNetworkObjPtr
 virNetworkObjNew(void)

diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
index 6df2985561802df64d7dc4ecf4f2a431c937414e..37d9de478f91ab53b21db033d3f5ee8e7f2538a8 100644 (file)
--- a/src/conf/virnodedeviceobj.c
+++ b/src/conf/virnodedeviceobj.c
@@ -69,7 +69,7 @@ virNodeDeviceObjOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNodeDeviceObj)
+VIR_ONCE_GLOBAL_INIT(virNodeDeviceObj);
 
 
 static void

diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbindingobj.c
index d145fe3223791bd1509edd868c640820129e4129..23978d4207fecaf09b88ea6562381afcf5f7254d 100644 (file)
--- a/src/conf/virnwfilterbindingobj.c
+++ b/src/conf/virnwfilterbindingobj.c
@@ -51,7 +51,7 @@ virNWFilterBindingObjOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNWFilterBindingObj)
+VIR_ONCE_GLOBAL_INIT(virNWFilterBindingObj);
 
 virNWFilterBindingObjPtr
 virNWFilterBindingObjNew(void)

diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbindingobjlist.c
index 7e8437988f3deaf061e20087e9ffa5a2f89f8114..887c7c7b097bc014cec24b2f4a6852212db9d75b 100644 (file)
--- a/src/conf/virnwfilterbindingobjlist.c
+++ b/src/conf/virnwfilterbindingobjlist.c
@@ -52,7 +52,7 @@ static int virNWFilterBindingObjListOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNWFilterBindingObjList)
+VIR_ONCE_GLOBAL_INIT(virNWFilterBindingObjList);
 
 
 virNWFilterBindingObjListPtr

diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c
index c4e7b06eca0deed5213779e9c13b0d79fd767673..8b418d5e66e4d5af65728aed7214da7cd9af66d1 100644 (file)
--- a/src/conf/virsecretobj.c
+++ b/src/conf/virsecretobj.c
@@ -78,7 +78,7 @@ virSecretObjOnceInit(void)
 }
 
 
-VIR_ONCE_GLOBAL_INIT(virSecretObj)
+VIR_ONCE_GLOBAL_INIT(virSecretObj);
 
 static virSecretObjPtr
 virSecretObjNew(void)

diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
index 6ea6a97d8904a1c3e990e0b66491b0d9c1036d06..7005de3c245952cdcd9c0d9db40e272d7eea35e4 100644 (file)
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -120,7 +120,7 @@ virStorageVolObjOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virStorageVolObj)
+VIR_ONCE_GLOBAL_INIT(virStorageVolObj);
 
 
 static virStorageVolObjPtr
@@ -211,7 +211,7 @@ virStoragePoolObjOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virStoragePoolObj)
+VIR_ONCE_GLOBAL_INIT(virStoragePoolObj);
 
 
 virStoragePoolObjPtr

diff --git a/src/datatypes.c b/src/datatypes.c
index caf035f178b0604a0bbb9841589479760e4d3877..09f63d9e151eb9f2068e04efba00c6db435da308 100644 (file)
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -109,7 +109,7 @@ virDataTypesOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virDataTypes)
+VIR_ONCE_GLOBAL_INIT(virDataTypes);
 
 /**
  * virGetConnect:

diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c
index a28d1353c11a4ac0208a4e577d3757221f40a5dc..27cc488f4b80c180085c453d1a6e30306b61d802 100644 (file)
--- a/src/interface/interface_backend_netcf.c
+++ b/src/interface/interface_backend_netcf.c
@@ -59,7 +59,7 @@ virNetcfDriverStateOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetcfDriverState)
+VIR_ONCE_GLOBAL_INIT(virNetcfDriverState);
 
 static virNetcfDriverStatePtr driver;
 

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 73e988a3dcd04b6586e81461d9dd341218b390fb..0e08b8f0a291e1f2a640bd361f36a87dc638edb4 100644 (file)
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -66,7 +66,7 @@ static int libxlConfigOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(libxlConfig)
+VIR_ONCE_GLOBAL_INIT(libxlConfig);
 
 static void
 libxlDriverConfigDispose(void *obj)

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 3ada51f51710bd31e74dedb550215ce74b33c3c5..ffafa7967d5b7d023f2a9cb777f1ef2e49fa89ab 100644 (file)
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -61,7 +61,7 @@ libxlDomainObjPrivateOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(libxlDomainObjPrivate)
+VIR_ONCE_GLOBAL_INIT(libxlDomainObjPrivate);
 
 static int
 libxlDomainObjInitJob(libxlDomainObjPrivatePtr priv)

diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c
index cd33efa417416a8811c1e6f5a2278d32df502365..76bcb66a112c30d33f2fec8239adda229548e343 100644 (file)
--- a/src/libxl/libxl_migration.c
+++ b/src/libxl/libxl_migration.c
@@ -248,7 +248,7 @@ libxlMigrationDstArgsOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(libxlMigrationDstArgs)
+VIR_ONCE_GLOBAL_INIT(libxlMigrationDstArgs);
 
 static void
 libxlDoMigrateDstReceive(void *opaque)

diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c
index 272bb719ca38e9948706357a677bc2b40ea128de..16c5ce0cf2174c378d3907fbe44bb533adba6e28 100644 (file)
--- a/src/logging/log_handler.c
+++ b/src/logging/log_handler.c
@@ -82,7 +82,7 @@ virLogHandlerOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virLogHandler)
+VIR_ONCE_GLOBAL_INIT(virLogHandler);
 
 
 static void

diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index c8fa8c4f44b4dc0873b4da2e50863e4020917e27..4720c99793890b8b752bdca510c6c8235a27f5f3 100644 (file)
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -51,7 +51,7 @@ static int virLXCConfigOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virLXCConfig)
+VIR_ONCE_GLOBAL_INIT(virLXCConfig);
 
 
 /* Functions */

diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c
index 0b18a14a89cce983c539c6180071aac4650c000f..6d3db9629a3810e4f9f33132c3be385d5744882d 100644 (file)
--- a/src/lxc/lxc_monitor.c
+++ b/src/lxc/lxc_monitor.c
@@ -57,7 +57,7 @@ static int virLXCMonitorOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virLXCMonitor)
+VIR_ONCE_GLOBAL_INIT(virLXCMonitor);
 
 static void
 virLXCMonitorHandleEventExit(virNetClientProgramPtr prog,

diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index aa86058113d3066dbbd34dc21d363920387ab75a..b1e5f00067e8d194a2441e6751a2913d2d3e4fbc 100644 (file)
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -97,7 +97,7 @@ udevEventDataOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(udevEventData)
+VIR_ONCE_GLOBAL_INIT(udevEventData);
 
 static udevEventDataPtr
 udevEventDataNew(void)

diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index b52beae9d9574a0f8df91997c4ecc91b2766b404..ea62b4b4a5f1b9d11f0fb8d67f37f78d8e45d0fb 100644 (file)
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -140,7 +140,7 @@ static int qemuAgentOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(qemuAgent)
+VIR_ONCE_GLOBAL_INIT(qemuAgent);
 
 
 #if DEBUG_RAW_IO

diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index f19d44b04f3dfb7045b3d3970906b4cb5ceb52d6..0cbebab35992666fac13f2eea6ca4a95a7067b58 100644 (file)
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -66,7 +66,7 @@ qemuBlockJobDataOnceInit(void)
 }
 
 
-VIR_ONCE_GLOBAL_INIT(qemuBlockJobData)
+VIR_ONCE_GLOBAL_INIT(qemuBlockJobData);
 
 static qemuBlockJobDataPtr
 qemuBlockJobDataNew(qemuBlockJobType type,

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index ca271b5274543115d99b126e40ceb62e0f50a4e9..7ed5f94803af21349a6a1a55616b1ac5b35285b7 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -615,7 +615,7 @@ static int virQEMUCapsOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virQEMUCaps)
+VIR_ONCE_GLOBAL_INIT(virQEMUCaps);
 
 static virArch virQEMUCapsArchFromString(const char *arch)
 {

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 8379b5a30d1ca05e0839e497a1aa3403f51e0275..2f5ef8d0c4ca63d22a620079ff3802fed3b96121 100644 (file)
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -80,7 +80,7 @@ static int virQEMUConfigOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virQEMUConfig)
+VIR_ONCE_GLOBAL_INIT(virQEMUConfig);
 
 
 static void

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index b348633d4bdf99ef567d1ac073cf2273f4e52939..162be7e9821df95e5f54e18f2cd4e079eef16737 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -156,7 +156,7 @@ qemuDomainOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(qemuDomain)
+VIR_ONCE_GLOBAL_INIT(qemuDomain);
 
 static void
 qemuDomainLogContextDispose(void *obj)
@@ -1051,7 +1051,7 @@ qemuDomainDiskPrivateOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(qemuDomainDiskPrivate)
+VIR_ONCE_GLOBAL_INIT(qemuDomainDiskPrivate);
 
 static virObjectPtr
 qemuDomainDiskPrivateNew(void)
@@ -1090,7 +1090,7 @@ qemuDomainStorageSourcePrivateOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(qemuDomainStorageSourcePrivate)
+VIR_ONCE_GLOBAL_INIT(qemuDomainStorageSourcePrivate);
 
 virObjectPtr
 qemuDomainStorageSourcePrivateNew(void)
@@ -1129,7 +1129,7 @@ qemuDomainVcpuPrivateOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(qemuDomainVcpuPrivate)
+VIR_ONCE_GLOBAL_INIT(qemuDomainVcpuPrivate);
 
 static virObjectPtr
 qemuDomainVcpuPrivateNew(void)
@@ -1169,7 +1169,7 @@ qemuDomainChrSourcePrivateOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(qemuDomainChrSourcePrivate)
+VIR_ONCE_GLOBAL_INIT(qemuDomainChrSourcePrivate);
 
 static virObjectPtr
 qemuDomainChrSourcePrivateNew(void)
@@ -1207,7 +1207,7 @@ qemuDomainVsockPrivateOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(qemuDomainVsockPrivate)
+VIR_ONCE_GLOBAL_INIT(qemuDomainVsockPrivate);
 
 static virObjectPtr
 qemuDomainVsockPrivateNew(void)
@@ -1247,7 +1247,7 @@ qemuDomainGraphicsPrivateOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(qemuDomainGraphicsPrivate)
+VIR_ONCE_GLOBAL_INIT(qemuDomainGraphicsPrivate);
 
 static virObjectPtr
 qemuDomainGraphicsPrivateNew(void)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 19d5556e063847178d891a545e8f3ed460543af8..8bd4d4d76199bab9447defa4231577ae3c913c2a 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -165,7 +165,7 @@ static int qemuMonitorOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(qemuMonitor)
+VIR_ONCE_GLOBAL_INIT(qemuMonitor);
 
 
 VIR_ENUM_IMPL(qemuMonitorMigrationStatus,

diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c
index fc18e6a204206a80a978231ccb2ab07683b5d78b..5906cdfa19000aac4aee1414178931d90a0cdae5 100644 (file)
--- a/src/rpc/virkeepalive.c
+++ b/src/rpc/virkeepalive.c
@@ -62,7 +62,7 @@ static int virKeepAliveOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virKeepAlive)
+VIR_ONCE_GLOBAL_INIT(virKeepAlive);
 
 static virNetMessagePtr
 virKeepAliveMessage(virKeepAlivePtr ka, int proc)

diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index b7ffdcb05b2889ba66a7bff4764a785759907c00..40d45b9d2a819ecb94e418baa3acdcb71b4a648c 100644 (file)
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -124,7 +124,7 @@ static int virNetClientOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetClient)
+VIR_ONCE_GLOBAL_INIT(virNetClient);
 
 static void virNetClientIOEventLoopPassTheBuck(virNetClientPtr client,
                                                virNetClientCallPtr thiscall);

diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c
index 5e68122881eff34ee9372df6dd73931a27ed16ca..58f24145ecd863db28db24529dd42be6b6f31c5f 100644 (file)
--- a/src/rpc/virnetclientprogram.c
+++ b/src/rpc/virnetclientprogram.c
@@ -58,7 +58,7 @@ static int virNetClientProgramOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetClientProgram)
+VIR_ONCE_GLOBAL_INIT(virNetClientProgram);
 
 
 virNetClientProgramPtr virNetClientProgramNew(unsigned program,

diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c
index 1140b8dfa3d170f76097a600851358137e82ce08..a17da313923c4b5618d6d005054eae5b8f3f6cfa 100644 (file)
--- a/src/rpc/virnetclientstream.c
+++ b/src/rpc/virnetclientstream.c
@@ -75,7 +75,7 @@ static int virNetClientStreamOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetClientStream)
+VIR_ONCE_GLOBAL_INIT(virNetClientStream);
 
 
 static void

diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c
index 833b78d7c0b0ed65bc9aa73f6cdd0022cbc282e3..0ca61c5a9a7157fa366a3d90fb30b29026762cfd 100644 (file)
--- a/src/rpc/virnetdaemon.c
+++ b/src/rpc/virnetdaemon.c
@@ -113,7 +113,7 @@ virNetDaemonOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetDaemon)
+VIR_ONCE_GLOBAL_INIT(virNetDaemon);
 
 
 virNetDaemonPtr

diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c
index b4db5c40c60f6ef0a7b6395ac7d141b7ad275659..f49340f033417d2a2e2d3a48d042f187fc569474 100644 (file)
--- a/src/rpc/virnetsaslcontext.c
+++ b/src/rpc/virnetsaslcontext.c
@@ -66,7 +66,7 @@ static int virNetSASLContextOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetSASLContext)
+VIR_ONCE_GLOBAL_INIT(virNetSASLContext);
 
 /* Apple have annotated all SASL functions as deprecated for
  * unknown reasons. Since they still work, lets just ignore

diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 380ca6b302268a45d66fd4a9b68884c541760fbe..83b871764f5a0f0d82cd7f1b26028d5cd76296d3 100644 (file)
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -96,7 +96,7 @@ static int virNetServerOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetServer)
+VIR_ONCE_GLOBAL_INIT(virNetServer);
 
 unsigned long long virNetServerNextClientID(virNetServerPtr srv)
 {

diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index 2464319a493eff080423d3edd82909ace847aae8..410de253d2460236c2004d404c55e5efcb77a285 100644 (file)
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -131,7 +131,7 @@ static int virNetServerClientOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetServerClient)
+VIR_ONCE_GLOBAL_INIT(virNetServerClient);
 
 
 static void virNetServerClientDispatchEvent(virNetSocketPtr sock, int events, void *opaque);

diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c
index 53f566ba5365c256240ca493271db9ab55452fc1..7ae1d2e95595b3da994dade42d6c1a0596675dd0 100644 (file)
--- a/src/rpc/virnetserverprogram.c
+++ b/src/rpc/virnetserverprogram.c
@@ -55,7 +55,7 @@ static int virNetServerProgramOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetServerProgram)
+VIR_ONCE_GLOBAL_INIT(virNetServerProgram);
 
 
 virNetServerProgramPtr virNetServerProgramNew(unsigned program,

diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c
index 36c92c6714ebe0a0c601296af6fde031e7e76a5b..97341d15469f7c7c6ca346373ea6fd1e301074cf 100644 (file)
--- a/src/rpc/virnetserverservice.c
+++ b/src/rpc/virnetserverservice.c
@@ -59,7 +59,7 @@ static int virNetServerServiceOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetServerService)
+VIR_ONCE_GLOBAL_INIT(virNetServerService);
 
 
 static void virNetServerServiceAccept(virNetSocketPtr sock,

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 4f7b6d59f7c6d90433eeab7ed4be0d0f01cbe051..bfa195298969c435eec09bb1ac42070e9f629618 100644 (file)
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -128,7 +128,7 @@ static int virNetSocketOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetSocket)
+VIR_ONCE_GLOBAL_INIT(virNetSocket);
 
 
 #ifndef WIN32

diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
index 7bc6540641de9bcb3527528baa651727ba6df42d..72e9ed9eaccf333424cab826b89a9b1e927e81c7 100644 (file)
--- a/src/rpc/virnettlscontext.c
+++ b/src/rpc/virnettlscontext.c
@@ -96,7 +96,7 @@ static int virNetTLSContextOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetTLSContext)
+VIR_ONCE_GLOBAL_INIT(virNetTLSContext);
 
 
 static int

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 568c52aa2846f47291559c2920bdecefa546faba..b06567855ed4a9086d0ec88c61bbb2cf06fb7916 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -133,7 +133,7 @@ static int testDriverOnceInit(void)
 
     return 0;
 }
-VIR_ONCE_GLOBAL_INIT(testDriver)
+VIR_ONCE_GLOBAL_INIT(testDriver);
 
 #define TEST_MODEL "i686"
 #define TEST_EMULATOR "/usr/bin/test-hv"

diff --git a/src/util/virclosecallbacks.c b/src/util/virclosecallbacks.c
index c88a94112e7312a98b24dc1f691e2ea8930ff2ef..200577e18e3abab3a6af303411d7719816e3bbd1 100644 (file)
--- a/src/util/virclosecallbacks.c
+++ b/src/util/virclosecallbacks.c
@@ -55,7 +55,7 @@ static int virCloseCallbacksOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virCloseCallbacks)
+VIR_ONCE_GLOBAL_INIT(virCloseCallbacks);
 
 
 virCloseCallbacksPtr

diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
index 9abd9ed3bf2d02054ba5aec0b2c249315d7f07ca..81e20c9df0162166746151d8389fab2aa6a8295b 100644 (file)
--- a/src/util/virdevmapper.c
+++ b/src/util/virdevmapper.c
@@ -58,7 +58,7 @@ virDevMapperOnceInit(void)
 }
 
 
-VIR_ONCE_GLOBAL_INIT(virDevMapper)
+VIR_ONCE_GLOBAL_INIT(virDevMapper);
 
 
 static int

diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index d676bfda69a7431765149cedb63bc14a1896c866..550f3179aecd34546e8be2841ea005f39301f0a2 100644 (file)
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -643,7 +643,7 @@ static int dnsmasqCapsOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(dnsmasqCaps)
+VIR_ONCE_GLOBAL_INIT(dnsmasqCaps);
 
 static void
 dnsmasqCapsSet(dnsmasqCapsPtr caps,

diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c
index cff40bad25081d45b15d229b6fd2a958178e2f9c..1bc43e20a1c233fa2b83028346379796229653cf 100644 (file)
--- a/src/util/virfdstream.c
+++ b/src/util/virfdstream.c
@@ -135,7 +135,7 @@ static int virFDStreamDataOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virFDStreamData)
+VIR_ONCE_GLOBAL_INIT(virFDStreamData);
 
 
 static int

diff --git a/src/util/virfilecache.c b/src/util/virfilecache.c
index eb7dbd97ccec7ad026ed519946c238bb9641fb4c..fa57e3d620c44eb08af18831c424b7dc05d13fa2 100644 (file)
--- a/src/util/virfilecache.c
+++ b/src/util/virfilecache.c
@@ -93,7 +93,7 @@ virFileCacheOnceInit(void)
 }
 
 
-VIR_ONCE_GLOBAL_INIT(virFileCache)
+VIR_ONCE_GLOBAL_INIT(virFileCache);
 
 
 static char *

diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c
index 177f72ef6861df7343bedb5e13a54247f93c0b5a..d63ce05ed879b83c34358338227367ab578fb16b 100644 (file)
--- a/src/util/virfirewall.c
+++ b/src/util/virfirewall.c
@@ -93,7 +93,7 @@ virFirewallOnceInit(void)
     return virFirewallValidateBackend(currentBackend);
 }
 
-VIR_ONCE_GLOBAL_INIT(virFirewall)
+VIR_ONCE_GLOBAL_INIT(virFirewall);
 
 static bool iptablesUseLock;
 static bool ip6tablesUseLock;

diff --git a/src/util/virhash.c b/src/util/virhash.c
index 52722fc04929ffba2b3081b5cf0103d4e9cd80a4..4fcdd61043ac03a83a0c9004c96bf020cc4682e6 100644 (file)
--- a/src/util/virhash.c
+++ b/src/util/virhash.c
@@ -77,7 +77,7 @@ static int virHashAtomicOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virHashAtomic)
+VIR_ONCE_GLOBAL_INIT(virHashAtomic);
 
 
 static uint32_t virHashStrCode(const void *name, uint32_t seed)

diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
index 880ca083d4b74d39d4069d9a087febdde08b0cce..6be395cddac766ec3e7fb1b95f2853067e2f2f02 100644 (file)
--- a/src/util/virhostdev.c
+++ b/src/util/virhostdev.c
@@ -124,7 +124,7 @@ static int virHostdevManagerOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virHostdevManager)
+VIR_ONCE_GLOBAL_INIT(virHostdevManager);
 
 static void
 virHostdevManagerDispose(void *obj)

diff --git a/src/util/viridentity.c b/src/util/viridentity.c
index e7637b5f202b91a4a03ab3cfa2ad741f247c4417..4ceff3cb74334d11256f9607271b0a5fde3af45e 100644 (file)
--- a/src/util/viridentity.c
+++ b/src/util/viridentity.c
@@ -67,7 +67,7 @@ static int virIdentityOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virIdentity)
+VIR_ONCE_GLOBAL_INIT(virIdentity);
 
 /**
  * virIdentityGetCurrent:

diff --git a/src/util/virlog.c b/src/util/virlog.c
index 0861576a001db7a7ba706e8b6a3cb3c1e535b57c..269a5f89d4166f5ea854677517e52b3223997808 100644 (file)
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -298,7 +298,7 @@ virLogOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virLog)
+VIR_ONCE_GLOBAL_INIT(virLog);
 
 
 /**

diff --git a/src/util/virmdev.c b/src/util/virmdev.c
index 8b46534421e74865f97c99d67bc625fd66e24884..814dc5595259ee56b59fe6646aeeced6e6c86a19 100644 (file)
--- a/src/util/virmdev.c
+++ b/src/util/virmdev.c
@@ -66,7 +66,7 @@ virMediatedOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virMediated)
+VIR_ONCE_GLOBAL_INIT(virMediated);
 
 #ifdef __linux__
 

diff --git a/src/util/virpci.c b/src/util/virpci.c
index 81181b2b81d5d906629657751d2edab2c51ac2a1..adeab66d779ff60a6d879cf9fbb491a7731acd50 100644 (file)
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -203,7 +203,7 @@ static int virPCIOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virPCI)
+VIR_ONCE_GLOBAL_INIT(virPCI);
 
 
 static char *

diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c
index d48963c1ff9744f0bbc73213c837d9c7627d9939..1ffd446f40b2c1bfb5bc85db566fe5707a76d5cf 100644 (file)
--- a/src/util/virportallocator.c
+++ b/src/util/virportallocator.c
@@ -91,7 +91,7 @@ virPortAllocatorOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virPortAllocator)
+VIR_ONCE_GLOBAL_INIT(virPortAllocator);
 
 virPortAllocatorRangePtr
 virPortAllocatorRangeNew(const char *name,

diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c
index 9e5a14158f071decd6066822087828d1ea2e9c3f..97891b2f8f727de9f896fe8b2aaba96e1abefa96 100644 (file)
--- a/src/util/virresctrl.c
+++ b/src/util/virresctrl.c
@@ -443,7 +443,7 @@ virResctrlOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virResctrl)
+VIR_ONCE_GLOBAL_INIT(virResctrl);
 
 
 /* Common functions */

diff --git a/src/util/virscsi.c b/src/util/virscsi.c
index 32d249ad5c08267530a16da0477148d91c2f73d3..715064d669fb063ad41f01a830e23037ab38bd98 100644 (file)
--- a/src/util/virscsi.c
+++ b/src/util/virscsi.c
@@ -84,7 +84,7 @@ virSCSIOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virSCSI)
+VIR_ONCE_GLOBAL_INIT(virSCSI);
 
 static int
 virSCSIDeviceGetAdapterId(const char *adapter,

diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c
index ce44079357868e96440710165d59b0d4085207fb..62b3e99ceaa4ca69c6e2cadfd42ddbdab220a26c 100644 (file)
--- a/src/util/virscsivhost.c
+++ b/src/util/virscsivhost.c
@@ -73,7 +73,7 @@ virSCSIVHostOnceInit(void)
 }
 
 
-VIR_ONCE_GLOBAL_INIT(virSCSIVHost)
+VIR_ONCE_GLOBAL_INIT(virSCSIVHost);
 
 
 int

diff --git a/src/util/virstoragefilebackend.c b/src/util/virstoragefilebackend.c
index 72cf3d1d16b176a4df177619d84723ae3f3ea657..9acaea2f81a658e7c841f80d60b68ac94d96bfe5 100644 (file)
--- a/src/util/virstoragefilebackend.c
+++ b/src/util/virstoragefilebackend.c
@@ -83,7 +83,7 @@ static int virStorageFileBackendOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virStorageFileBackend)
+VIR_ONCE_GLOBAL_INIT(virStorageFileBackend);
 
 int
 virStorageFileBackendRegister(virStorageFileBackendPtr backend)

diff --git a/src/util/virthread.h b/src/util/virthread.h
index 6af4492d4218e9bf98869397c76796846119f7a1..218d1fcd3fab7c9c29c2b5fdaab1635f46e44cf4 100644 (file)
--- a/src/util/virthread.h
+++ b/src/util/virthread.h
@@ -181,7 +181,7 @@ int virThreadLocalSet(virThreadLocalPtr l, void*) ATTRIBUTE_RETURN_CHECK;
  *
  * Then invoking the macro:
  *
- *  VIR_ONCE_GLOBAL_INIT(virMyObject)
+ *  VIR_ONCE_GLOBAL_INIT(virMyObject);
  *
  * Will create a method
  *
@@ -211,6 +211,7 @@ int virThreadLocalSet(virThreadLocalPtr l, void*) ATTRIBUTE_RETURN_CHECK;
         } \
  \
         return 0; \
-    }
+    } \
+    struct classname ## EatSemicolon
 
 #endif /* LIBVIRT_VIRTHREAD_H */

diff --git a/src/util/virthreadjob.c b/src/util/virthreadjob.c
index 8f87ae60396f4ba78906d658d1ff9fa217c48b2d..2c6f45fd5196e8e754cfd4db85a4e64118b4dfb8 100644 (file)
--- a/src/util/virthreadjob.c
+++ b/src/util/virthreadjob.c
@@ -42,7 +42,7 @@ virThreadJobOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virThreadJob)
+VIR_ONCE_GLOBAL_INIT(virThreadJob);
 
 
 const char *

diff --git a/src/util/virusb.c b/src/util/virusb.c
index 263712c3233a36b6ec47e8625913613dc8bf6385..3f74aa128347c3159cec0c088d3667b703cfec05 100644 (file)
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -79,7 +79,7 @@ static int virUSBOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virUSB)
+VIR_ONCE_GLOBAL_INIT(virUSB);
 
 static int virUSBSysReadFile(const char *f_name, const char *d_name,
                              int base, unsigned int *value)

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 8eaeb79f3c69a739444dc55782592859dafab9c3..b22a44d6adc4be6a58110d681a7ab8fac4fdfb42 100644 (file)
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -161,7 +161,7 @@ static int vzDriverOnceInit(void)
 
     return 0;
 }
-VIR_ONCE_GLOBAL_INIT(vzDriver)
+VIR_ONCE_GLOBAL_INIT(vzDriver);
 
 vzDriverPtr
 vzGetDriverConnection(void)

diff --git a/tests/virfilecachetest.c b/tests/virfilecachetest.c
index 82c22867528fc91827938edab2066399a818bbd1..08062d66e38cf56408ca96b0e6b932d913dd5f6d 100644 (file)
--- a/tests/virfilecachetest.c
+++ b/tests/virfilecachetest.c
@@ -57,7 +57,7 @@ testFileCacheObjOnceInit(void)
 }
 
 
-VIR_ONCE_GLOBAL_INIT(testFileCacheObj)
+VIR_ONCE_GLOBAL_INIT(testFileCacheObj);
 
 
 static testFileCacheObjPtr