From: Michal Privoznik <mprivozn@redhat.com> There are two functions that are mocked, but are missing required G_NO_INLINE attribute: virFirewallDIsRegistered() and virHostCPUGetPhysAddrSize(). Add it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/util/virfirewalld.h | 2 +- src/util/virhostcpu.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virfirewalld.h b/src/util/virfirewalld.h index 43803ee89a..2c7d3e22cd 100644 --- 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); +int virFirewallDIsRegistered(void) G_NO_INLINE; int virFirewallDGetZones(char ***zones, size_t *nzones); int virFirewallDGetPolicies(char ***policies, size_t *npolicies); bool virFirewallDZoneExists(const char *match); diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h index 1f47634c33..92db35232b 100644 --- a/src/util/virhostcpu.h +++ b/src/util/virhostcpu.h @@ -90,7 +90,7 @@ virHostCPUTscInfo *virHostCPUGetTscInfo(void); int virHostCPUGetSignature(char **signature); int virHostCPUGetPhysAddrSize(const virArch hostArch, - unsigned int *size); + unsigned int *size) G_NO_INLINE; int virHostCPUGetHaltPollTime(pid_t pid, unsigned long long *haltPollSuccess, -- 2.49.0

From: Michal Privoznik <mprivozn@redhat.com> The mock-noinline.py script is fed list of files through its stdin, each file on its own line. Unfortunately, the way the script is written does nothing as the trailing newline character prevents any .endswith() match. Strip each line of white spaces. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- scripts/mock-noinline.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/mock-noinline.py b/scripts/mock-noinline.py index ec617bbc2b..77a5ca23e2 100755 --- a/scripts/mock-noinline.py +++ b/scripts/mock-noinline.py @@ -63,7 +63,8 @@ def scan_overrides(filename): mocked[name] = "%s:%d" % (filename, lineno) -for filename in sys.stdin.readlines(): +for filename in sys.stdin: + filename = filename.rstrip() if filename.endswith(".h"): scan_annotations(filename) elif filename.endswith("mock.c"): -- 2.49.0