diff options
| author | Peter Maydell | 2021-01-22 11:35:55 +0100 |
|---|---|---|
| committer | Peter Maydell | 2021-01-22 11:35:55 +0100 |
| commit | 0e32462630687a18039464511bd0447ada5709c3 (patch) | |
| tree | 477352f4cdc67eef3b4f2c319f652c53b6351bd1 /linux-user/generic/fcntl.h | |
| parent | Merge remote-tracking branch 'remotes/cohuck-gitlab/tags/s390x-20210121' into... (diff) | |
| parent | linux-user: Remove obsolete F_SHLCK and F_EXLCK translation (diff) | |
| download | qemu-0e32462630687a18039464511bd0447ada5709c3.tar.gz qemu-0e32462630687a18039464511bd0447ada5709c3.tar.xz qemu-0e32462630687a18039464511bd0447ada5709c3.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-6.0-pull-request' into staging
linux-user pull request 20210119-v3
Remove obsolete F_SHLCK and F_EXLCK translation
Update sockopt
Add F_ADD_SEALS and F_GET_SEALS
# gpg: Signature made Thu 21 Jan 2021 12:33:04 GMT
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/linux-user-for-6.0-pull-request:
linux-user: Remove obsolete F_SHLCK and F_EXLCK translation
linux-user: Add IPv6 options to do_print_sockopt()
linux-user: add missing IPv6 get/setsockopt option
linux-user: add missing UDP get/setsockopt option
linux-user: Support F_ADD_SEALS and F_GET_SEALS fcntls
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/generic/fcntl.h')
| -rw-r--r-- | linux-user/generic/fcntl.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/linux-user/generic/fcntl.h b/linux-user/generic/fcntl.h index c85c5b9fed..4568d1f42b 100644 --- a/linux-user/generic/fcntl.h +++ b/linux-user/generic/fcntl.h @@ -119,11 +119,6 @@ struct target_f_owner_ex { #define TARGET_F_UNLCK 2 #endif -#ifndef TARGET_F_EXLCK -#define TARGET_F_EXLCK 4 -#define TARGET_F_SHLCK 8 -#endif - #ifndef TARGET_HAVE_ARCH_STRUCT_FLOCK #ifndef TARGET_ARCH_FLOCK_PAD #define TARGET_ARCH_FLOCK_PAD |