diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-12-19 09:30:35 -0500 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-12-19 09:30:35 -0500 |
| commit | 12275dd4b747f5d87fa36229774d76bca8e63068 (patch) | |
| tree | dc25f212c24de5f357d540e442920f791530973b /include/xen | |
| parent | 63a741757d15320a25ebf5778f8651cce2ed0611 (diff) | |
Revert "xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel"
This reverts commit ddacf5ef684a655abe2bb50c4b2a5b72ae0d5e05.
As when booting the kernel under Amazon EC2 as an HVM guest it ends up
hanging during startup. Reverting this we loose the fix for kexec
booting to the crash kernels.
Fixes Canonical BZ #901305 (http://bugs.launchpad.net/bugs/901305)
Tested-by: Alessandro Salvatori <sandr8@gmail.com>
Reported-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Ian Campbell <Ian.Campbell@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'include/xen')
| -rw-r--r-- | include/xen/interface/io/xs_wire.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/xen/interface/io/xs_wire.h b/include/xen/interface/io/xs_wire.h index f0b6890370be..f6f07aa35af5 100644 --- a/include/xen/interface/io/xs_wire.h +++ b/include/xen/interface/io/xs_wire.h | |||
| @@ -29,8 +29,7 @@ enum xsd_sockmsg_type | |||
| 29 | XS_IS_DOMAIN_INTRODUCED, | 29 | XS_IS_DOMAIN_INTRODUCED, |
| 30 | XS_RESUME, | 30 | XS_RESUME, |
| 31 | XS_SET_TARGET, | 31 | XS_SET_TARGET, |
| 32 | XS_RESTRICT, | 32 | XS_RESTRICT |
| 33 | XS_RESET_WATCHES | ||
| 34 | }; | 33 | }; |
| 35 | 34 | ||
| 36 | #define XS_WRITE_NONE "NONE" | 35 | #define XS_WRITE_NONE "NONE" |