From: Roger Pau Monné Date: Thu, 26 Nov 2015 14:51:00 +0000 (+0100) Subject: HVM/save: allow the usage of zeroextend and a fixup function X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2165 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4243baf61acf24d972eb456aea8353481af31100;p=xen.git HVM/save: allow the usage of zeroextend and a fixup function With the current compat implementation in the save/restore context handling, only one compat structure is allowed, and using _zeroextend prevents the fixup function from being called. In order to allow for the compat handling layer to be able to handle different compat versions allow calling the fixup function with hvm_load_entry_zeroextend. Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- diff --git a/xen/include/xen/hvm/save.h b/xen/include/xen/hvm/save.h index 51bc7d5521..a9a78f9133 100644 --- a/xen/include/xen/hvm/save.h +++ b/xen/include/xen/hvm/save.h @@ -64,7 +64,12 @@ void _hvm_read_entry(struct hvm_domain_context *h, = (struct hvm_save_descriptor *)&(_h)->data[(_h)->cur]; \ if ( (r = _hvm_check_entry((_h), HVM_SAVE_CODE(_x), \ HVM_SAVE_LENGTH(_x), (_strict))) == 0 ) \ + { \ _hvm_read_entry((_h), (_dst), HVM_SAVE_LENGTH(_x)); \ + if ( HVM_SAVE_HAS_COMPAT(_x) && \ + desc->length != HVM_SAVE_LENGTH(_x) ) \ + r = HVM_SAVE_FIX_COMPAT(_x, (_dst), desc->length); \ + } \ else if (HVM_SAVE_HAS_COMPAT(_x) \ && (r = _hvm_check_entry((_h), HVM_SAVE_CODE(_x), \ HVM_SAVE_LENGTH_COMPAT(_x), (_strict))) == 0 ) { \