diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-06 15:05:02 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-06 15:05:02 +0100 |
| commit | f6702681a0af186db8518793fbe46f45cce967dd (patch) | |
| tree | f28b584c709255413149eec7c556225c4d1b822e /include | |
| parent | 3ec20e2e618314a798c81a974455b0a47e2af435 (diff) | |
| parent | 98dd166ea3a3c3b57919e20d9b0d1237fcd0349d (diff) | |
| download | linux-stable-f6702681a0af186db8518793fbe46f45cce967dd.tar.gz linux-stable-f6702681a0af186db8518793fbe46f45cce967dd.tar.bz2 linux-stable-f6702681a0af186db8518793fbe46f45cce967dd.zip | |
Merge tag 'for-linus-4.3b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen bug fixes from David Vrabel:
- Fix VM save performance regression with x86 PV guests
- Make kexec work in x86 PVHVM guests (if Xen has the soft-reset ABI)
- Other minor fixes.
* tag 'for-linus-4.3b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
x86/xen/p2m: hint at the last populated P2M entry
x86/xen: Do not clip xen_e820_map to xen_e820_map_entries when sanitizing map
x86/xen: Support kexec/kdump in HVM guests by doing a soft reset
xen/x86: Don't try to write syscall-related MSRs for PV guests
xen: use correct type for HYPERVISOR_memory_op()
Diffstat (limited to 'include')
| -rw-r--r-- | include/xen/interface/sched.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/xen/interface/sched.h b/include/xen/interface/sched.h index 9ce083960a25..f18490985fc8 100644 --- a/include/xen/interface/sched.h +++ b/include/xen/interface/sched.h @@ -107,5 +107,13 @@ struct sched_watchdog { #define SHUTDOWN_suspend 2 /* Clean up, save suspend info, kill. */ #define SHUTDOWN_crash 3 /* Tell controller we've crashed. */ #define SHUTDOWN_watchdog 4 /* Restart because watchdog time expired. */ +/* + * Domain asked to perform 'soft reset' for it. The expected behavior is to + * reset internal Xen state for the domain returning it to the point where it + * was created but leaving the domain's memory contents and vCPU contexts + * intact. This will allow the domain to start over and set up all Xen specific + * interfaces again. + */ +#define SHUTDOWN_soft_reset 5 #endif /* __XEN_PUBLIC_SCHED_H__ */ |