|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH 2/3] xen/treewide: Convert all #ifdef NDEBUG to CONFIG_DEBUG
We have two ways of spelling debug build in Xen, one with positive form and
one with an inverted form.
Convert the remaining uses of NDEBUG to CONFIG_DEBUG. In some cases,
rearrange the #if/#else to keep using CONFIG_DEBUG in a positive form.
No functional change.
Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
CC: Jan Beulich <jbeulich@xxxxxxxx>
CC: Roger Pau Monné <roger@xxxxxxxxxxxxxx>
CC: Teddy Astie <teddy.astie@xxxxxxxxxx>
CC: Stefano Stabellini <sstabellini@xxxxxxxxxx>
CC: Julien Grall <julien@xxxxxxx>
CC: Volodymyr Babchuk <Volodymyr_Babchuk@xxxxxxxx>
CC: Bertrand Marquis <bertrand.marquis@xxxxxxx>
CC: Michal Orzel <michal.orzel@xxxxxxx>
CC: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>
CC: Baptiste Le Duc <baptiste.le-duc@xxxxxxxxxx>
---
xen/arch/arm/mmu/pt.c | 10 +++++-----
xen/arch/x86/domain_page.c | 6 +++---
xen/arch/x86/hvm/svm/emulate.c | 2 +-
xen/arch/x86/include/asm/page.h | 3 ++-
xen/arch/x86/include/asm/setup.h | 6 +++---
xen/arch/x86/mm/shadow/private.h | 8 ++++----
xen/arch/x86/traps.c | 6 +++---
xen/arch/x86/x86_emulate/x86_emulate.h | 2 +-
xen/drivers/char/console.c | 12 ++++++------
xen/include/xen/lib.h | 18 +++++++++---------
10 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/xen/arch/arm/mmu/pt.c b/xen/arch/arm/mmu/pt.c
index 81fe121517b1..e3aee6d0c8d4 100644
--- a/xen/arch/arm/mmu/pt.c
+++ b/xen/arch/arm/mmu/pt.c
@@ -14,17 +14,17 @@
#include <asm/current.h>
#include <asm/fixmap.h>
-#ifdef NDEBUG
-static inline void
-__attribute__ ((__format__ (__printf__, 1, 2)))
-mm_printk(const char *fmt, ...) {}
-#else
+#ifdef CONFIG_DEBUG
#define mm_printk(fmt, args...) \
do \
{ \
dprintk(XENLOG_ERR, fmt, ## args); \
WARN(); \
} while (0)
+#else
+static inline void
+__attribute__ ((__format__ (__printf__, 1, 2)))
+mm_printk(const char *fmt, ...) {}
#endif
#ifdef CONFIG_ARM_64
diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c
index f02be1675b5d..5bc3c29aad82 100644
--- a/xen/arch/x86/domain_page.c
+++ b/xen/arch/x86/domain_page.c
@@ -68,7 +68,7 @@ void *map_domain_page(mfn_t mfn)
struct mapcache_vcpu *vcache;
struct vcpu_maphash_entry *hashent;
-#ifdef NDEBUG
+#ifndef CONFIG_DEBUG
if ( mfn_x(mfn) <= PFN_DOWN(__pa(HYPERVISOR_VIRT_END - 1)) )
return mfn_to_virt(mfn_x(mfn));
#endif
@@ -230,7 +230,7 @@ void mapcache_domain_init(struct domain *d)
ASSERT(is_pv_domain(d));
-#ifdef NDEBUG
+#ifndef CONFIG_DEBUG
if ( !mem_hotplug && max_page <= PFN_DOWN(__pa(HYPERVISOR_VIRT_END - 1)) )
return;
#endif
@@ -297,7 +297,7 @@ void *map_domain_page_global(mfn_t mfn)
system_state < SYS_STATE_active) ||
local_irq_is_enabled()));
-#ifdef NDEBUG
+#ifndef CONFIG_DEBUG
if ( mfn_x(mfn) <= PFN_DOWN(__pa(HYPERVISOR_VIRT_END - 1)) )
return mfn_to_virt(mfn_x(mfn));
#endif
diff --git a/xen/arch/x86/hvm/svm/emulate.c b/xen/arch/x86/hvm/svm/emulate.c
index 1f786a44cc79..1f13013588cf 100644
--- a/xen/arch/x86/hvm/svm/emulate.c
+++ b/xen/arch/x86/hvm/svm/emulate.c
@@ -63,7 +63,7 @@ unsigned int svm_get_insn_len(struct vcpu *v, unsigned int
instr_enc)
nrip_len = svm_nextrip_insn_length(v);
-#ifdef NDEBUG
+#ifndef CONFIG_DEBUG
if ( nrip_len > MAX_INST_LEN )
gprintk(XENLOG_WARNING, "NRip reported inst_len %lu\n", nrip_len);
else if ( nrip_len != 0 )
diff --git a/xen/arch/x86/include/asm/page.h b/xen/arch/x86/include/asm/page.h
index 23e06d39ad84..bfdc81934dd7 100644
--- a/xen/arch/x86/include/asm/page.h
+++ b/xen/arch/x86/include/asm/page.h
@@ -333,9 +333,10 @@ void efi_update_l4_pgtable(unsigned int l4idx,
l4_pgentry_t l4e);
* WARNING: This will need to be disabled to run OSes that use the spare PTE
* bits themselves (e.g., *BSD).
*/
-#ifdef NDEBUG
+#ifndef CONFIG_DEBUG
#undef _PAGE_GNTTAB
#endif
+
#ifndef _PAGE_GNTTAB
#define _PAGE_GNTTAB 0
#endif
diff --git a/xen/arch/x86/include/asm/setup.h b/xen/arch/x86/include/asm/setup.h
index 5925c5f39cff..378201592bac 100644
--- a/xen/arch/x86/include/asm/setup.h
+++ b/xen/arch/x86/include/asm/setup.h
@@ -46,10 +46,10 @@ int remove_xen_ranges(struct rangeset *r);
int cf_check stub_selftest(void);
-#ifdef NDEBUG
-# define highmem_start 0
-#else
+#ifdef CONFIG_DEBUG
extern unsigned long highmem_start;
+#else
+# define highmem_start 0
#endif
extern unsigned int i8259A_alias_mask;
diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h
index 40b02421ff00..834877caaa2d 100644
--- a/xen/arch/x86/mm/shadow/private.h
+++ b/xen/arch/x86/mm/shadow/private.h
@@ -31,12 +31,12 @@
#define SHADOW_AUDIT_ENTRIES_FULL 0x08 /* Check every shadow */
#define SHADOW_AUDIT_ENTRIES_MFNS 0x10 /* Check gfn-mfn map in shadows */
-#ifdef NDEBUG
-#define SHADOW_AUDIT 0
-#define shadow_audit_enable false
-#else
+#ifdef CONFIG_DEBUG
#define SHADOW_AUDIT 0x15 /* Basic audit of all */
extern bool shadow_audit_enable;
+#else
+#define SHADOW_AUDIT 0
+#define shadow_audit_enable false
#endif
/******************************************************************************
diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 410226d0f01b..5d0e4ead27b6 100644
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -60,10 +60,10 @@
* dom0: The NMI is virtualised to DOM0.
* ignore: The NMI error is cleared and ignored.
*/
-#ifdef NDEBUG
-static char __read_mostly opt_nmi[10] = "dom0";
-#else
+#ifdef CONFIG_DEBUG
static char __read_mostly opt_nmi[10] = "fatal";
+#else
+static char __read_mostly opt_nmi[10] = "dom0";
#endif
string_param("nmi", opt_nmi);
diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h
b/xen/arch/x86/x86_emulate/x86_emulate.h
index 8e0ff799f583..9a430262d6f3 100644
--- a/xen/arch/x86/x86_emulate/x86_emulate.h
+++ b/xen/arch/x86/x86_emulate/x86_emulate.h
@@ -699,7 +699,7 @@ bool cf_check
x86_insn_is_cr_access(const struct x86_emulate_state *s,
const struct x86_emulate_ctxt *ctxt);
-#if !defined(__XEN__) || defined(NDEBUG)
+#if !defined(__XEN__) || !defined(CONFIG_DEBUG)
static inline void x86_emulate_free_state(struct x86_emulate_state *s) {}
#else
void x86_emulate_free_state(struct x86_emulate_state *s);
diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index e2310b9d3c9a..c400dba56155 100644
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -148,16 +148,16 @@ static DEFINE_RSPINLOCK(console_lock);
* Note, in the above algorithm, to disable rate limiting simply make
* the lower threshold equal to the upper.
*/
-#ifdef NDEBUG
-#define XENLOG_UPPER_THRESHOLD 3 /* Do not print DEBUG */
-#define XENLOG_LOWER_THRESHOLD 3 /* Always print INFO, ERR and WARNING */
-#define XENLOG_GUEST_UPPER_THRESHOLD 2 /* Do not print INFO and DEBUG */
-#define XENLOG_GUEST_LOWER_THRESHOLD 0 /* Rate-limit ERR and WARNING */
-#else
+#ifdef CONFIG_DEBUG
#define XENLOG_UPPER_THRESHOLD 4 /* Do not discard anything */
#define XENLOG_LOWER_THRESHOLD 4 /* Print everything */
#define XENLOG_GUEST_UPPER_THRESHOLD 4 /* Do not discard anything */
#define XENLOG_GUEST_LOWER_THRESHOLD 4 /* Print everything */
+#else
+#define XENLOG_UPPER_THRESHOLD 3 /* Do not print DEBUG */
+#define XENLOG_LOWER_THRESHOLD 3 /* Always print INFO, ERR and WARNING */
+#define XENLOG_GUEST_UPPER_THRESHOLD 2 /* Do not print INFO and DEBUG */
+#define XENLOG_GUEST_LOWER_THRESHOLD 0 /* Rate-limit ERR and WARNING */
#endif
/*
* The XENLOG_DEFAULT is the default given to printks that
diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h
index ea24d29b802d..9a704568dbe5 100644
--- a/xen/include/xen/lib.h
+++ b/xen/include/xen/lib.h
@@ -100,7 +100,15 @@ extern bool printk_ratelimit(void);
#define gprintk(lvl, fmt, args...) \
printk(XENLOG_GUEST lvl "%pv " fmt, current, ## args)
-#ifdef NDEBUG
+#ifdef CONFIG_DEBUG
+
+#define dprintk(lvl, fmt, args...) \
+ printk(lvl "%s:%d: " fmt, __FILE__, __LINE__, ## args)
+#define gdprintk(lvl, fmt, args...) \
+ printk(XENLOG_GUEST lvl "%s:%d:%pv " fmt, \
+ __FILE__, __LINE__, current, ## args)
+
+#else
static inline void
__attribute__ ((__format__ (__printf__, 2, 3)))
@@ -110,14 +118,6 @@ static inline void
__attribute__ ((__format__ (__printf__, 2, 3)))
gdprintk(const char *lvl, const char *fmt, ...) {}
-#else
-
-#define dprintk(lvl, fmt, args...) \
- printk(lvl "%s:%d: " fmt, __FILE__, __LINE__, ## args)
-#define gdprintk(lvl, fmt, args...) \
- printk(XENLOG_GUEST lvl "%s:%d:%pv " fmt, \
- __FILE__, __LINE__, current, ## args)
-
#endif
/* vsprintf.c */
--
2.39.5
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |