[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen staging] x86: Fix missing brackets in macros



commit 0c40d08f7cb8922befd7bec1868978b9cd65dc6d
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Fri Dec 5 19:42:07 2025 +0000
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Fri Dec 12 03:04:48 2025 +0000

    x86: Fix missing brackets in macros
    
    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 <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Nicola Vetrini <nicola.vetrini@xxxxxxxxxxx>
    Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
---
 xen/arch/x86/mm/shadow/private.h   | 6 +++---
 xen/drivers/passthrough/vtd/dmar.h | 8 ++++----
 xen/include/xen/kexec.h            | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h
index cef9dbef2e..1ef908a380 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 0ff4f36535..47e6918b45 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 ) {    \
@@ -147,7 +147,7 @@ do {                                                        
       \
                                                                    \
     for ( ; ; )                                                    \
     {                                                              \
-        sts = op(iommu->reg, offset);                              \
+        sts = op((iommu)->reg, offset);                            \
         if ( cond )                                                \
             break;                                                 \
         if ( timeout && NOW() > timeout )                          \
@@ -155,7 +155,7 @@ do {                                                        
       \
             threshold |= threshold << 1;                           \
             printk(XENLOG_WARNING VTDPREFIX                        \
                    " IOMMU#%u: %s flush taking too long\n",        \
-                   iommu->index, what);                            \
+                   (iommu)->index, what);                          \
             timeout = 0;                                           \
         }                                                          \
         cpu_relax();                                               \
@@ -164,7 +164,7 @@ do {                                                        
       \
     if ( !timeout )                                                \
         printk(XENLOG_WARNING VTDPREFIX                            \
                " IOMMU#%u: %s flush took %lums\n",                 \
-               iommu->index, what, (NOW() - start) / 10000000);    \
+               (iommu)->index, what, (NOW() - start) / 10000000);  \
 } while ( false )
 
 int vtd_hw_check(void);
diff --git a/xen/include/xen/kexec.h b/xen/include/xen/kexec.h
index e66eb6a8e5..5dd288d1a5 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) \
--
generated by git-patchbot for /home/xen/git/xen.git#staging



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.