diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-06-07 20:05:29 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-06-07 20:05:29 +0100 |
| commit | 33ba8b0adc91482dd4247a0773cfe7def011933f (patch) | |
| tree | 7ad27f3a761a1c999aa111e74584b1be2b50c09a /linux-user/syscall.c | |
| parent | a35947f15c0ee695eba3c55248ec8ac3e4e23cca (diff) | |
| parent | df77d45a51412ca84abd7f1490b48c1bccf07057 (diff) | |
| download | focaccia-qemu-33ba8b0adc91482dd4247a0773cfe7def011933f.tar.gz focaccia-qemu-33ba8b0adc91482dd4247a0773cfe7def011933f.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-6.1-pull-request' into staging
Trivial branch pull request 20210607 # gpg: Signature made Mon 07 Jun 2021 19:56:43 BST # 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/trivial-branch-for-6.1-pull-request: vhost-vdpa: Remove redundant declaration of address_space_memory scripts/oss-fuzz: Fix typo in documentation target/mips: Fix 'Uncoditional' typo target/hppa: Remove unused 'memory.h' header hw/display/macfb: Classify the "nubus-macfb" as display device target/nios2: fix page-fit instruction count docs: fix broken reference linux-user/syscall: Constify bitmask_transtbl fcntl/mmap flags_tlb[] misc: Correct relative include path i386/kvm: The value passed to strerror should be positive target/riscv: Do not include 'pmp.h' in user emulation Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/syscall.c')
| -rw-r--r-- | linux-user/syscall.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index c9f812091c..974dd46c9a 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -365,7 +365,7 @@ _syscall5(int, sys_statx, int, dirfd, const char *, pathname, int, flags, _syscall2(int, membarrier, int, cmd, int, flags) #endif -static bitmask_transtbl fcntl_flags_tbl[] = { +static const bitmask_transtbl fcntl_flags_tbl[] = { { TARGET_O_ACCMODE, TARGET_O_WRONLY, O_ACCMODE, O_WRONLY, }, { TARGET_O_ACCMODE, TARGET_O_RDWR, O_ACCMODE, O_RDWR, }, { TARGET_O_CREAT, TARGET_O_CREAT, O_CREAT, O_CREAT, }, @@ -6062,7 +6062,7 @@ static const StructEntry struct_termios_def = { .print = print_termios, }; -static bitmask_transtbl mmap_flags_tbl[] = { +static const bitmask_transtbl mmap_flags_tbl[] = { { TARGET_MAP_SHARED, TARGET_MAP_SHARED, MAP_SHARED, MAP_SHARED }, { TARGET_MAP_PRIVATE, TARGET_MAP_PRIVATE, MAP_PRIVATE, MAP_PRIVATE }, { TARGET_MAP_FIXED, TARGET_MAP_FIXED, MAP_FIXED, MAP_FIXED }, |