1. Patchew
  2. QEMU
  3. View series

[PATCH] linux-user: Drop uint and ulong

Juan Quintela posted 1 patch 2 years, 9 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20230511085056.13809-1-quintela@redhat.com
Maintainers: Laurent Vivier <laurent@vivier.eu>
linux-user/mmap.c    | 2 +-
linux-user/syscall.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
[PATCH] linux-user: Drop uint and ulong
Posted by Juan Quintela 2 years, 9 months ago 
These are types not used anymore anywhere else.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
 linux-user/mmap.c    | 2 +-
 linux-user/syscall.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 0aa8ae7356..55dd143a10 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -859,7 +859,7 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
 
 static bool can_passthrough_madvise(abi_ulong start, abi_ulong end)
 {
-    ulong addr;
+    abi_ulong addr;
 
     if ((start | end) & ~qemu_host_page_mask) {
         return false;
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 69f740ff98..dd0349712b 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -309,16 +309,16 @@ _syscall0(int, sys_gettid)
 #endif
 
 #if defined(TARGET_NR_getdents) && defined(EMULATE_GETDENTS_WITH_GETDENTS)
-_syscall3(int, sys_getdents, uint, fd, struct linux_dirent *, dirp, uint, count);
+_syscall3(int, sys_getdents, unsigned int, fd, struct linux_dirent *, dirp, unsigned int, count);
 #endif
 #if (defined(TARGET_NR_getdents) && \
       !defined(EMULATE_GETDENTS_WITH_GETDENTS)) || \
     (defined(TARGET_NR_getdents64) && defined(__NR_getdents64))
-_syscall3(int, sys_getdents64, uint, fd, struct linux_dirent64 *, dirp, uint, count);
+_syscall3(int, sys_getdents64, unsigned int, fd, struct linux_dirent64 *, dirp, unsigned int, count);
 #endif
 #if defined(TARGET_NR__llseek) && defined(__NR_llseek)
-_syscall5(int, _llseek,  uint,  fd, ulong, hi, ulong, lo,
-          loff_t *, res, uint, wh);
+_syscall5(int, _llseek,  unsigned int,  fd, unsigned long, hi, unsigned long, lo,
+          loff_t *, res, unsigned int, wh);
 #endif
 _syscall3(int, sys_rt_sigqueueinfo, pid_t, pid, int, sig, siginfo_t *, uinfo)
 _syscall4(int, sys_rt_tgsigqueueinfo, pid_t, pid, pid_t, tid, int, sig,
-- 
2.40.1
Re: [PATCH] linux-user: Drop uint and ulong
Posted by Laurent Vivier 2 years, 9 months ago 
Le 11/05/2023 à 10:50, Juan Quintela a écrit :
> These are types not used anymore anywhere else.
> 
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   linux-user/mmap.c    | 2 +-
>   linux-user/syscall.c | 8 ++++----
>   2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/linux-user/mmap.c b/linux-user/mmap.c
> index 0aa8ae7356..55dd143a10 100644
> --- a/linux-user/mmap.c
> +++ b/linux-user/mmap.c
> @@ -859,7 +859,7 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
>   
>   static bool can_passthrough_madvise(abi_ulong start, abi_ulong end)
>   {
> -    ulong addr;
> +    abi_ulong addr;
>   
>       if ((start | end) & ~qemu_host_page_mask) {
>           return false;
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 69f740ff98..dd0349712b 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -309,16 +309,16 @@ _syscall0(int, sys_gettid)
>   #endif
>   
>   #if defined(TARGET_NR_getdents) && defined(EMULATE_GETDENTS_WITH_GETDENTS)
> -_syscall3(int, sys_getdents, uint, fd, struct linux_dirent *, dirp, uint, count);
> +_syscall3(int, sys_getdents, unsigned int, fd, struct linux_dirent *, dirp, unsigned int, count);
>   #endif
>   #if (defined(TARGET_NR_getdents) && \
>         !defined(EMULATE_GETDENTS_WITH_GETDENTS)) || \
>       (defined(TARGET_NR_getdents64) && defined(__NR_getdents64))
> -_syscall3(int, sys_getdents64, uint, fd, struct linux_dirent64 *, dirp, uint, count);
> +_syscall3(int, sys_getdents64, unsigned int, fd, struct linux_dirent64 *, dirp, unsigned int, count);
>   #endif
>   #if defined(TARGET_NR__llseek) && defined(__NR_llseek)
> -_syscall5(int, _llseek,  uint,  fd, ulong, hi, ulong, lo,
> -          loff_t *, res, uint, wh);
> +_syscall5(int, _llseek,  unsigned int,  fd, unsigned long, hi, unsigned long, lo,
> +          loff_t *, res, unsigned int, wh);
>   #endif
>   _syscall3(int, sys_rt_sigqueueinfo, pid_t, pid, int, sig, siginfo_t *, uinfo)
>   _syscall4(int, sys_rt_tgsigqueueinfo, pid_t, pid, pid_t, tid, int, sig,

Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Re: [PATCH] linux-user: Drop uint and ulong
Posted by Juan Quintela 2 years, 9 months ago 
Laurent Vivier <laurent@vivier.eu> wrote:
> Le 11/05/2023 à 10:50, Juan Quintela a écrit :
>> These are types not used anymore anywhere else.
>> Signed-off-by: Juan Quintela <quintela@redhat.com>
>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>> ---
>>   linux-user/mmap.c    | 2 +-
>>   linux-user/syscall.c | 8 ++++----
>>   2 files changed, 5 insertions(+), 5 deletions(-)
>> diff --git a/linux-user/mmap.c b/linux-user/mmap.c
>> index 0aa8ae7356..55dd143a10 100644
>> --- a/linux-user/mmap.c
>> +++ b/linux-user/mmap.c
>> @@ -859,7 +859,7 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
>>     static bool can_passthrough_madvise(abi_ulong start, abi_ulong
>> end)
>>   {
>> -    ulong addr;
>> +    abi_ulong addr;
>>         if ((start | end) & ~qemu_host_page_mask) {
>>           return false;
>> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
>> index 69f740ff98..dd0349712b 100644
>> --- a/linux-user/syscall.c
>> +++ b/linux-user/syscall.c
>> @@ -309,16 +309,16 @@ _syscall0(int, sys_gettid)
>>   #endif
>>     #if defined(TARGET_NR_getdents) &&
>> defined(EMULATE_GETDENTS_WITH_GETDENTS)
>> -_syscall3(int, sys_getdents, uint, fd, struct linux_dirent *, dirp, uint, count);
>> +_syscall3(int, sys_getdents, unsigned int, fd, struct linux_dirent *, dirp, unsigned int, count);
>>   #endif
>>   #if (defined(TARGET_NR_getdents) && \
>>         !defined(EMULATE_GETDENTS_WITH_GETDENTS)) || \
>>       (defined(TARGET_NR_getdents64) && defined(__NR_getdents64))
>> -_syscall3(int, sys_getdents64, uint, fd, struct linux_dirent64 *, dirp, uint, count);
>> +_syscall3(int, sys_getdents64, unsigned int, fd, struct linux_dirent64 *, dirp, unsigned int, count);
>>   #endif
>>   #if defined(TARGET_NR__llseek) && defined(__NR_llseek)
>> -_syscall5(int, _llseek,  uint,  fd, ulong, hi, ulong, lo,
>> -          loff_t *, res, uint, wh);
>> +_syscall5(int, _llseek,  unsigned int,  fd, unsigned long, hi, unsigned long, lo,
>> +          loff_t *, res, unsigned int, wh);
>>   #endif
>>   _syscall3(int, sys_rt_sigqueueinfo, pid_t, pid, int, sig, siginfo_t *, uinfo)
>>   _syscall4(int, sys_rt_tgsigqueueinfo, pid_t, pid, pid_t, tid, int, sig,
>
> Reviewed-by: Laurent Vivier <laurent@vivier.eu>

I assume this goes through your tree, right?

Later, Juan.
Re: [PATCH] linux-user: Drop uint and ulong
Posted by Philippe Mathieu-Daudé 2 years, 9 months ago 
On 11/5/23 10:50, Juan Quintela wrote:
> These are types not used anymore anywhere else.
> 
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   linux-user/mmap.c    | 2 +-
>   linux-user/syscall.c | 8 ++++----
>   2 files changed, 5 insertions(+), 5 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.