motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

bsd-user: style tweak: use {} for all if statements, format else correctly

Browse source 
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
This commit is contained in:
Warner Losh 2021-04-23 19:55:03 -06:00
parent 3306693438
commit cb0ea0197f
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
bsd-user/qemu.h
View file

@ -358,16 +358,18 @@ abi_long copy_to_user(abi_ulong gaddr, void *hptr, size_t len);
static inline void *lock_user(int type, abi_ulong guest_addr, long len, static inline void *lock_user(int type, abi_ulong guest_addr, long len,
int copy) int copy)
{ {
if (!access_ok(type, guest_addr, len)) if (!access_ok(type, guest_addr, len)) {
return NULL; return NULL;
}
#ifdef DEBUG_REMAP #ifdef DEBUG_REMAP
{ {
void *addr; void *addr;
addr = g_malloc(len); addr = g_malloc(len);
if (copy) if (copy) {
memcpy(addr, g2h_untagged(guest_addr), len); memcpy(addr, g2h_untagged(guest_addr), len);
else } else {
memset(addr, 0, len); memset(addr, 0, len);
}
return addr; return addr;
} }
#else #else
@ -384,12 +386,15 @@ static inline void unlock_user(void *host_ptr, abi_ulong guest_addr,
{ {
#ifdef DEBUG_REMAP #ifdef DEBUG_REMAP
if (!host_ptr) if (!host_ptr) {
return; return;
if (host_ptr == g2h_untagged(guest_addr)) }
if (host_ptr == g2h_untagged(guest_addr)) {
return; return;
if (len > 0) }
if (len > 0) {
memcpy(g2h_untagged(guest_addr), host_ptr, len); memcpy(g2h_untagged(guest_addr), host_ptr, len);
}
g_free(host_ptr); g_free(host_ptr);
#endif #endif
} }
@ -405,8 +410,9 @@ static inline void *lock_user_string(abi_ulong guest_addr)
{ {
abi_long len; abi_long len;
len = target_strlen(guest_addr); len = target_strlen(guest_addr);
if (len < 0) if (len < 0) {
return NULL; return NULL;
}
return lock_user(VERIFY_READ, guest_addr, (long)(len + 1), 1); return lock_user(VERIFY_READ, guest_addr, (long)(len + 1), 1);
} }