From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 12/26] semihosting: Rename softmmu_FOO_user() -> uaccess_FOO_user()
Date: Fri, 6 Oct 2023 13:13:58 +0200 [thread overview]
Message-ID: <20231006111412.13130-13-pbonzini@redhat.com> (raw)
In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com>
From: Philippe Mathieu-Daudé <philmd@linaro.org>
Add a check in 'softmmu-uaccess.h' that the header is only
include in system emulation, and rename it as 'uaccess.h'.
Rename the API methods:
- softmmu_[un]lock_user*() -> uaccess_[un]lock_user*()
- softmmu_strlen_user() -> uaccess_strlen_user().
Update a pair of comments.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231004090629.37473-9-philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
.../{softmmu-uaccess.h => uaccess.h} | 24 +++++++++++--------
semihosting/arm-compat-semi.c | 4 ++--
semihosting/config.c | 2 +-
semihosting/guestfd.c | 2 +-
semihosting/syscalls.c | 2 +-
semihosting/uaccess.c | 14 +++++------
stubs/semihost.c | 4 ++--
target/m68k/m68k-semi.c | 2 +-
target/mips/tcg/sysemu/mips-semi.c | 2 +-
target/nios2/nios2-semi.c | 2 +-
10 files changed, 31 insertions(+), 27 deletions(-)
rename include/semihosting/{softmmu-uaccess.h => uaccess.h} (75%)
diff --git a/include/semihosting/softmmu-uaccess.h b/include/semihosting/uaccess.h
similarity index 75%
rename from include/semihosting/softmmu-uaccess.h
rename to include/semihosting/uaccess.h
index 4f08dfc0986..3963eafc3e2 100644
--- a/include/semihosting/softmmu-uaccess.h
+++ b/include/semihosting/uaccess.h
@@ -7,8 +7,12 @@
* This code is licensed under the GPL
*/
-#ifndef SEMIHOSTING_SOFTMMU_UACCESS_H
-#define SEMIHOSTING_SOFTMMU_UACCESS_H
+#ifndef SEMIHOSTING_UACCESS_H
+#define SEMIHOSTING_UACCESS_H
+
+#ifdef CONFIG_USER_ONLY
+#error Cannot include semihosting/uaccess.h from user emulation
+#endif
#include "cpu.h"
@@ -42,18 +46,18 @@
#define put_user_ual(arg, p) put_user_u32(arg, p)
-void *softmmu_lock_user(CPUArchState *env, target_ulong addr,
+void *uaccess_lock_user(CPUArchState *env, target_ulong addr,
target_ulong len, bool copy);
-#define lock_user(type, p, len, copy) softmmu_lock_user(env, p, len, copy)
+#define lock_user(type, p, len, copy) uaccess_lock_user(env, p, len, copy)
-char *softmmu_lock_user_string(CPUArchState *env, target_ulong addr);
-#define lock_user_string(p) softmmu_lock_user_string(env, p)
+char *uaccess_lock_user_string(CPUArchState *env, target_ulong addr);
+#define lock_user_string(p) uaccess_lock_user_string(env, p)
-void softmmu_unlock_user(CPUArchState *env, void *p,
+void uaccess_unlock_user(CPUArchState *env, void *p,
target_ulong addr, target_ulong len);
-#define unlock_user(s, args, len) softmmu_unlock_user(env, s, args, len)
+#define unlock_user(s, args, len) uaccess_unlock_user(env, s, args, len)
-ssize_t softmmu_strlen_user(CPUArchState *env, target_ulong addr);
-#define target_strlen(p) softmmu_strlen_user(env, p)
+ssize_t uaccess_strlen_user(CPUArchState *env, target_ulong addr);
+#define target_strlen(p) uaccess_strlen_user(env, p)
#endif /* SEMIHOSTING_SOFTMMU_UACCESS_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 564fe17f75c..bb43f012652 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -202,13 +202,13 @@ static LayoutInfo common_semi_find_bases(CPUState *cs)
* The semihosting API has no concept of its errno being thread-safe,
* as the API design predates SMP CPUs and was intended as a simple
* real-hardware set of debug functionality. For QEMU, we make the
- * errno be per-thread in linux-user mode; in softmmu it is a simple
+ * errno be per-thread in linux-user mode; in system-mode it is a simple
* global, and we assume that the guest takes care of avoiding any races.
*/
#ifndef CONFIG_USER_ONLY
static target_ulong syscall_err;
-#include "semihosting/softmmu-uaccess.h"
+#include "semihosting/uaccess.h"
#endif
static inline uint32_t get_swi_errno(CPUState *cs)
diff --git a/semihosting/config.c b/semihosting/config.c
index 8ca569735d0..61e4016fc5f 100644
--- a/semihosting/config.c
+++ b/semihosting/config.c
@@ -12,7 +12,7 @@
* linux-user targets. However in that use case no configuration of
* the outputs and command lines is supported.
*
- * The config module is common to all softmmu targets however as vl.c
+ * The config module is common to all system targets however as vl.c
* needs to link against the helpers.
*
* SPDX-License-Identifier: GPL-2.0-or-later
diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c
index acb86b50ddc..955c2efbd0c 100644
--- a/semihosting/guestfd.c
+++ b/semihosting/guestfd.c
@@ -15,7 +15,7 @@
#ifdef CONFIG_USER_ONLY
#include "qemu.h"
#else
-#include "semihosting/softmmu-uaccess.h"
+#include "semihosting/uaccess.h"
#include CONFIG_DEVICES
#endif
diff --git a/semihosting/syscalls.c b/semihosting/syscalls.c
index d27574a1e2b..4060211d196 100644
--- a/semihosting/syscalls.c
+++ b/semihosting/syscalls.c
@@ -15,7 +15,7 @@
#ifdef CONFIG_USER_ONLY
#include "qemu.h"
#else
-#include "semihosting/softmmu-uaccess.h"
+#include "semihosting/uaccess.h"
#endif
diff --git a/semihosting/uaccess.c b/semihosting/uaccess.c
index 7505eb6d1ba..5d889f92638 100644
--- a/semihosting/uaccess.c
+++ b/semihosting/uaccess.c
@@ -9,9 +9,9 @@
#include "qemu/osdep.h"
#include "exec/exec-all.h"
-#include "semihosting/softmmu-uaccess.h"
+#include "semihosting/uaccess.h"
-void *softmmu_lock_user(CPUArchState *env, target_ulong addr,
+void *uaccess_lock_user(CPUArchState *env, target_ulong addr,
target_ulong len, bool copy)
{
void *p = malloc(len);
@@ -24,7 +24,7 @@ void *softmmu_lock_user(CPUArchState *env, target_ulong addr,
return p;
}
-ssize_t softmmu_strlen_user(CPUArchState *env, target_ulong addr)
+ssize_t uaccess_strlen_user(CPUArchState *env, target_ulong addr)
{
int mmu_idx = cpu_mmu_index(env, false);
size_t len = 0;
@@ -72,16 +72,16 @@ ssize_t softmmu_strlen_user(CPUArchState *env, target_ulong addr)
}
}
-char *softmmu_lock_user_string(CPUArchState *env, target_ulong addr)
+char *uaccess_lock_user_string(CPUArchState *env, target_ulong addr)
{
- ssize_t len = softmmu_strlen_user(env, addr);
+ ssize_t len = uaccess_strlen_user(env, addr);
if (len < 0) {
return NULL;
}
- return softmmu_lock_user(env, addr, len + 1, true);
+ return uaccess_lock_user(env, addr, len + 1, true);
}
-void softmmu_unlock_user(CPUArchState *env, void *p,
+void uaccess_unlock_user(CPUArchState *env, void *p,
target_ulong addr, target_ulong len)
{
if (len) {
diff --git a/stubs/semihost.c b/stubs/semihost.c
index aad7a703532..9343d385d79 100644
--- a/stubs/semihost.c
+++ b/stubs/semihost.c
@@ -1,9 +1,9 @@
/*
- * Semihosting Stubs for SoftMMU
+ * Semihosting Stubs for system emulation
*
* Copyright (c) 2019 Linaro Ltd
*
- * Stubs for SoftMMU targets that don't actually do semihosting.
+ * Stubs for system targets that don't actually do semihosting.
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c
index 80cd8d70dbb..b4ffb70f8b7 100644
--- a/target/m68k/m68k-semi.c
+++ b/target/m68k/m68k-semi.c
@@ -27,7 +27,7 @@
#include "gdbstub/syscalls.h"
#include "gdbstub/helpers.h"
#include "semihosting/syscalls.h"
-#include "semihosting/softmmu-uaccess.h"
+#include "semihosting/uaccess.h"
#include "hw/boards.h"
#include "qemu/log.h"
diff --git a/target/mips/tcg/sysemu/mips-semi.c b/target/mips/tcg/sysemu/mips-semi.c
index f3735df7b9e..cc084eb1a24 100644
--- a/target/mips/tcg/sysemu/mips-semi.c
+++ b/target/mips/tcg/sysemu/mips-semi.c
@@ -22,7 +22,7 @@
#include "qemu/log.h"
#include "gdbstub/syscalls.h"
#include "gdbstub/helpers.h"
-#include "semihosting/softmmu-uaccess.h"
+#include "semihosting/uaccess.h"
#include "semihosting/semihost.h"
#include "semihosting/console.h"
#include "semihosting/syscalls.h"
diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c
index 9d0241c758f..0b84fcb6b62 100644
--- a/target/nios2/nios2-semi.c
+++ b/target/nios2/nios2-semi.c
@@ -26,7 +26,7 @@
#include "gdbstub/syscalls.h"
#include "gdbstub/helpers.h"
#include "semihosting/syscalls.h"
-#include "semihosting/softmmu-uaccess.h"
+#include "semihosting/uaccess.h"
#include "qemu/log.h"
#define HOSTED_EXIT 0
--
2.41.0
next prev parent reply other threads:[~2023-10-06 11:16 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-06 11:13 [PULL 00/26] Audio, source reorg, HVF changes for 2023-10-06 Paolo Bonzini
2023-10-06 11:13 ` [PULL 01/26] target/i386/hvf: Remove unused includes in 'hvf-i386.h' Paolo Bonzini
2023-10-06 11:13 ` [PULL 02/26] sysemu/kvm: Restrict hvf_get_supported_cpuid() to x86 targets Paolo Bonzini
2023-10-06 11:13 ` [PULL 03/26] util/log: re-allow switching away from stderr log file Paolo Bonzini
2023-10-06 11:13 ` [PULL 04/26] target/i386: Check for USER_ONLY definition instead of SOFTMMU one Paolo Bonzini
2023-10-06 11:13 ` [PULL 05/26] softmmu/trace-events: Fix a typo Paolo Bonzini
2023-10-06 11:13 ` [PULL 06/26] travis-ci: Correct invalid mentions of 'softmmu' by 'system' Paolo Bonzini
2023-10-06 11:13 ` [PULL 07/26] cpu: Correct invalid mentions of 'softmmu' by 'system-mode' Paolo Bonzini
2023-10-06 11:13 ` [PULL 08/26] fuzz: Correct invalid mentions of 'softmmu' by 'system' Paolo Bonzini
2023-10-06 11:13 ` [PULL 09/26] tcg: Correct invalid mentions of 'softmmu' by 'system-mode' Paolo Bonzini
2023-10-06 11:13 ` [PULL 10/26] accel: Rename accel_softmmu* -> accel_system* Paolo Bonzini
2023-10-06 11:13 ` [PULL 11/26] gdbstub: Rename 'softmmu' -> 'system' Paolo Bonzini
2023-10-06 11:13 ` Paolo Bonzini [this message]
2023-10-06 11:13 ` [PULL 13/26] target/i386: Rename i386_softmmu_kvm_ss -> i386_kvm_ss Paolo Bonzini
2023-10-06 11:14 ` [PULL 14/26] hw/virtio/meson: Rename softmmu_virtio_ss -> system_virtio_ss Paolo Bonzini
2023-10-06 11:14 ` [PULL 15/26] meson: Rename softmmu_mods -> system_mods Paolo Bonzini
2023-10-06 11:14 ` [PULL 16/26] meson: Rename target_softmmu_arch -> target_system_arch Paolo Bonzini
2023-10-06 11:14 ` [PULL 17/26] system: Rename softmmu/ directory as system/ Paolo Bonzini
2023-10-06 11:14 ` [PULL 18/26] configure: change $softmmu to $system Paolo Bonzini
2023-10-06 11:14 ` [PULL 19/26] cutils: squelch compiler warnings with custom paths Paolo Bonzini
2023-10-06 11:14 ` [PULL 20/26] audio: error hints need a trailing \n Paolo Bonzini
2023-10-06 11:14 ` [PULL 21/26] audio: disable default backends if -audio/-audiodev is used Paolo Bonzini
2023-10-06 11:14 ` [PULL 22/26] audio: extract audio_define_default Paolo Bonzini
2023-10-06 11:14 ` [PULL 23/26] audio: extend -audio to allow creating a default backend Paolo Bonzini
2023-10-06 11:14 ` [PULL 24/26] audio: do not use first -audiodev as default audio device Paolo Bonzini
2023-10-06 11:14 ` [PULL 25/26] audio: reintroduce default audio backend for VNC Paolo Bonzini
2023-10-06 11:14 ` [PULL 26/26] audio, qtest: get rid of QEMU_AUDIO_DRV Paolo Bonzini
2023-10-08 6:13 ` [PULL 00/26] Audio, source reorg, HVF changes for 2023-10-06 Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231006111412.13130-13-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).