1. Patchew
  2. QEMU
  3. View series

[PATCH] linux-user/strace.list: fix epoll_create{,1} -strace output

Sergei Trofimovich posted 1 patch 5 years, 9 months ago
Test docker-mingw@fedora passed
Test docker-quick@centos7 passed
Test checkpatch passed
Test FreeBSD passed
Test asan passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200416175957.1274882-1-slyfox@gentoo.org
Maintainers: Laurent Vivier <laurent@vivier.eu>, Riku Voipio <riku.voipio@iki.fi>
linux-user/strace.list | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[PATCH] linux-user/strace.list: fix epoll_create{,1} -strace output
Posted by Sergei Trofimovich 5 years, 9 months ago 
Fix syscall name and parameters priinter.

Before the change:

```
$ alpha-linux-user/qemu-alpha -strace -L /usr/alpha-unknown-linux-gnu/ /tmp/a
...
1274697 %s(%d)(2097152,274903156744,274903156760,274905840712,274877908880,274903235616) = 3
1274697 exit_group(0)
```

After the change:

```
$ alpha-linux-user/qemu-alpha -strace -L /usr/alpha-unknown-linux-gnu/ /tmp/a
...
1273719 epoll_create1(2097152) = 3
1273719 exit_group(0)
```

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
CC: Riku Voipio <riku.voipio@iki.fi>
CC: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/strace.list | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux-user/strace.list b/linux-user/strace.list
index d49a1e92a8..9281c0a758 100644
--- a/linux-user/strace.list
+++ b/linux-user/strace.list
@@ -125,10 +125,10 @@
 { TARGET_NR_dup3, "dup3" , "%s(%d,%d,%d)", NULL, NULL },
 #endif
 #ifdef TARGET_NR_epoll_create
-{ TARGET_NR_epoll_create, "%s(%d)", NULL, NULL, NULL },
+{ TARGET_NR_epoll_create, "epoll_create", "%s(%d)", NULL, NULL },
 #endif
 #ifdef TARGET_NR_epoll_create1
-{ TARGET_NR_epoll_create1, "%s(%d)", NULL, NULL, NULL },
+{ TARGET_NR_epoll_create1, "epoll_create1", "%s(%d)", NULL, NULL },
 #endif
 #ifdef TARGET_NR_epoll_ctl
 { TARGET_NR_epoll_ctl, "epoll_ctl" , NULL, NULL, NULL },
-- 
2.26.1
Re: [PATCH] linux-user/strace.list: fix epoll_create{,1} -strace output
Posted by Laurent Vivier 5 years, 8 months ago 
Le 16/04/2020 à 19:59, Sergei Trofimovich a écrit :
> Fix syscall name and parameters priinter.
> 
> Before the change:
> 
> ```
> $ alpha-linux-user/qemu-alpha -strace -L /usr/alpha-unknown-linux-gnu/ /tmp/a
> ...
> 1274697 %s(%d)(2097152,274903156744,274903156760,274905840712,274877908880,274903235616) = 3
> 1274697 exit_group(0)
> ```
> 
> After the change:
> 
> ```
> $ alpha-linux-user/qemu-alpha -strace -L /usr/alpha-unknown-linux-gnu/ /tmp/a
> ...
> 1273719 epoll_create1(2097152) = 3
> 1273719 exit_group(0)
> ```
> 
> Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
> CC: Riku Voipio <riku.voipio@iki.fi>
> CC: Laurent Vivier <laurent@vivier.eu>
> ---
>  linux-user/strace.list | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/linux-user/strace.list b/linux-user/strace.list
> index d49a1e92a8..9281c0a758 100644
> --- a/linux-user/strace.list
> +++ b/linux-user/strace.list
> @@ -125,10 +125,10 @@
>  { TARGET_NR_dup3, "dup3" , "%s(%d,%d,%d)", NULL, NULL },
>  #endif
>  #ifdef TARGET_NR_epoll_create
> -{ TARGET_NR_epoll_create, "%s(%d)", NULL, NULL, NULL },
> +{ TARGET_NR_epoll_create, "epoll_create", "%s(%d)", NULL, NULL },
>  #endif
>  #ifdef TARGET_NR_epoll_create1
> -{ TARGET_NR_epoll_create1, "%s(%d)", NULL, NULL, NULL },
> +{ TARGET_NR_epoll_create1, "epoll_create1", "%s(%d)", NULL, NULL },
>  #endif
>  #ifdef TARGET_NR_epoll_ctl
>  { TARGET_NR_epoll_ctl, "epoll_ctl" , NULL, NULL, NULL },
> 

Applied to my linux-user branch.

Thanks,
Laurent
Re: [PATCH] linux-user/strace.list: fix epoll_create{,1} -strace output
Posted by Sergei Trofimovich 5 years, 9 months ago 
On Thu, 16 Apr 2020 18:59:57 +0100
Sergei Trofimovich <slyfox@gentoo.org> wrote:

> Fix syscall name and parameters priinter.
> 
> Before the change:
> 
> ```
> $ alpha-linux-user/qemu-alpha -strace -L /usr/alpha-unknown-linux-gnu/ /tmp/a
> ...
> 1274697 %s(%d)(2097152,274903156744,274903156760,274905840712,274877908880,274903235616) = 3
> 1274697 exit_group(0)
> ```
> 
> After the change:
> 
> ```
> $ alpha-linux-user/qemu-alpha -strace -L /usr/alpha-unknown-linux-gnu/ /tmp/a
> ...
> 1273719 epoll_create1(2097152) = 3
> 1273719 exit_group(0)
> ```
> 
> Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
> CC: Riku Voipio <riku.voipio@iki.fi>
> CC: Laurent Vivier <laurent@vivier.eu>
> ---
>  linux-user/strace.list | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/linux-user/strace.list b/linux-user/strace.list
> index d49a1e92a8..9281c0a758 100644
> --- a/linux-user/strace.list
> +++ b/linux-user/strace.list
> @@ -125,10 +125,10 @@
>  { TARGET_NR_dup3, "dup3" , "%s(%d,%d,%d)", NULL, NULL },
>  #endif
>  #ifdef TARGET_NR_epoll_create
> -{ TARGET_NR_epoll_create, "%s(%d)", NULL, NULL, NULL },
> +{ TARGET_NR_epoll_create, "epoll_create", "%s(%d)", NULL, NULL },
>  #endif
>  #ifdef TARGET_NR_epoll_create1
> -{ TARGET_NR_epoll_create1, "%s(%d)", NULL, NULL, NULL },
> +{ TARGET_NR_epoll_create1, "epoll_create1", "%s(%d)", NULL, NULL },
>  #endif
>  #ifdef TARGET_NR_epoll_ctl
>  { TARGET_NR_epoll_ctl, "epoll_ctl" , NULL, NULL, NULL },
> -- 
> 2.26.1
> 

Should it be handled differently?

-- 

  Sergei
Re: [PATCH] linux-user/strace.list: fix epoll_create{,1} -strace output
Posted by Philippe Mathieu-Daudé 5 years, 9 months ago 
+ Helge & Aleksandar.

On 5/1/20 12:59 AM, Sergei Trofimovich wrote:
> On Thu, 16 Apr 2020 18:59:57 +0100
> Sergei Trofimovich <slyfox@gentoo.org> wrote:
> 
>> Fix syscall name and parameters priinter.
>>
>> Before the change:
>>
>> ```
>> $ alpha-linux-user/qemu-alpha -strace -L /usr/alpha-unknown-linux-gnu/ /tmp/a
>> ...
>> 1274697 %s(%d)(2097152,274903156744,274903156760,274905840712,274877908880,274903235616) = 3

Oops...

>> 1274697 exit_group(0)
>> ```
>>
>> After the change:
>>
>> ```
>> $ alpha-linux-user/qemu-alpha -strace -L /usr/alpha-unknown-linux-gnu/ /tmp/a
>> ...
>> 1273719 epoll_create1(2097152) = 3
>> 1273719 exit_group(0)
>> ```
>>

Cc: qemu-stable@nongnu.org
Fixes: 9cbc0578cb6 ("Improve output of various syscalls")

>> Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
>> CC: Riku Voipio <riku.voipio@iki.fi>
>> CC: Laurent Vivier <laurent@vivier.eu>
>> ---
>>   linux-user/strace.list | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/linux-user/strace.list b/linux-user/strace.list
>> index d49a1e92a8..9281c0a758 100644
>> --- a/linux-user/strace.list
>> +++ b/linux-user/strace.list
>> @@ -125,10 +125,10 @@
>>   { TARGET_NR_dup3, "dup3" , "%s(%d,%d,%d)", NULL, NULL },
>>   #endif
>>   #ifdef TARGET_NR_epoll_create
>> -{ TARGET_NR_epoll_create, "%s(%d)", NULL, NULL, NULL },
>> +{ TARGET_NR_epoll_create, "epoll_create", "%s(%d)", NULL, NULL },
>>   #endif
>>   #ifdef TARGET_NR_epoll_create1
>> -{ TARGET_NR_epoll_create1, "%s(%d)", NULL, NULL, NULL },
>> +{ TARGET_NR_epoll_create1, "epoll_create1", "%s(%d)", NULL, NULL },
>>   #endif
>>   #ifdef TARGET_NR_epoll_ctl
>>   { TARGET_NR_epoll_ctl, "epoll_ctl" , NULL, NULL, NULL },
>> -- 
>> 2.26.1
>>
> 
> Should it be handled differently?

No, you are correct, we missed this when reviewing commit 9cbc0578cb6.

Thanks for your patch!

Too bad it missed the 5.0 release :/

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.