[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] x86/HVM: tidy _hvm_load_entry() for style
commit c0579c65f6bef794cd449fbc946feacccf485f2e Author: Jan Beulich <jbeulich@xxxxxxxx> AuthorDate: Tue Aug 1 11:50:29 2023 +0200 Commit: Jan Beulich <jbeulich@xxxxxxxx> CommitDate: Tue Aug 1 11:50:29 2023 +0200 x86/HVM: tidy _hvm_load_entry() for style The primary goal is to eliminate the Misra-non-compliance of "desc" shadowing at least the local variable in hvm_load(). Suffix both local variables with underscores, while also - dropping leading underscores from parameter names (applying this also to the two wrapper macros), - correcting indentation, - correcting brace placement, - dropping unnecessary parentheses around parameter uses when those are passed on as plain arguments. No functional change intended. Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx> Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx> --- xen/arch/x86/include/asm/hvm/save.h | 42 +++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/include/asm/hvm/save.h b/xen/arch/x86/include/asm/hvm/save.h index 535cf68ed2..fa201f5d59 100644 --- a/xen/arch/x86/include/asm/hvm/save.h +++ b/xen/arch/x86/include/asm/hvm/save.h @@ -47,30 +47,32 @@ void _hvm_read_entry(struct hvm_domain_context *h, * Unmarshalling: check, then copy. Evaluates to zero on success. This load * function requires the save entry to be the same size as the dest structure. */ -#define _hvm_load_entry(_x, _h, _dst, _strict) ({ \ - int r; \ - struct hvm_save_descriptor *desc \ - = (struct hvm_save_descriptor *)&(_h)->data[(_h)->cur]; \ - if ( (r = _hvm_check_entry((_h), HVM_SAVE_CODE(_x), \ - HVM_SAVE_LENGTH(_x), (_strict))) == 0 ) \ +#define _hvm_load_entry(x, h, dst, strict) ({ \ + int r_; \ + struct hvm_save_descriptor *desc_ \ + = (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); \ + _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 ) { \ - _hvm_read_entry((_h), (_dst), HVM_SAVE_LENGTH_COMPAT(_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 ) \ + { \ + _hvm_read_entry(h, dst, HVM_SAVE_LENGTH_COMPAT(x)); \ + r_ = HVM_SAVE_FIX_COMPAT(x, dst, desc_->length); \ } \ - r; }) + r_; }) -#define hvm_load_entry(_x, _h, _dst) \ - _hvm_load_entry(_x, _h, _dst, 1) -#define hvm_load_entry_zeroextend(_x, _h, _dst) \ - _hvm_load_entry(_x, _h, _dst, 0) +#define hvm_load_entry(x, h, dst) \ + _hvm_load_entry(x, h, dst, true) +#define hvm_load_entry_zeroextend(x, h, dst) \ + _hvm_load_entry(x, h, dst, false) /* Unmarshalling: what is the instance ID of the next entry? */ static inline unsigned int hvm_load_instance(const struct hvm_domain_context *h) -- generated by git-patchbot for /home/xen/git/xen.git#master
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |