Re: [PATCH 22/37] semihosting: Move user-only implementation out-of-line

[Philippe Mathieu-Daudé]

On 13/3/25 04:45, Richard Henderson wrote:

Avoid testing CONFIG_USER_ONLY in semihost.h.

Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
---
  include/semihosting/semihost.h | 29 ++---------------------------
  semihosting/user.c             | 30 ++++++++++++++++++++++++++++++
  semihosting/meson.build        |  2 ++
  3 files changed, 34 insertions(+), 27 deletions(-)
  create mode 100644 semihosting/user.c

diff --git a/include/semihosting/semihost.h b/include/semihosting/semihost.h
index 97d2a2ba99..b03e637578 100644
--- a/include/semihosting/semihost.h
+++ b/include/semihosting/semihost.h
@@ -26,32 +26,6 @@ typedef enum SemihostingTarget {
      SEMIHOSTING_TARGET_GDB
  } SemihostingTarget;

-#ifdef CONFIG_USER_ONLY

-static inline bool semihosting_enabled(bool is_user)
-{
-    return true;
-}
-
-static inline SemihostingTarget semihosting_get_target(void)
-{
-    return SEMIHOSTING_TARGET_AUTO;
-}
-
-static inline const char *semihosting_get_arg(int i)
-{
-    return NULL;
-}
-
-static inline int semihosting_get_argc(void)
-{
-    return 0;
-}
-
-static inline const char *semihosting_get_cmdline(void)
-{
-    return NULL;
-}
-#else /* !CONFIG_USER_ONLY */
  /**
   * semihosting_enabled:
   * @is_user: true if guest code is in usermode (i.e. not privileged)
@@ -59,17 +33,18 @@ static inline const char *semihosting_get_cmdline(void)
   * Return true if guest code is allowed to make semihosting calls.
   */
  bool semihosting_enabled(bool is_user);
+
  SemihostingTarget semihosting_get_target(void);
  const char *semihosting_get_arg(int i);
  int semihosting_get_argc(void);
  const char *semihosting_get_cmdline(void);
  void semihosting_arg_fallback(const char *file, const char *cmd);
+
  /* for vl.c hooks */
  void qemu_semihosting_enable(void);
  int qemu_semihosting_config_options(const char *optstr);
  void qemu_semihosting_chardev_init(void);
  void qemu_semihosting_console_init(Chardev *);
-#endif /* CONFIG_USER_ONLY */
  void qemu_semihosting_guestfd_init(void);

#endif /* SEMIHOST_H */

diff --git a/semihosting/user.c b/semihosting/user.c
new file mode 100644
index 0000000000..f5b500493b
--- /dev/null
+++ b/semihosting/user.c
@@ -0,0 +1,30 @@
+/*
+ * Semihosting for user emulation
+ *
+ * Copyright (c) 2019 Linaro Ltd
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "qemu/osdep.h"
+#include "semihosting/semihost.h"
+
+bool semihosting_enabled(bool is_user)
+{
+    return true;
+}
+
+const char *semihosting_get_arg(int i)
+{
+    return NULL;
+}
+
+int semihosting_get_argc(void)
+{
+    return 0;
+}
+
+const char *semihosting_get_cmdline(void)
+{
+    return NULL;
+}

Do we really need the symbols, can't they be elided now?