common/memory: Fix ifdefs for ptdom_max_order

[PATCH] common/memory: Fix ifdefs for ptdom_max_order

Luca Fancellu posted 1 patch 1 year, 8 months ago

Download mbox

Test gitlab-ci failed

Patches applied successfully (tree, apply log)
git fetch https://gitlab.com/xen-project/patchew/xen tags/patchew/20220725144455.7666-1-luca.fancellu@arm.com

xen/common/memory.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Expand all Fold all

[PATCH] common/memory: Fix ifdefs for ptdom_max_order

Posted by Luca Fancellu 1 year, 8 months ago

In common/memory.c the ifdef code surrounding ptdom_max_order is
using HAS_PASSTHROUGH instead of CONFIG_HAS_PASSTHROUGH, fix the
problem using the correct macro.

Fixes: e0d44c1f9461 ("build: convert HAS_PASSTHROUGH use to Kconfig")
Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>
---
 xen/common/memory.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xen/common/memory.c b/xen/common/memory.c
index f6f794914dfd..bc89442ba53f 100644
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -58,7 +58,7 @@ struct memop_args {
 static unsigned int __read_mostly domu_max_order = CONFIG_DOMU_MAX_ORDER;
 static unsigned int __read_mostly ctldom_max_order = CONFIG_CTLDOM_MAX_ORDER;
 static unsigned int __read_mostly hwdom_max_order = CONFIG_HWDOM_MAX_ORDER;
-#ifdef HAS_PASSTHROUGH
+#ifdef CONFIG_HAS_PASSTHROUGH
 static unsigned int __read_mostly ptdom_max_order = CONFIG_PTDOM_MAX_ORDER;
 #endif
 
@@ -70,7 +70,7 @@ static int __init cf_check parse_max_order(const char *s)
         ctldom_max_order = simple_strtoul(s, &s, 0);
     if ( *s == ',' && *++s != ',' )
         hwdom_max_order = simple_strtoul(s, &s, 0);
-#ifdef HAS_PASSTHROUGH
+#ifdef CONFIG_HAS_PASSTHROUGH
     if ( *s == ',' && *++s != ',' )
         ptdom_max_order = simple_strtoul(s, &s, 0);
 #endif
@@ -83,7 +83,7 @@ static unsigned int max_order(const struct domain *d)
 {
     unsigned int order = domu_max_order;
 
-#ifdef HAS_PASSTHROUGH
+#ifdef CONFIG_HAS_PASSTHROUGH
     if ( cache_flush_permitted(d) && order < ptdom_max_order )
         order = ptdom_max_order;
 #endif
-- 
2.17.1

Re: [PATCH] common/memory: Fix ifdefs for ptdom_max_order

Posted by Jan Beulich 1 year, 8 months ago

On 25.07.2022 16:44, Luca Fancellu wrote:
> In common/memory.c the ifdef code surrounding ptdom_max_order is
> using HAS_PASSTHROUGH instead of CONFIG_HAS_PASSTHROUGH, fix the
> problem using the correct macro.
> 
> Fixes: e0d44c1f9461 ("build: convert HAS_PASSTHROUGH use to Kconfig")
> Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>

Reviewed-by: Jan Beulich <jbeulich@suse.com>