diff options
-rw-r--r-- | kexec/kexec.8 | 1 | ||||
-rw-r--r-- | kexec/kexec.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/kexec/kexec.8 b/kexec/kexec.8 index b969cea6..9e995fea 100644 --- a/kexec/kexec.8 +++ b/kexec/kexec.8 @@ -162,6 +162,7 @@ Specify that the new kernel is of this .TP .BI \-s\ (\-\-kexec-file-syscall) Specify that the new KEXEC_FILE_LOAD syscall should be used exclusively. +Ignored on XEN. .TP .BI \-c\ (\-\-kexec-syscall) Specify that the old KEXEC_LOAD syscall should be used exclusively. diff --git a/kexec/kexec.c b/kexec/kexec.c index 08edfca2..9d0ec46e 100644 --- a/kexec/kexec.c +++ b/kexec/kexec.c @@ -1685,6 +1685,10 @@ int main(int argc, char *argv[]) } } } + if (xen_present()) { + do_kexec_file_syscall = 0; + do_kexec_fallback = 0; + } if (do_kexec_file_syscall) { if (do_load_jump_back_helper && !do_kexec_fallback) die("--load-jump-back-helper not supported with kexec_file_load\n"); |