With the wider testing, some more violations have been spotted. This addresses violations of Rule 20.7 which requires macro parameters to be bracketed.
No functional change. Signed-off-by: Andrew Cooper <[email protected]> --- CC: Jan Beulich <[email protected]> CC: Roger Pau Monné <[email protected]> CC: Stefano Stabellini <[email protected]> CC: [email protected] <[email protected]> CC: Nicola Vetrini <[email protected]> --- xen/arch/x86/mm/shadow/multi.c | 2 +- xen/arch/x86/mm/shadow/private.h | 6 +++--- xen/drivers/passthrough/vtd/dmar.h | 2 +- xen/include/xen/kexec.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 03be61e225c0..36ee6554b4c4 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -781,7 +781,7 @@ do { \ (_sl1e) = _sp + _i; \ if ( shadow_l1e_get_flags(*(_sl1e)) & _PAGE_PRESENT ) \ {_code} \ - if ( _done ) break; \ + if ( (_done) ) break; \ increment_ptr_to_guest_entry(_gl1p); \ } \ unmap_domain_page(_sp); \ diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index cef9dbef2e77..93834ec55c42 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -636,9 +636,9 @@ prev_pinned_shadow(struct page_info *page, } #define foreach_pinned_shadow(dom, pos, tmp) \ - for ( pos = prev_pinned_shadow(NULL, (dom)); \ - pos ? (tmp = prev_pinned_shadow(pos, (dom)), 1) : 0; \ - pos = tmp ) + for ( (pos) = prev_pinned_shadow(NULL, dom); \ + (pos) ? (tmp = prev_pinned_shadow(pos, dom), 1) : 0; \ + (pos) = tmp ) /* * Pin a shadow page: take an extra refcount, set the pin bit, diff --git a/xen/drivers/passthrough/vtd/dmar.h b/xen/drivers/passthrough/vtd/dmar.h index 0ff4f365351f..11590f71a828 100644 --- a/xen/drivers/passthrough/vtd/dmar.h +++ b/xen/drivers/passthrough/vtd/dmar.h @@ -124,7 +124,7 @@ struct acpi_atsr_unit *acpi_find_matched_atsr_unit(const struct pci_dev *); do { \ s_time_t start_time = NOW(); \ while (1) { \ - sts = op(iommu->reg, offset); \ + sts = op((iommu)->reg, offset); \ if ( cond ) \ break; \ if ( NOW() > start_time + DMAR_OPERATION_TIMEOUT ) { \ diff --git a/xen/include/xen/kexec.h b/xen/include/xen/kexec.h index e66eb6a8e593..5dd288d1a50e 100644 --- a/xen/include/xen/kexec.h +++ b/xen/include/xen/kexec.h @@ -66,9 +66,9 @@ void vmcoreinfo_append_str(const char *fmt, ...) #define VMCOREINFO_PAGESIZE(value) \ vmcoreinfo_append_str("PAGESIZE=%ld\n", value) #define VMCOREINFO_SYMBOL(name) \ - vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)&name) + vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)&(name)) #define VMCOREINFO_SYMBOL_ALIAS(alias, name) \ - vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #alias, (unsigned long)&name) + vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #alias, (unsigned long)&(name)) #define VMCOREINFO_STRUCT_SIZE(name) \ vmcoreinfo_append_str("SIZE(%s)=%zu\n", #name, sizeof(struct name)) #define VMCOREINFO_OFFSET(name, field) \ -- 2.39.5
