From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Thu, 25 Feb 2021 23:44:12 +0000 (+0100)
Subject: tree-wide: replace old systrace logging helpers
X-Git-Tag: lxc-5.0.0~266^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1b38fd16db4087a64af17ce36e0aef8817d8c55;p=thirdparty%2Flxc.git

tree-wide: replace old systrace logging helpers

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index d4d9886ab..37e2282e8 100644
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -507,7 +507,7 @@ static ssize_t lxc_cmd(const char *name, struct lxc_cmd_rr *cmd, bool *stopped,
 		if (IN_SET(errno, ECONNREFUSED, EPIPE))
 			*stopped = 1;
 
-		return systrace(-errno, "Command \"%s\" failed to connect command socket", lxc_cmd_str(cmd->req.cmd));
+		return systrace("Command \"%s\" failed to connect command socket", lxc_cmd_str(cmd->req.cmd));
 	}
 
 	ret = lxc_cmd_rsp_recv(client_fd, cmd);
diff --git a/src/lxc/log.h b/src/lxc/log.h
index 70344e642..1bf12e166 100644
--- a/src/lxc/log.h
+++ b/src/lxc/log.h
@@ -494,13 +494,6 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo,	\
 		__internal_ret__;                             \
 	})
 
-#define systrace(__ret__, format, ...)                        \
-	({                                                    \
-		typeof(__ret__) __internal_ret__ = (__ret__); \
-		SYSTRACE(format, ##__VA_ARGS__);              \
-		__internal_ret__;                             \
-	})
-
 #define sysinfo(__ret__, format, ...)                         \
 	({                                                    \
 		typeof(__ret__) __internal_ret__ = (__ret__); \
@@ -639,6 +632,27 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo,	\
 		__internal_ret__;                             \
 	})
 
+#define systrace(format, ...)                    \
+	({                                       \
+		SYSTRACE(format, ##__VA_ARGS__); \
+		(-errno);                        \
+	})
+
+#define systrace_set(__ret__, format, ...)                    \
+	({                                                    \
+		typeof(__ret__) __internal_ret__ = (__ret__); \
+		errno = labs(__ret__);                        \
+		SYSTRACE(format, ##__VA_ARGS__);              \
+		__internal_ret__;                             \
+	})
+
+#define systrace_ret(__ret__, format, ...)                    \
+	({                                                    \
+		typeof(__ret__) __internal_ret__ = (__ret__); \
+		SYSTRACE(format, ##__VA_ARGS__);              \
+		__internal_ret__;                             \
+	})
+
 extern int lxc_log_fd;
 
 __hidden extern int lxc_log_syslog(int facility);