lkl: Implement lkl_printf and lkl_bug internally

arch/lkl/include/uapi/asm/host_ops.h

@@ -226,7 +226,18 @@ void lkl_cleanup(void);
  */
 int lkl_is_running(void);
 
-int lkl_printf(const char *, ...);
-void lkl_bug(const char *, ...);
+/**
+ * lkl_printf - print a message via the host print operation
+ *
+ * @fmt: printf like format string
+ */
+int lkl_printf(const char *fmt, ...);
+
+/**
+ * lkl_bug - print a message and panic via the host operations
+ *
+ * @fmt: printf like format string
+ */
+void lkl_bug(const char *fmt, ...);
 
 #endif

arch/lkl/lib/Makefile

@@ -1,3 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
 
-obj-y += string.o
+obj-y += host_ops.o string.o

arch/lkl/lib/host_ops.c

@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <asm/host_ops.h>
+#include <linux/stdarg.h>
+#include <linux/sprintf.h>
+
+static int lkl_vprintf(const char *fmt, va_list args)
+{
+	int n;
+	char *buffer;
+	va_list copy;
+
+	if (!lkl_ops->print)
+		return 0;
+
+	va_copy(copy, args);
+	n = vsnprintf(NULL, 0, fmt, copy);
+	va_end(copy);
+
+	buffer = lkl_ops->mem_alloc(n + 1);
+	if (!buffer)
+		return -1;
+
+	vsnprintf(buffer, n + 1, fmt, args);
+
+	lkl_ops->print(buffer, n);
+	lkl_ops->mem_free(buffer);
+
+	return n;
+}
+
+int lkl_printf(const char *fmt, ...)
+{
+	int n;
+	va_list args;
+
+	va_start(args, fmt);
+	n = lkl_vprintf(fmt, args);
+	va_end(args);
+
+	return n;
+}
+
+void lkl_bug(const char *fmt, ...)
+{
+	va_list args;
+
+	va_start(args, fmt);
+	lkl_vprintf(fmt, args);
+	va_end(args);
+
+	lkl_ops->panic();
+}

tools/lkl/include/lkl_host.h

@@ -11,13 +11,6 @@ extern "C" {
 extern struct lkl_host_operations lkl_host_ops;
 extern void lkl_change_tls_mode(void);
 
-/**
- * lkl_printf - print a message via the host print operation
- *
- * @fmt: printf like format string
- */
-int lkl_printf(const char *fmt, ...);
-
 extern char lkl_virtio_devs[4096];
 
 #if defined(LKL_HOST_CONFIG_POSIX) || defined(__MSYS__)

tools/lkl/lib/utils.c

@@ -1,4 +1,3 @@
-#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <lkl_host.h>
@@ -159,54 +158,6 @@ void lkl_perror(char *msg, int err)
 	lkl_printf("%s: %s\n", msg, err_msg);
 }
 
-static int lkl_vprintf(const char *fmt, va_list args)
-{
-	int n;
-	char *buffer;
-	va_list copy;
-
-	if (!lkl_host_ops.print)
-		return 0;
-
-	va_copy(copy, args);
-	n = vsnprintf(NULL, 0, fmt, copy);
-	va_end(copy);
-
-	buffer = lkl_host_ops.mem_alloc(n + 1);
-	if (!buffer)
-		return -1;
-
-	vsnprintf(buffer, n + 1, fmt, args);
-
-	lkl_host_ops.print(buffer, n);
-	lkl_host_ops.mem_free(buffer);
-
-	return n;
-}
-
-int lkl_printf(const char *fmt, ...)
-{
-	int n;
-	va_list args;
-
-	va_start(args, fmt);
-	n = lkl_vprintf(fmt, args);
-	va_end(args);
-
-	return n;
-}
-
-void lkl_bug(const char *fmt, ...)
-{
-	va_list args;
-
-	va_start(args, fmt);
-	lkl_vprintf(fmt, args);
-	va_end(args);
-
-	lkl_host_ops.panic();
-}
-
 int lkl_sysctl(const char *path, const char *value)
 {
 	int ret;