mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-05 18:20:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update x86 and x86_64 syscalls to Linux v5.6-rc5, avoiding duplicates.

Browse source 
There were some duplicate enum values for x86 which caused build
failure. Updating the names to match the Linux table fixes this.

Also updated awk command in comment to produce matching output.

BUG=None
TEST=cd syscall_defines; cargo build && cargo build --target i686-unknown-linux-gnu

Change-Id: I99032352332281566f8e8322fadec73ca916d31d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2260597
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Auto-Submit: Andrew Walbran <qwandor@google.com>
Tested-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Andrew Walbran <qwandor@google.com>
This commit is contained in:
Andrew Walbran 2020-06-23 18:05:40 +01:00 committed by Commit Bot
parent bf654c1753
commit f836c8edde
2 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
syscall_defines/src/linux-x86/mod.rs
View file

@ -3,7 +3,7 @@
// found in the LICENSE file. // found in the LICENSE file.
// Generated with: cat arch/x86/entry/syscalls/syscall_32.tbl | // Generated with: cat arch/x86/entry/syscalls/syscall_32.tbl |
// awk ' { print "SYS_" $3 " = " $1"," } ' // awk ' { if ($1 != "#" && $1 != "") print " SYS_" $3 " = " $1"," } '
#[allow(dead_code)] #[allow(dead_code)]
#[allow(non_camel_case_types)] #[allow(non_camel_case_types)]
pub enum LinuxSyscall { pub enum LinuxSyscall {
@ -289,7 +289,6 @@ pub enum LinuxSyscall {
SYS_mq_getsetattr = 282, SYS_mq_getsetattr = 282,
SYS_kexec_load = 283, SYS_kexec_load = 283,
SYS_waitid = 284, SYS_waitid = 284,
SYS_sys_setaltroot = 285,
SYS_add_key = 286, SYS_add_key = 286,
SYS_request_key = 287, SYS_request_key = 287,
SYS_keyctl = 288, SYS_keyctl = 288,
@ -389,7 +388,7 @@ pub enum LinuxSyscall {
SYS_pkey_free = 382, SYS_pkey_free = 382,
SYS_statx = 383, SYS_statx = 383,
SYS_arch_prctl = 384, SYS_arch_prctl = 384,
SYS_io_pgetevents_time32 = 385, SYS_io_pgetevents = 385,
SYS_rseq = 386, SYS_rseq = 386,
SYS_semget = 393, SYS_semget = 393,
SYS_semctl = 394, SYS_semctl = 394,
@ -401,26 +400,26 @@ pub enum LinuxSyscall {
SYS_msgsnd = 400, SYS_msgsnd = 400,
SYS_msgrcv = 401, SYS_msgrcv = 401,
SYS_msgctl = 402, SYS_msgctl = 402,
SYS_clock_gettime = 403, SYS_clock_gettime64 = 403,
SYS_clock_settime = 404, SYS_clock_settime64 = 404,
SYS_clock_adjtime = 405, SYS_clock_adjtime64 = 405,
SYS_clock_getres = 406, SYS_clock_getres_time64 = 406,
SYS_clock_nanosleep = 407, SYS_clock_nanosleep_time64 = 407,
SYS_timer_gettime = 408, SYS_timer_gettime64 = 408,
SYS_timer_settime = 409, SYS_timer_settime64 = 409,
SYS_timerfd_gettime = 410, SYS_timerfd_gettime64 = 410,
SYS_timerfd_settime = 411, SYS_timerfd_settime64 = 411,
SYS_utimensat = 412, SYS_utimensat_time64 = 412,
SYS_pselect6 = 413, SYS_pselect6_time64 = 413,
SYS_ppoll = 414, SYS_ppoll_time64 = 414,
SYS_io_pgetevents = 416, SYS_io_pgetevents_time64 = 416,
SYS_recvmmsg = 417, SYS_recvmmsg_time64 = 417,
SYS_mq_timedsend = 418, SYS_mq_timedsend_time64 = 418,
SYS_mq_timedreceive = 419, SYS_mq_timedreceive_time64 = 419,
SYS_semtimedop = 420, SYS_semtimedop_time64 = 420,
SYS_rt_sigtimedwait = 421, SYS_rt_sigtimedwait_time64 = 421,
SYS_futex = 422, SYS_futex_time64 = 422,
SYS_sched_rr_get_interval = 423, SYS_sched_rr_get_interval_time64 = 423,
SYS_pidfd_send_signal = 424, SYS_pidfd_send_signal = 424,
SYS_io_uring_setup = 425, SYS_io_uring_setup = 425,
SYS_io_uring_enter = 426, SYS_io_uring_enter = 426,

4
syscall_defines/src/linux-x86_64/mod.rs
View file

@ -3,7 +3,7 @@
// found in the LICENSE file. // found in the LICENSE file.
// Generated with: cat arch/x86/entry/syscalls/syscall_64.tbl | // Generated with: cat arch/x86/entry/syscalls/syscall_64.tbl |
// awk ' { print "SYS_" $3 " = " $1"," } ' // awk ' { if ($1 != "#" && $1 != "") print " " ($2 == "x32" ? "compat_" : "") "SYS_" $3 " = " $1"," } '
#[allow(dead_code)] #[allow(dead_code)]
#[allow(non_camel_case_types)] #[allow(non_camel_case_types)]
pub enum LinuxSyscall { pub enum LinuxSyscall {
@ -390,4 +390,6 @@ pub enum LinuxSyscall {
compat_SYS_io_setup = 543, compat_SYS_io_setup = 543,
compat_SYS_io_submit = 544, compat_SYS_io_submit = 544,
compat_SYS_execveat = 545, compat_SYS_execveat = 545,
compat_SYS_preadv2 = 546,
compat_SYS_pwritev2 = 547,
} }