From: "Ludovic Courtès" <ludo@gnu.org>
To: 75402@debbugs.gnu.org
Cc: Dariqq <dariqq@posteo.net>, "Ludovic Courtès" <ludo@gnu.org>
Subject: [bug#75402] [PATCH 2/3] syscalls: Remove wrong syscall ID for ‘kexec_load_file’ on i686.
Date: Mon, 6 Jan 2025 13:58:36 +0100 [thread overview]
Message-ID: <6062eaed018a8c738577dbb699d7e0324a4f8746.1736168031.git.ludo@gnu.org> (raw)
In-Reply-To: <cover.1736168030.git.ludo@gnu.org>
Fixes <https://issues.guix.gnu.org/75205>.
* guix/build/syscalls.scm (kexec-load-file): Remove syscall ID for i686.
* tests/syscalls.scm ("kexec-load-file"): Accept ENOSYS in addition to
EPERM.
Reported-by: Dariqq <dariqq@posteo.net>
Change-Id: I83fe25636addb57533ed88cbfb40107d265b13a7
---
guix/build/syscalls.scm | 2 +-
tests/syscalls.scm | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm
index 0f8927844b..7e16452462 100644
--- a/guix/build/syscalls.scm
+++ b/guix/build/syscalls.scm
@@ -794,8 +794,8 @@ (define kexec-load-file
'* ;cmdline
unsigned-long))) ;flags
(syscall-id (match (utsname:machine (uname))
- ("i686" 320)
("x86_64" 320)
+ ;; unsupported on i686
("armv7l" 401)
("aarch64" 294)
("ppc64le" 382)
diff --git a/tests/syscalls.scm b/tests/syscalls.scm
index eef864d097..d2848879d7 100644
--- a/tests/syscalls.scm
+++ b/tests/syscalls.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014-2021, 2024 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014-2021, 2024-2025 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2020 Simon South <simon@simonsouth.net>
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
@@ -682,15 +682,15 @@ (define perform-container-tests?
(when (or (zero? (getuid))
(not (string-contains %host-type "linux")))
(test-skip 1))
-(test-equal "kexec-load-file"
- EPERM
+(test-assert "kexec-load-file"
(catch 'system-error
(lambda ()
(let ((fd1 (open-fdes "/dev/null" O_RDONLY))
(fd2 (open-fdes "/dev/null" O_RDONLY)))
(kexec-load-file fd1 fd2 "gnu.repl=yes")))
(lambda args
- (system-error-errno args))))
+ (member (system-error-errno args)
+ (list EPERM ENOSYS)))))
(test-end)
--
2.47.1
next prev parent reply other threads:[~2025-01-06 14:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-06 12:57 [bug#75402] [PATCH 0/3] Assorted kexec fixes Ludovic Courtès
2025-01-06 12:58 ` [bug#75402] [PATCH 1/3] reconfigure: Do not pass KEXEC_FILE_DEBUG Ludovic Courtès
2025-01-06 12:58 ` Ludovic Courtès [this message]
2025-01-06 12:58 ` [bug#75402] [PATCH 3/3] reconfigure: Make ‘load-system-for-kexec’ errors non-fatal Ludovic Courtès
2025-01-07 10:41 ` [bug#75402] [PATCH 0/3] Assorted kexec fixes Tomas Volf
2025-01-07 10:48 ` Ludovic Courtès
2025-01-07 10:58 ` Tomas Volf
2025-01-07 18:12 ` Ludovic Courtès
2025-01-07 18:08 ` bug#75402: " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6062eaed018a8c738577dbb699d7e0324a4f8746.1736168031.git.ludo@gnu.org \
--to=ludo@gnu.org \
--cc=75402@debbugs.gnu.org \
--cc=dariqq@posteo.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.