src: s/G_NO_INLINE/ATTRIBUTE_MOCKABLE/

zippy2 · zippy2 · commit f8bc6af44d67 · 2025-05-02T14:31:19.000+02:00
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 &lt;mprivozn@redhat.com&gt;
Reviewed-by: Daniel P. Berrangé &lt;berrange@redhat.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -168,19 +168,19 @@ 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;
 
 
 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
@@ -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
@@ -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
diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h
diff --git a/src/util/virnetdevtap.h b/src/util/virnetdevtap.h
diff --git a/src/util/virnuma.h b/src/util/virnuma.h
diff --git a/src/util/virpci.h b/src/util/virpci.h
diff --git a/src/util/virprocess.h b/src/util/virprocess.h
diff --git a/src/util/virrandom.h b/src/util/virrandom.h
diff --git a/src/util/virscsi.h b/src/util/virscsi.h
diff --git a/src/util/virscsivhost.h b/src/util/virscsivhost.h
diff --git a/src/util/virtpm.h b/src/util/virtpm.h
diff --git a/src/util/virutil.h b/src/util/virutil.h
diff --git a/src/util/viruuid.h b/src/util/viruuid.h

Original file line number	Diff line number	Diff line change
`@@ -5657,7 +5657,7 @@ qemuDomainResetDeviceRemoval(virDomainObj *vm)`
`5657`	`5657`	`}`
`5658`	`5658`
`5659`	`5659`
`5660`		`-unsigned long long G_NO_INLINE`
	`5660`	`+unsigned long long ATTRIBUTE_MOCKABLE`
`5661`	`5661`	`qemuDomainGetUnplugTimeout(virDomainObj *vm)`
`5662`	`5662`	`{`
`5663`	`5663`	`if (qemuDomainIsPSeries(vm->def))`