src: s/G_NO_INLINE/ATTRIBUTE_MOCKABLE/

Per change in coding style done in previous commit,
ATTRIBUTE_MOCKABLE should be used instead of G_NO_INLINE for
functions that are mocked in our test suite. Do the change.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index fc6a812eaa6c8267069464f0eb91479e76f443ae..36fd1236754221ea7bee0f65c988c65a7254032d 100644 (file)
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -233,7 +233,7 @@ virCPUGetHost(virArch arch,
               virDomainCapsCPUModels *models);
 
 virCPUDef *
-virCPUProbeHost(virArch arch) G_NO_INLINE;
+virCPUProbeHost(virArch arch) ATTRIBUTE_MOCKABLE;
 
 virCPUDef *
 virCPUBaseline(virArch arch,

diff --git a/src/hypervisor/domain_interface.h b/src/hypervisor/domain_interface.h
index b399085f81cc9b4249f4d03b89b2f4e55be83b3a..70a815628bb4541cf011c82422a8a3f3287f1737 100644 (file)
--- a/src/hypervisor/domain_interface.h
+++ b/src/hypervisor/domain_interface.h
@@ -57,4 +57,4 @@ int virDomainInterfaceBridgeConnect(virDomainDef *def,
                                     ebtablesContext *ebtables,
                                     bool macFilter,
                                     const char *bridgeHelperName)
-    ATTRIBUTE_NONNULL(2) G_NO_INLINE;
+    ATTRIBUTE_NONNULL(2) ATTRIBUTE_MOCKABLE;

diff --git a/src/libxl/libxl_capabilities.h b/src/libxl/libxl_capabilities.h
index fd6332b63e03309e84a8d49a2b42535522a61439..cb1b3245bad577933934da30cde7d882aa54c814 100644 (file)
--- a/src/libxl/libxl_capabilities.h
+++ b/src/libxl/libxl_capabilities.h
@@ -47,4 +47,4 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps,
 
 int
 libxlDomainGetEmulatorType(const virDomainDef *def)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index ea7c14daa9a654df99c73172fe614af147daf9d9..40aa7acef42e00d87dae78d411a7adf410ebf427 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -940,10 +940,10 @@ virSGXCapability *
 virQEMUCapsGetSGXCapabilities(virQEMUCaps *qemuCaps);
 
 bool
-virQEMUCapsGetKVMSupportsSecureGuest(virQEMUCaps *qemuCaps) G_NO_INLINE;
+virQEMUCapsGetKVMSupportsSecureGuest(virQEMUCaps *qemuCaps) ATTRIBUTE_MOCKABLE;
 
 bool
-virQEMUCapsProbeHVF(virQEMUCaps *qemuCaps) G_NO_INLINE;
+virQEMUCapsProbeHVF(virQEMUCaps *qemuCaps) ATTRIBUTE_MOCKABLE;
 
 virArch virQEMUCapsArchFromString(const char *arch);
 const char *virQEMUCapsArchToString(virArch arch);

diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h
index 06b36d2eb8e37b0d8310cef77faec6c8696468f1..55286d7d290941623a2ba6ec325391b356b32bd1 100644 (file)
--- a/src/qemu/qemu_capspriv.h
+++ b/src/qemu/qemu_capspriv.h
@@ -82,7 +82,7 @@ virQEMUCapsGetCPUModelX86Data(virQEMUCaps *qemuCaps,
 
 virCPUDef *
 virQEMUCapsProbeHostCPU(virArch hostArch,
-                        virDomainCapsCPUModels *models) G_NO_INLINE;
+                        virDomainCapsCPUModels *models) ATTRIBUTE_MOCKABLE;
 
 void
 virQEMUCapsSetGICCapabilities(virQEMUCaps *qemuCaps,

diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index 79d4f47690f7038ed5eaf0d88ff8311d644999a0..a386c34f20ee8312509bfb658c46666594a5f61e 100644 (file)
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -75,7 +75,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath,
 /* Open a UNIX socket for chardev FD passing */
 int
 qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;
 
 virJSONValue *
 qemuBuildChrDeviceProps(const virDomainDef *vmdef,
@@ -270,7 +270,7 @@ int
 qemuBuildTPMOpenBackendFDs(const char *tpmdev,
                            int *tpmfd,
                            int *cancelfd)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) G_NO_INLINE;
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_MOCKABLE;
 
 const char *
 qemuAudioDriverTypeToString(virDomainAudioType type);
@@ -279,4 +279,4 @@ qemuAudioDriverTypeFromString(const char *str);
 
 int
 qemuVDPAConnect(const char *devicepath)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 5326aba2811e78829b343e34ef0dc75bd4ef0fe3..e84ad816a0f1fb2248cd154615fe3650109f4bf5 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -5657,7 +5657,7 @@ qemuDomainResetDeviceRemoval(virDomainObj *vm)
 }
 
 
-unsigned long long G_NO_INLINE
+unsigned long long ATTRIBUTE_MOCKABLE
 qemuDomainGetUnplugTimeout(virDomainObj *vm)
 {
     if (qemuDomainIsPSeries(vm->def))

diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h
index 8e3a8f769e757e87a3a6de121a55566cb744dc04..de75bf9225bdd92e2aad6c3fd4fa4e220125a4a3 100644 (file)
--- a/src/qemu/qemu_hotplug.h
+++ b/src/qemu/qemu_hotplug.h
@@ -116,7 +116,7 @@ qemuDomainSetVcpuInternal(virQEMUDriver *driver,
                           bool state);
 
 unsigned long long
-qemuDomainGetUnplugTimeout(virDomainObj *vm) G_NO_INLINE;
+qemuDomainGetUnplugTimeout(virDomainObj *vm) ATTRIBUTE_MOCKABLE;
 
 int
 qemuHotplugAttachDBusVMState(virQEMUDriver *driver,

diff --git a/src/qemu/qemu_interface.h b/src/qemu/qemu_interface.h
index ade02c738637d3f1a11b072efba018307448cd72..d9deca00941f09665d0e60b07732a9be099e2d9b 100644 (file)
--- a/src/qemu/qemu_interface.h
+++ b/src/qemu/qemu_interface.h
@@ -33,7 +33,7 @@ int qemuInterfaceDirectConnect(virDomainDef *def,
                                virNetDevVPortProfileOp vmop);
 
 int qemuInterfaceOpenVhostNet(virDomainObj *def,
-                              virDomainNetDef *net) G_NO_INLINE;
+                              virDomainNetDef *net) ATTRIBUTE_MOCKABLE;
 
 int qemuInterfacePrepareSlirp(virQEMUDriver *driver,
                               virDomainNetDef *net);

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 8d49ada114f54e5d659ab2b4479d011ac8d976c7..58d84d424bcf97cba05e17ac346bc59f5ee46e3a 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -436,7 +436,7 @@ int qemuMonitorSetLink(qemuMonitor *mon,
 /* These APIs are for use by the internal Text/JSON monitor impl code only */
 char *qemuMonitorNextCommandID(qemuMonitor *mon);
 int qemuMonitorSend(qemuMonitor *mon,
-                    qemuMonitorMessage *msg) G_NO_INLINE;
+                    qemuMonitorMessage *msg) ATTRIBUTE_MOCKABLE;
 int qemuMonitorUpdateVideoMemorySize(qemuMonitor *mon,
                                      virDomainVideoDef *video,
                                      const char *videoName)

diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index cec4fb387e0128f4a665082fa6cebf091362f5ed..ba278af98a5a45e5ae5279c5ff1c947ac27579dc 100644 (file)
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -31,7 +31,7 @@ int
 qemuMonitorJSONIOProcessLine(qemuMonitor *mon,
                              const char *line,
                              qemuMonitorMessage *msg)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;
 
 int
 qemuMonitorJSONIOProcess(qemuMonitor *mon,

diff --git a/src/qemu/qemu_monitor_priv.h b/src/qemu/qemu_monitor_priv.h
index 60a3cedb64aac147c0f2fadf228794b301023fbc..198105007e47017ae30edfedec4dc6e3f9c8ca53 100644 (file)
--- a/src/qemu/qemu_monitor_priv.h
+++ b/src/qemu/qemu_monitor_priv.h
@@ -101,4 +101,4 @@ qemuMonitorIOWriteWithFD(qemuMonitor *mon,
                          const char *data,
                          size_t len,
                          int fd)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;

diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
index 8f7b3f24c4787eff8baaf995953790e0dcefc4c8..1729b39d7396088cec084b88784867c57c16e2f4 100644 (file)
--- a/src/qemu/qemu_process.h
+++ b/src/qemu/qemu_process.h
@@ -132,7 +132,7 @@ int qemuProcessOpenVhostVsock(virDomainVsockDef *vsock);
 
 int qemuProcessPrepareHostBackendChardevHotplug(virDomainObj *vm,
                                                 virDomainDeviceDef *dev)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;
 
 
 int qemuProcessPrepareHost(virQEMUDriver *driver,
@@ -219,9 +219,9 @@ int qemuProcessRefreshBalloonState(virDomainObj *vm,
 int qemuProcessRefreshDisks(virDomainObj *vm,
                             virDomainAsyncJob asyncJob);
 
-int qemuProcessStartManagedPRDaemon(virDomainObj *vm) G_NO_INLINE;
+int qemuProcessStartManagedPRDaemon(virDomainObj *vm) ATTRIBUTE_MOCKABLE;
 
-void qemuProcessKillManagedPRDaemon(virDomainObj *vm) G_NO_INLINE;
+void qemuProcessKillManagedPRDaemon(virDomainObj *vm) ATTRIBUTE_MOCKABLE;
 
 typedef struct _qemuProcessQMP qemuProcessQMP;
 struct _qemuProcessQMP {

diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h
index fec84ca0682babdb767a3b0e3d5f799ba1856094..7d5934b5df3d79317cd811497b7f2c9f1557ed99 100644 (file)
--- a/src/rpc/virnetsocket.h
+++ b/src/rpc/virnetsocket.h
@@ -132,10 +132,10 @@ int virNetSocketGetUNIXIdentity(virNetSocket *sock,
                                 gid_t *gid,
                                 pid_t *pid,
                                 unsigned long long *timestamp)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;
 int virNetSocketGetSELinuxContext(virNetSocket *sock,
                                   char **context)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;
 
 int virNetSocketSetBlocking(virNetSocket *sock,
                             bool blocking);

diff --git a/src/util/vircgroupv2devices.h b/src/util/vircgroupv2devices.h
index d2d769ba5aa4c0fcec332a69419b7ca08349bd3e..f4ca4cf9955836f6d465581793b9b8eb8b8df986 100644 (file)
--- a/src/util/vircgroupv2devices.h
+++ b/src/util/vircgroupv2devices.h
@@ -26,7 +26,7 @@
 
 bool
 virCgroupV2DevicesAvailable(virCgroup *group)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;
 
 int
 virCgroupV2DevicesDetectProg(virCgroup *group);

diff --git a/src/util/vircommand.h b/src/util/vircommand.h
index 9bcdce35b9d6fcfc8a238cc83f8dd1439029f5f0..a6e9a9a1652dab47e8d2d4b5e4f75b3ef8920edf 100644 (file)
--- a/src/util/vircommand.h
+++ b/src/util/vircommand.h
@@ -62,7 +62,7 @@ typedef enum {
 
 void virCommandPassFD(virCommand *cmd,
                       int fd,
-                      unsigned int flags) G_NO_INLINE;
+                      unsigned int flags) ATTRIBUTE_MOCKABLE;
 
 void virCommandSetPidFile(virCommand *cmd,
                           const char *pidfile) ATTRIBUTE_NONNULL(2);

diff --git a/src/util/virdevmapper.h b/src/util/virdevmapper.h
index 6972050bc56dcf1518ea5e69883913d349f89778..42e6e1c081e529aeb12dbe95a2a40bd972a8912d 100644 (file)
--- a/src/util/virdevmapper.h
+++ b/src/util/virdevmapper.h
@@ -24,7 +24,7 @@
 
 int
 virDevMapperGetTargets(const char *path,
-                       GSList **devPaths) G_NO_INLINE;
+                       GSList **devPaths) ATTRIBUTE_MOCKABLE;
 
 bool
 virIsDevMapperDevice(const char *dev_name) ATTRIBUTE_NONNULL(1);

diff --git a/src/util/virfile.h b/src/util/virfile.h
index e7607240373771e5616eb68bc0a1e4631dbdad54..ce2ffb8ed41b2eb0b1945334d70ef6ce289e4c6d 100644 (file)
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -124,9 +124,9 @@ int virFileWrapperFdClose(virFileWrapperFd *dfd);
 void virFileWrapperFdFree(virFileWrapperFd *dfd);
 
 int virFileLock(int fd, bool shared, off_t start, off_t len, bool waitForLock)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;
 int virFileUnlock(int fd, off_t start, off_t len)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;
 
 typedef int (*virFileRewriteFunc)(int fd,
                                   const char *path,
@@ -193,10 +193,10 @@ int virFileIsLink(const char *linkpath)
     ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT;
 
 char *virFindFileInPath(const char *file)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;
 char *virFindFileInPathFull(const char *file,
                             const char *const *extraDirs)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;
 
 char *virFileFindResource(const char *filename,
                           const char *builddir,
@@ -215,7 +215,7 @@ void virFileActivateDirOverrideForLib(void);
 
 off_t virFileLength(const char *path, int fd) ATTRIBUTE_NONNULL(1);
 bool virFileIsDir (const char *file) ATTRIBUTE_NONNULL(1);
-bool virFileExists(const char *file) ATTRIBUTE_NONNULL(1) G_NO_INLINE;
+bool virFileExists(const char *file) ATTRIBUTE_NONNULL(1) ATTRIBUTE_MOCKABLE;
 bool virFileIsExecutable(const char *file) ATTRIBUTE_NONNULL(1);
 bool virFileIsRegular(const char *file) ATTRIBUTE_NONNULL(1);
 
@@ -254,7 +254,7 @@ int virFileGetMountReverseSubtree(const char *mtabpath,
                                   size_t *nmountsret) G_GNUC_WARN_UNUSED_RESULT;
 
 char *virFileSanitizePath(const char *path);
-char *virFileCanonicalizePath(const char *path) G_NO_INLINE;
+char *virFileCanonicalizePath(const char *path) ATTRIBUTE_MOCKABLE;
 
 enum {
     VIR_FILE_OPEN_NONE        = 0,
@@ -376,21 +376,21 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virFileWrapperFd, virFileWrapperFdFree);
 int virFileGetXAttr(const char *path,
                     const char *name,
                     char **value)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;
 
 int virFileGetXAttrQuiet(const char *path,
                          const char *name,
                          char **value)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;
 
 int virFileSetXAttr(const char *path,
                     const char *name,
                     const char *value)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;
 
 int virFileRemoveXAttr(const char *path,
                        const char *name)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;
 
 int virFileDataSync(int fd);
 

diff --git a/src/util/virfirewalld.h b/src/util/virfirewalld.h
index 2c7d3e22cd466c80ca4f904c374f13a591f1d167..59bd6a20f58eb0ae66b130bedb096b7c4881048f 100644 (file)
--- a/src/util/virfirewalld.h
+++ b/src/util/virfirewalld.h
@@ -33,7 +33,7 @@ typedef enum {
 
 int virFirewallDGetVersion(unsigned long long *version);
 int virFirewallDGetBackend(void);
-int virFirewallDIsRegistered(void) G_NO_INLINE;
+int virFirewallDIsRegistered(void) ATTRIBUTE_MOCKABLE;
 int virFirewallDGetZones(char ***zones, size_t *nzones);
 int virFirewallDGetPolicies(char ***policies, size_t *npolicies);
 bool virFirewallDZoneExists(const char *match);

diff --git a/src/util/virhashcode.h b/src/util/virhashcode.h
index 5c68e5a89aa7403cd39a347c36813d008b994b32..dd02f718e8c7a6c25f826cb910df30353e6af75b 100644 (file)
--- a/src/util/virhashcode.h
+++ b/src/util/virhashcode.h
@@ -30,4 +30,4 @@
 #include "internal.h"
 
 uint32_t virHashCodeGen(const void *key, size_t len, uint32_t seed)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;

diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h
index 92db35232b6905948d592b9cd7ba30db4c43ee0d..289ae41439a2df5bffabf48f7db3c513d841a1c1 100644 (file)
--- a/src/util/virhostcpu.h
+++ b/src/util/virhostcpu.h
@@ -46,7 +46,7 @@ virBitmap *virHostCPUGetAvailableCPUsBitmap(void);
 int virHostCPUGetIsolated(virBitmap **isolated);
 
 int virHostCPUGetCount(void);
-int virHostCPUGetThreadsPerSubcore(virArch arch) G_NO_INLINE;
+int virHostCPUGetThreadsPerSubcore(virArch arch) ATTRIBUTE_MOCKABLE;
 
 int virHostCPUGetMap(unsigned char **cpumap,
                      unsigned int *online,
@@ -60,7 +60,7 @@ int virHostCPUGetInfo(virArch hostarch,
                       unsigned int *threads);
 
 
-int virHostCPUGetKVMMaxVCPUs(void) G_NO_INLINE;
+int virHostCPUGetKVMMaxVCPUs(void) ATTRIBUTE_MOCKABLE;
 
 int virHostCPUStatsAssign(virNodeCPUStatsPtr param,
                           const char *name,
@@ -78,7 +78,7 @@ virBitmap *virHostCPUGetSiblingsList(unsigned int cpu);
 int virHostCPUGetOnline(unsigned int cpu, bool *online);
 
 unsigned int
-virHostCPUGetMicrocodeVersion(virArch hostArch) G_NO_INLINE;
+virHostCPUGetMicrocodeVersion(virArch hostArch) ATTRIBUTE_MOCKABLE;
 
 int virHostCPUGetMSR(unsigned long index,
                      uint64_t *msr);
@@ -90,7 +90,7 @@ virHostCPUTscInfo *virHostCPUGetTscInfo(void);
 int virHostCPUGetSignature(char **signature);
 
 int virHostCPUGetPhysAddrSize(const virArch hostArch,
-                              unsigned int *size) G_NO_INLINE;
+                              unsigned int *size) ATTRIBUTE_MOCKABLE;
 
 int virHostCPUGetHaltPollTime(pid_t pid,
                               unsigned long long *haltPollSuccess,

diff --git a/src/util/virhostmem.h b/src/util/virhostmem.h
index 79e1a300a8ef02308e8d5db4aea82521d326a22f..5c8d46cfa428cbb0dfb97e0c4176ef7384f41cd4 100644 (file)
--- a/src/util/virhostmem.h
+++ b/src/util/virhostmem.h
@@ -57,4 +57,4 @@ int virHostMemAllocPages(unsigned int npages,
                          bool add);
 
 int virHostMemGetTHPSize(unsigned long long *size)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;

diff --git a/src/util/virhostuptime.h b/src/util/virhostuptime.h
index 44a91b5b5237bb46f443b405dfaa8c83e4bb33c6..a6d0779fff8440e0f93340db2348b6410c212064 100644 (file)
--- a/src/util/virhostuptime.h
+++ b/src/util/virhostuptime.h
@@ -24,7 +24,7 @@
 
 int
 virHostGetBootTime(unsigned long long *when)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;
 
 int
 virHostBootTimeInit(void);

diff --git a/src/util/viridentitypriv.h b/src/util/viridentitypriv.h
index 63357d891ac870cf369d6d03c0e2eba462865fe9..ee94d2bf258572d2ee97ef2025fb617b0b804d3f 100644 (file)
--- a/src/util/viridentitypriv.h
+++ b/src/util/viridentitypriv.h
@@ -27,4 +27,4 @@
 #include "viridentity.h"
 
 char *
-virIdentityEnsureSystemToken(void) G_NO_INLINE;
+virIdentityEnsureSystemToken(void) ATTRIBUTE_MOCKABLE;

diff --git a/src/util/virmacaddr.h b/src/util/virmacaddr.h
index 7b9eb7443bd1f39919e50dd81a83f199069d2d5a..f9dd82178c11c51a8efe9e758fe1840102c366c4 100644 (file)
--- a/src/util/virmacaddr.h
+++ b/src/util/virmacaddr.h
@@ -49,7 +49,7 @@ void virMacAddrGetRaw(const virMacAddr *src, unsigned char dst[VIR_MAC_BUFLEN]);
 const char *virMacAddrFormat(const virMacAddr *addr,
                              char *str);
 void virMacAddrGenerate(const unsigned char prefix[VIR_MAC_PREFIX_BUFLEN],
-                        virMacAddr *addr) G_NO_INLINE;
+                        virMacAddr *addr) ATTRIBUTE_MOCKABLE;
 int virMacAddrParse(const char* str,
                     virMacAddr *addr) G_GNUC_WARN_UNUSED_RESULT;
 int virMacAddrParseHex(const char* str,

diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h
index 99fe761c1d195792572119a1014065373a7cf234..1da1795487bcdb15a728fceb4996330d5c5532fb 100644 (file)
--- a/src/util/virnetdev.h
+++ b/src/util/virnetdev.h
@@ -168,11 +168,11 @@ int virNetDevSetupControl(const char *ifname,
     G_GNUC_WARN_UNUSED_RESULT;
 
 int virNetDevExists(const char *brname)
-    ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
+    ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_MOCKABLE;
 
 int virNetDevSetOnline(const char *ifname,
                        bool online)
-    ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
+    ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_MOCKABLE;
 int virNetDevGetOnline(const char *ifname,
                       bool *online)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT;
@@ -180,7 +180,7 @@ int virNetDevGetOnline(const char *ifname,
 
 int virNetDevSetMAC(const char *ifname,
                     const virMacAddr *macaddr)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_MOCKABLE;
 int virNetDevGetMAC(const char *ifname,
                     virMacAddr *macaddr)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT;
@@ -192,7 +192,7 @@ int virNetDevSetCoalesce(const char *ifname,
 
 int virNetDevSetMTU(const char *ifname,
                     int mtu)
-    ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
+    ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_MOCKABLE;
 int virNetDevSetMTUFromDevice(const char *ifname,
                               const char *otherifname)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT;
@@ -314,10 +314,10 @@ int virNetDevSysfsFile(char **pf_sysfs_device_link,
                        const char *ifname,
                        const char *file)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
-    G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
+    G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_MOCKABLE;
 
 int virNetDevRunEthernetScript(const char *ifname, const char *script)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;
 
 int virNetDevVFInterfaceStats(virPCIDeviceAddress *vfAddr,
                               virDomainInterfaceStatsPtr stats)

diff --git a/src/util/virnetdevbandwidth.h b/src/util/virnetdevbandwidth.h
index 65c1500637b86f21e9a54ec17e0d1f5bc65b0cf4..9f271c528331bd9f1c0f619ab72ac8c23732a143 100644 (file)
--- a/src/util/virnetdevbandwidth.h
+++ b/src/util/virnetdevbandwidth.h
@@ -83,7 +83,7 @@ int virNetDevBandwidthUpdateFilter(const char *ifname,
 
 int virNetDevBandwidthSetRootQDisc(const char *ifname,
                                    const char *qdisc)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;
 
 int virNetDevBandWidthAddTxFilterParentQdisc(const char *ifname,
                                              bool hierarchical_class);

diff --git a/src/util/virnetdevip.h b/src/util/virnetdevip.h
index fdf116f5097174e11442dfd3d0484d39b0f0b627..f2ee90be2fc1f903bb50e39e36f118f69bf94b6c 100644 (file)
--- a/src/util/virnetdevip.h
+++ b/src/util/virnetdevip.h
@@ -59,7 +59,7 @@ int virNetDevIPAddrAdd(const char *ifname,
                        virSocketAddr *addr,
                        virSocketAddr *peer,
                        unsigned int prefix)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_MOCKABLE;
 int virNetDevIPRouteAdd(const char *ifname,
                         virSocketAddr *addr,
                         unsigned int prefix,

diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h
index a5c34d6417644117042692823afd03a7895c5757..31e4804cdc0d7c4beb74ba66d204d0ff7ad83151 100644 (file)
--- a/src/util/virnetdevmacvlan.h
+++ b/src/util/virnetdevmacvlan.h
@@ -47,7 +47,7 @@ typedef enum {
 } virNetDevMacVLanCreateFlags;
 
 bool virNetDevMacVLanIsMacvtap(const char *ifname)
-   ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
+   ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_MOCKABLE;
 
 int virNetDevMacVLanCreate(const char *ifname,
                            const virMacAddr *macaddress,

diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h
index a20fb5b0299a90627a72748780f59f42f9e2643a..3b4a1e509b9d9e0923dd96ed4ee1fa546cab94b4 100644 (file)
--- a/src/util/virnetdevopenvswitch.h
+++ b/src/util/virnetdevopenvswitch.h
@@ -65,7 +65,7 @@ virNetDevOpenvswitchMaybeUnescapeReply(char *reply)
 int virNetDevOpenvswitchGetVhostuserIfname(const char *path,
                                            bool server,
                                            char **ifname)
-    ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
+    ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_MOCKABLE;
 
 int virNetDevOpenvswitchUpdateVlan(const char *ifname,
                                    const virNetDevVlan *virtVlan)

diff --git a/src/util/virnetdevtap.h b/src/util/virnetdevtap.h
index 9ebe0ee9ed4b524defaa67c10f151f5599cc9b92..c1c72f901d381456e38f0e29c19b6c24ebc5604c 100644 (file)
--- a/src/util/virnetdevtap.h
+++ b/src/util/virnetdevtap.h
@@ -34,7 +34,7 @@ int virNetDevTapCreate(char **ifname,
                        int *tapfd,
                        size_t tapfdSize,
                        unsigned int flags)
-    ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
+    ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_MOCKABLE;
 
 int virNetDevTapDelete(const char *ifname,
                        const char *tunpath)
@@ -44,7 +44,7 @@ int virNetDevTapGetName(int tapfd, char **ifname)
     ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT;
 
 char* virNetDevTapGetRealDeviceName(char *ifname)
-      ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
+      ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_MOCKABLE;
 
 typedef enum {
    VIR_NETDEV_TAP_CREATE_NONE = 0,
@@ -102,7 +102,7 @@ int virNetDevTapCreateInBridgePort(const char *brname,
                                    unsigned int *actualMTU,
                                    unsigned int flags)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
-    G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
+    G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_MOCKABLE;
 
 int virNetDevTapInterfaceStats(const char *ifname,
                                virDomainInterfaceStatsPtr stats,

diff --git a/src/util/virnuma.h b/src/util/virnuma.h
index 475df96e1d893c7c661de689fdf8a10ef241a373..d3d86733e7ce9de426525f04bdf2b92a2b6b8fa3 100644 (file)
--- a/src/util/virnuma.h
+++ b/src/util/virnuma.h
@@ -33,20 +33,20 @@ int virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode,
 
 virBitmap *virNumaGetHostMemoryNodeset(void);
 bool virNumaNodesetIsAvailable(virBitmap *nodeset);
-bool virNumaIsAvailable(void) G_NO_INLINE;
-int virNumaGetMaxNode(void) G_NO_INLINE;
-bool virNumaNodeIsAvailable(int node) G_NO_INLINE;
+bool virNumaIsAvailable(void) ATTRIBUTE_MOCKABLE;
+int virNumaGetMaxNode(void) ATTRIBUTE_MOCKABLE;
+bool virNumaNodeIsAvailable(int node) ATTRIBUTE_MOCKABLE;
 int virNumaGetDistances(int node,
                         int **distances,
-                        int *ndistances) G_NO_INLINE;
+                        int *ndistances) ATTRIBUTE_MOCKABLE;
 int virNumaGetNodeMemory(int node,
                          unsigned long long *memsize,
-                         unsigned long long *memfree) G_NO_INLINE;
+                         unsigned long long *memfree) ATTRIBUTE_MOCKABLE;
 
-unsigned int virNumaGetMaxCPUs(void) G_NO_INLINE;
+unsigned int virNumaGetMaxCPUs(void) ATTRIBUTE_MOCKABLE;
 
-int virNumaGetNodeOfCPU(int cpu) G_NO_INLINE;
-int virNumaGetNodeCPUs(int node, virBitmap **cpus) G_NO_INLINE;
+int virNumaGetNodeOfCPU(int cpu) ATTRIBUTE_MOCKABLE;
+int virNumaGetNodeCPUs(int node, virBitmap **cpus) ATTRIBUTE_MOCKABLE;
 int virNumaCPUSetToNodeset(virBitmap *cpuset,
                            virBitmap **nodeset);
 int virNumaNodesetToCPUset(virBitmap *nodeset,
@@ -62,7 +62,7 @@ int virNumaGetPages(int node,
                     unsigned long long **pages_avail,
                     unsigned long long **pages_free,
                     size_t *npages)
-    ATTRIBUTE_NONNULL(5) G_NO_INLINE;
+    ATTRIBUTE_NONNULL(5) ATTRIBUTE_MOCKABLE;
 int virNumaSetPagePoolSize(int node,
                            unsigned int page_size,
                            unsigned long long page_count,

diff --git a/src/util/virpci.h b/src/util/virpci.h
index 4409864057b7a4482fe5d3ed56599de9329a9b12..fc538566e10db2fe8888fcc8e1ea03d09528b542 100644 (file)
--- a/src/util/virpci.h
+++ b/src/util/virpci.h
@@ -124,7 +124,7 @@ int virPCIDeviceReset(virPCIDevice *dev,
                       virPCIDeviceList *activeDevs,
                       virPCIDeviceList *inactiveDevs);
 
-int virPCIDeviceFindBestVFIOVariant(virPCIDevice *dev, char **moduleName) G_NO_INLINE;
+int virPCIDeviceFindBestVFIOVariant(virPCIDevice *dev, char **moduleName) ATTRIBUTE_MOCKABLE;
 
 void virPCIDeviceSetManaged(virPCIDevice *dev,
                             bool managed);

diff --git a/src/util/virprocess.h b/src/util/virprocess.h
index 9c74ec7e35f092fac6d58918323b9593d444834b..65e7b24c835afa6943816228f5c1212cb6bcc7b5 100644 (file)
--- a/src/util/virprocess.h
+++ b/src/util/virprocess.h
@@ -77,13 +77,13 @@ void virProcessGetNamespaces(pid_t pid,
 int virProcessSetNamespaces(size_t nfdlist,
                             int *fdlist);
 
-int virProcessSetMaxMemLock(pid_t pid, unsigned long long bytes) G_NO_INLINE;
+int virProcessSetMaxMemLock(pid_t pid, unsigned long long bytes) ATTRIBUTE_MOCKABLE;
 int virProcessSetMaxProcesses(pid_t pid, unsigned int procs);
 int virProcessSetMaxFiles(pid_t pid, unsigned int files);
 int virProcessSetMaxCoreSize(pid_t pid, unsigned long long bytes);
 void virProcessActivateMaxFiles(void);
 
-int virProcessGetMaxMemLock(pid_t pid, unsigned long long *bytes) G_NO_INLINE;
+int virProcessGetMaxMemLock(pid_t pid, unsigned long long *bytes) ATTRIBUTE_MOCKABLE;
 
 /* Callback to run code within the mount namespace tied to the given
  * pid.  This function must use only async-signal-safe functions, as
@@ -111,7 +111,7 @@ typedef int (*virProcessForkCallback)(pid_t ppid,
 
 int virProcessRunInFork(virProcessForkCallback cb,
                         void *opaque)
-    G_NO_INLINE;
+    ATTRIBUTE_MOCKABLE;
 
 int virProcessSetupPrivateMountNS(void);
 

diff --git a/src/util/virrandom.h b/src/util/virrandom.h
index 3bc7d8889cc86b512c271e6f846402c79a7c9cc2..44a0a3ca709e50c0da23e1a53415fe2bcf285a0e 100644 (file)
--- a/src/util/virrandom.h
+++ b/src/util/virrandom.h
@@ -20,10 +20,10 @@
 
 #include "internal.h"
 
-uint64_t virRandomBits(int nbits) G_NO_INLINE;
+uint64_t virRandomBits(int nbits) ATTRIBUTE_MOCKABLE;
 double virRandom(void);
 uint32_t virRandomInt(uint32_t max);
 int virRandomBytes(unsigned char *buf, size_t buflen)
-    ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
+    ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_MOCKABLE;
 int virRandomGenerateWWN(char **wwn, const char *virt_type);
 char *virRandomToken(size_t len);

diff --git a/src/util/virscsi.h b/src/util/virscsi.h
index 8d7c00160b674a3727121d02897e1b1d65ffb954..8ff33c23030fdd45ce6b3e354bd74174867c94e2 100644 (file)
--- a/src/util/virscsi.h
+++ b/src/util/virscsi.h
@@ -34,7 +34,7 @@ char *virSCSIDeviceGetSgName(const char *sysfs_prefix,
                              const char *adapter,
                              unsigned int bus,
                              unsigned int target,
-                             unsigned long long unit) G_NO_INLINE;
+                             unsigned long long unit) ATTRIBUTE_MOCKABLE;
 char *virSCSIDeviceGetDevName(const char *sysfs_prefix,
                               const char *adapter,
                               unsigned int bus,

diff --git a/src/util/virscsivhost.h b/src/util/virscsivhost.h
index 48b5fdec78ca10897b09dd97c4fc98436312c30a..188f5136b0ff9a370c4825f15ff31d27c2969946 100644 (file)
--- a/src/util/virscsivhost.h
+++ b/src/util/virscsivhost.h
@@ -57,6 +57,6 @@ void virSCSIVHostDeviceGetUsedBy(virSCSIVHostDevice *dev,
                                  const char **drv_name,
                                  const char **dom_name);
 void virSCSIVHostDeviceFree(virSCSIVHostDevice *dev);
-int virSCSIVHostOpenVhostSCSI(int *vhostfd) G_NO_INLINE;
+int virSCSIVHostOpenVhostSCSI(int *vhostfd) ATTRIBUTE_MOCKABLE;
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSCSIVHostDevice, virSCSIVHostDeviceFree);

diff --git a/src/util/virtpm.h b/src/util/virtpm.h
index c741d28465f41d74bed5f4d79408887a52141dc7..2892dd307e059fc9a3db25d5b4d36d0805dfa6a9 100644 (file)
--- a/src/util/virtpm.h
+++ b/src/util/virtpm.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-char *virTPMCreateCancelPath(const char *devpath) G_NO_INLINE;
+char *virTPMCreateCancelPath(const char *devpath) ATTRIBUTE_MOCKABLE;
 
 char *virTPMGetSwtpm(void);
 char *virTPMGetSwtpmSetup(void);

diff --git a/src/util/virutil.h b/src/util/virutil.h
index 3bac15d02b4dab320aa52fd825a62ead7340a241..6c07aa42c8b50a723b6c47d54ac3380c70447852 100644 (file)
--- a/src/util/virutil.h
+++ b/src/util/virutil.h
@@ -89,17 +89,17 @@ static inline int pthread_sigmask(int how,
 }
 #endif
 
-char *virGetHostname(void) G_NO_INLINE;
+char *virGetHostname(void) ATTRIBUTE_MOCKABLE;
 char *virGetHostnameQuiet(void);
 
 char *virGetUserDirectory(void);
 char *virGetUserDirectoryByUID(uid_t uid);
 char *virGetUserConfigDirectory(void);
 char *virGetUserCacheDirectory(void);
-char *virGetUserRuntimeDirectory(void) G_NO_INLINE;
+char *virGetUserRuntimeDirectory(void) ATTRIBUTE_MOCKABLE;
 char *virGetUserShell(uid_t uid);
-char *virGetUserName(uid_t uid) G_NO_INLINE;
-char *virGetGroupName(gid_t gid) G_NO_INLINE;
+char *virGetUserName(uid_t uid) ATTRIBUTE_MOCKABLE;
+char *virGetGroupName(gid_t gid) ATTRIBUTE_MOCKABLE;
 int virGetGroupList(uid_t uid, gid_t group, gid_t **groups)
     ATTRIBUTE_NONNULL(3);
 
@@ -131,16 +131,16 @@ int virParseOwnershipIds(const char *label, uid_t *uidPtr, gid_t *gidPtr);
 time_t virGetSelfLastChanged(void);
 void virUpdateSelfLastChanged(const char *path);
 
-long virGetSystemPageSize(void) G_NO_INLINE;
-long virGetSystemPageSizeKB(void) G_NO_INLINE;
+long virGetSystemPageSize(void) ATTRIBUTE_MOCKABLE;
+long virGetSystemPageSizeKB(void) ATTRIBUTE_MOCKABLE;
 
 unsigned long long virMemoryLimitTruncate(unsigned long long value);
 bool virMemoryLimitIsSet(unsigned long long value);
-unsigned long long virMemoryMaxValue(bool ulong) G_NO_INLINE;
+unsigned long long virMemoryMaxValue(bool ulong) ATTRIBUTE_MOCKABLE;
 
 bool virHostHasIOMMU(void);
 
-char *virHostGetDRMRenderNode(void) G_NO_INLINE;
+char *virHostGetDRMRenderNode(void) ATTRIBUTE_MOCKABLE;
 
 /* Kernel cmdline match and comparison strategy for arg=value pairs */
 typedef enum {

diff --git a/src/util/viruuid.h b/src/util/viruuid.h
index 9667bd32001de354c47f1df4ee108b6a1b44b750..c4a09e3bc6d9fe1b4aadfbf7c0dc52cfefed5042 100644 (file)
--- a/src/util/viruuid.h
+++ b/src/util/viruuid.h
@@ -41,11 +41,11 @@
 
 
 int virSetHostUUIDStr(const char *host_uuid);
-int virGetHostUUID(unsigned char *host_uuid) ATTRIBUTE_NONNULL(1) G_NO_INLINE;
+int virGetHostUUID(unsigned char *host_uuid) ATTRIBUTE_NONNULL(1) ATTRIBUTE_MOCKABLE;
 
 bool virUUIDIsValid(const unsigned char *uuid);
 
-int virUUIDGenerate(unsigned char *uuid) G_NO_INLINE;
+int virUUIDGenerate(unsigned char *uuid) ATTRIBUTE_MOCKABLE;
 
 int virUUIDParse(const char *uuidstr,
                  unsigned char *uuid)