mbox

[PULL,0/5] Linux user for 6.0 patches

Message ID 20210120195317.84222-1-laurent@vivier.eu (mailing list archive)
State New, archived
Headers show

Pull-request

git://github.com/vivier/qemu.git tags/linux-user-for-6.0-pull-request

Message

Laurent Vivier Jan. 20, 2021, 7:53 p.m. UTC 
The following changes since commit 48202c712412c803ddb56365c7bca322aa4e7506:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-2021011=
9-1' into staging (2021-01-19 15:47:23 +0000)

are available in the Git repository at:

  git://github.com/vivier/qemu.git tags/linux-user-for-6.0-pull-request

for you to fetch changes up to 8a7e49050b8d5477a567b0ec5d764a564481abdb:

  linux-user: Remove obsolete F_SHLCK and F_EXLCK translation (2021-01-20 18:=
26:46 +0100)

----------------------------------------------------------------
linux-user pull request 20210119-v2

Remove obsolete F_SHLCK and F_EXLCK translation
Update sockopt
Add F_ADD_SEALS and F_GET_SEALS

----------------------------------------------------------------

Michael Forney (1):
  linux-user: Remove obsolete F_SHLCK and F_EXLCK translation

Shu-Chun Weng (4):
  linux-user: Support F_ADD_SEALS and F_GET_SEALS fcntls
  linux-user: add missing UDP get/setsockopt option
  linux-user: add missing IPv6 get/setsockopt option
  linux-user: Add IPv6 options to do_print_sockopt()

 linux-user/alpha/target_fcntl.h |   2 -
 linux-user/generic/fcntl.h      |   5 --
 linux-user/strace.c             | 153 ++++++++++++++++++++++++++++++--
 linux-user/syscall.c            |  23 ++++-
 linux-user/syscall_defs.h       |  14 +--
 5 files changed, 173 insertions(+), 24 deletions(-)

--=20
2.29.2

Comments

Peter Maydell Jan. 21, 2021, 10:44 a.m. UTC | #1 
On Wed, 20 Jan 2021 at 19:56, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit 48202c712412c803ddb56365c7bca322aa4e7506:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-2021011=
> 9-1' into staging (2021-01-19 15:47:23 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/vivier/qemu.git tags/linux-user-for-6.0-pull-request
>
> for you to fetch changes up to 8a7e49050b8d5477a567b0ec5d764a564481abdb:
>
>   linux-user: Remove obsolete F_SHLCK and F_EXLCK translation (2021-01-20 18:=
> 26:46 +0100)
>
> ----------------------------------------------------------------
> linux-user pull request 20210119-v2
>
> Remove obsolete F_SHLCK and F_EXLCK translation
> Update sockopt
> Add F_ADD_SEALS and F_GET_SEALS
>
Now fails with:

../../linux-user/strace.c: In function ‘do_print_sockopt’:
../../linux-user/strace.c:2831:14: error: ‘IPV6_ADDR_PREFERENCES’
undeclared (first use in this function)
         case IPV6_ADDR_PREFERENCES:
              ^

thanks
-- PMM
Laurent Vivier Jan. 21, 2021, 11:07 a.m. UTC | #2 
Le 21/01/2021 à 11:44, Peter Maydell a écrit :
> On Wed, 20 Jan 2021 at 19:56, Laurent Vivier <laurent@vivier.eu> wrote:
>>
>> The following changes since commit 48202c712412c803ddb56365c7bca322aa4e7506:
>>
>>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-2021011=
>> 9-1' into staging (2021-01-19 15:47:23 +0000)
>>
>> are available in the Git repository at:
>>
>>   git://github.com/vivier/qemu.git tags/linux-user-for-6.0-pull-request
>>
>> for you to fetch changes up to 8a7e49050b8d5477a567b0ec5d764a564481abdb:
>>
>>   linux-user: Remove obsolete F_SHLCK and F_EXLCK translation (2021-01-20 18:=
>> 26:46 +0100)
>>
>> ----------------------------------------------------------------
>> linux-user pull request 20210119-v2
>>
>> Remove obsolete F_SHLCK and F_EXLCK translation
>> Update sockopt
>> Add F_ADD_SEALS and F_GET_SEALS
>>
> Now fails with:
> 
> ../../linux-user/strace.c: In function ‘do_print_sockopt’:
> ../../linux-user/strace.c:2831:14: error: ‘IPV6_ADDR_PREFERENCES’
> undeclared (first use in this function)
>          case IPV6_ADDR_PREFERENCES:

Probably the same cause, in a different file.

This should fix the problem.

diff --git a/linux-user/strace.c b/linux-user/strace.c
index bc3bb6b2f949..7b43668b9b0e 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -11,6 +11,7 @@
 #include <netinet/udp.h>
 #include <linux/if_packet.h>
 #include <linux/netlink.h>
+#include <linux/in6.h>
 #include <sched.h>
 #include "qemu.h"

I will try to reproduce it before re-sending the PR.

Thanks,
Laurent
Philippe Mathieu-Daudé Jan. 21, 2021, 11:38 a.m. UTC | #3 
On 1/21/21 12:07 PM, Laurent Vivier wrote:
> Le 21/01/2021 à 11:44, Peter Maydell a écrit :
>> On Wed, 20 Jan 2021 at 19:56, Laurent Vivier <laurent@vivier.eu> wrote:
>>>
>>> The following changes since commit 48202c712412c803ddb56365c7bca322aa4e7506:
>>>
>>>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-2021011=
>>> 9-1' into staging (2021-01-19 15:47:23 +0000)
>>>
>>> are available in the Git repository at:
>>>
>>>   git://github.com/vivier/qemu.git tags/linux-user-for-6.0-pull-request
>>>
>>> for you to fetch changes up to 8a7e49050b8d5477a567b0ec5d764a564481abdb:
>>>
>>>   linux-user: Remove obsolete F_SHLCK and F_EXLCK translation (2021-01-20 18:=
>>> 26:46 +0100)
>>>
>>> ----------------------------------------------------------------
>>> linux-user pull request 20210119-v2
>>>
>>> Remove obsolete F_SHLCK and F_EXLCK translation
>>> Update sockopt
>>> Add F_ADD_SEALS and F_GET_SEALS
>>>
>> Now fails with:
>>
>> ../../linux-user/strace.c: In function ‘do_print_sockopt’:
>> ../../linux-user/strace.c:2831:14: error: ‘IPV6_ADDR_PREFERENCES’
>> undeclared (first use in this function)
>>          case IPV6_ADDR_PREFERENCES:

I checked on CentOS7 and this part isn't compiled because
TARGET_NR_socketcall is not defined, but I only build the
x86_64-linux-user target there.

> 
> Probably the same cause, in a different file.
> 
> This should fix the problem.
> 
> diff --git a/linux-user/strace.c b/linux-user/strace.c
> index bc3bb6b2f949..7b43668b9b0e 100644
> --- a/linux-user/strace.c
> +++ b/linux-user/strace.c
> @@ -11,6 +11,7 @@
>  #include <netinet/udp.h>
>  #include <linux/if_packet.h>
>  #include <linux/netlink.h>
> +#include <linux/in6.h>
>  #include <sched.h>
>  #include "qemu.h"

Sounds good.

> 
> I will try to reproduce it before re-sending the PR.
> 
> Thanks,
> Laurent
>
Philippe Mathieu-Daudé Jan. 21, 2021, 11:43 a.m. UTC | #4 
On 1/21/21 12:38 PM, Philippe Mathieu-Daudé wrote:
> On 1/21/21 12:07 PM, Laurent Vivier wrote:
>> Le 21/01/2021 à 11:44, Peter Maydell a écrit :
>>> On Wed, 20 Jan 2021 at 19:56, Laurent Vivier <laurent@vivier.eu> wrote:
>>>>
>>>> The following changes since commit 48202c712412c803ddb56365c7bca322aa4e7506:
>>>>
>>>>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-2021011=
>>>> 9-1' into staging (2021-01-19 15:47:23 +0000)
>>>>
>>>> are available in the Git repository at:
>>>>
>>>>   git://github.com/vivier/qemu.git tags/linux-user-for-6.0-pull-request
>>>>
>>>> for you to fetch changes up to 8a7e49050b8d5477a567b0ec5d764a564481abdb:
>>>>
>>>>   linux-user: Remove obsolete F_SHLCK and F_EXLCK translation (2021-01-20 18:=
>>>> 26:46 +0100)
>>>>
>>>> ----------------------------------------------------------------
>>>> linux-user pull request 20210119-v2
>>>>
>>>> Remove obsolete F_SHLCK and F_EXLCK translation
>>>> Update sockopt
>>>> Add F_ADD_SEALS and F_GET_SEALS
>>>>
>>> Now fails with:
>>>
>>> ../../linux-user/strace.c: In function ‘do_print_sockopt’:
>>> ../../linux-user/strace.c:2831:14: error: ‘IPV6_ADDR_PREFERENCES’
>>> undeclared (first use in this function)
>>>          case IPV6_ADDR_PREFERENCES:

I could reproduce building qemu-ppc64 (--target-list=ppc64-linux-user).

> I checked on CentOS7 and this part isn't compiled because
> TARGET_NR_socketcall is not defined, but I only build the
> x86_64-linux-user target there.
> 
>>
>> Probably the same cause, in a different file.
>>
>> This should fix the problem.
>>
>> diff --git a/linux-user/strace.c b/linux-user/strace.c
>> index bc3bb6b2f949..7b43668b9b0e 100644
>> --- a/linux-user/strace.c
>> +++ b/linux-user/strace.c
>> @@ -11,6 +11,7 @@
>>  #include <netinet/udp.h>
>>  #include <linux/if_packet.h>
>>  #include <linux/netlink.h>
>> +#include <linux/in6.h>

This build with your fix:

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

>>  #include <sched.h>
>>  #include "qemu.h"
> 
> Sounds good.
> 
>>
>> I will try to reproduce it before re-sending the PR.
>>
>> Thanks,
>> Laurent
>>
> 
>