mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 07:13:54 -06:00
linux-user: Move lock_user et al out of line
These functions are not small, except for unlock_user without debugging enabled. Move them out of line, and add missing braces on the way. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-id: 20210212184902.1251044-18-richard.henderson@linaro.org [PMM: fixed the sense of an ifdef test in qemu.h] Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
c7169b022b
commit
687ca79789
2 changed files with 53 additions and 40 deletions
|
@ -4,6 +4,52 @@
|
|||
|
||||
#include "qemu.h"
|
||||
|
||||
void *lock_user(int type, abi_ulong guest_addr, long len, int copy)
|
||||
{
|
||||
if (!access_ok_untagged(type, guest_addr, len)) {
|
||||
return NULL;
|
||||
}
|
||||
#ifdef DEBUG_REMAP
|
||||
{
|
||||
void *addr;
|
||||
addr = g_malloc(len);
|
||||
if (copy) {
|
||||
memcpy(addr, g2h(guest_addr), len);
|
||||
} else {
|
||||
memset(addr, 0, len);
|
||||
}
|
||||
return addr;
|
||||
}
|
||||
#else
|
||||
return g2h_untagged(guest_addr);
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef DEBUG_REMAP
|
||||
void unlock_user(void *host_ptr, abi_ulong guest_addr, long len);
|
||||
{
|
||||
if (!host_ptr) {
|
||||
return;
|
||||
}
|
||||
if (host_ptr == g2h_untagged(guest_addr)) {
|
||||
return;
|
||||
}
|
||||
if (len > 0) {
|
||||
memcpy(g2h_untagged(guest_addr), host_ptr, len);
|
||||
}
|
||||
g_free(host_ptr);
|
||||
}
|
||||
#endif
|
||||
|
||||
void *lock_user_string(abi_ulong guest_addr)
|
||||
{
|
||||
abi_long len = target_strlen(guest_addr);
|
||||
if (len < 0) {
|
||||
return NULL;
|
||||
}
|
||||
return lock_user(VERIFY_READ, guest_addr, (long)(len + 1), 1);
|
||||
}
|
||||
|
||||
/* copy_from_user() and copy_to_user() are usually used to copy data
|
||||
* buffers between the target and host. These internally perform
|
||||
* locking/unlocking of the memory.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue