aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Config.mk4
-rw-r--r--tools/libfsimage/common/fsimage_grub.h2
-rw-r--r--xen/arch/x86/debug.c4
-rw-r--r--xen/arch/x86/hvm/svm/vpmu.c2
-rw-r--r--xen/arch/x86/hvm/vmx/vpmu_core2.c2
-rw-r--r--xen/arch/x86/oprofile/nmi_int.c2
-rw-r--r--xen/include/asm-x86/debugger.h7
-rw-r--r--xen/include/asm-x86/hvm/hvm.h2
-rw-r--r--xen/include/xen/tmem_xen.h6
-rw-r--r--xen/include/xsm/xsm.h8
10 files changed, 20 insertions, 19 deletions
diff --git a/Config.mk b/Config.mk
index 66fbebb0b5..e089fbd7c8 100644
--- a/Config.mk
+++ b/Config.mk
@@ -157,10 +157,6 @@ CFLAGS += -std=gnu99
CFLAGS += -Wall -Wstrict-prototypes
-# -Wunused-value makes GCC 4.x too aggressive for my taste: ignoring the
-# result of any casted expression causes a warning.
-CFLAGS += -Wno-unused-value
-
# Clang complains about macros that expand to 'if ( ( foo == bar ) ) ...'
# and is over-zealous with the printf format lint
CFLAGS-$(clang) += -Wno-parentheses -Wno-format
diff --git a/tools/libfsimage/common/fsimage_grub.h b/tools/libfsimage/common/fsimage_grub.h
index 87f89ede20..534c346b23 100644
--- a/tools/libfsimage/common/fsimage_grub.h
+++ b/tools/libfsimage/common/fsimage_grub.h
@@ -57,7 +57,7 @@ typedef struct fsig_plugin_ops {
#define disk_read_func (*fsig_disk_read_junk())
#define disk_read_hook (*fsig_disk_read_junk())
#define print_possibilities 0
-#define noisy_printf
+#define noisy_printf(fmt...)
#define grub_memset memset
#define grub_memmove memmove
diff --git a/xen/arch/x86/debug.c b/xen/arch/x86/debug.c
index 8e3617a331..35f8d2e5bd 100644
--- a/xen/arch/x86/debug.c
+++ b/xen/arch/x86/debug.c
@@ -37,8 +37,8 @@
#define DBGP1(...) {(kdbdbg>1) ? kdbp(__VA_ARGS__):0;}
#define DBGP2(...) {(kdbdbg>2) ? kdbp(__VA_ARGS__):0;}
#else
-#define DBGP1(...) {0;}
-#define DBGP2(...) {0;}
+#define DBGP1(...) ((void)0)
+#define DBGP2(...) ((void)0)
#endif
/* Returns: mfn for the given (hvm guest) vaddr */
diff --git a/xen/arch/x86/hvm/svm/vpmu.c b/xen/arch/x86/hvm/svm/vpmu.c
index 65bb20692a..30288a4fc5 100644
--- a/xen/arch/x86/hvm/svm/vpmu.c
+++ b/xen/arch/x86/hvm/svm/vpmu.c
@@ -154,7 +154,7 @@ static int amd_vpmu_do_interrupt(struct cpu_user_regs *regs)
if ( GET_APIC_DELIVERY_MODE(vlapic_lvtpc) == APIC_MODE_FIXED )
vlapic_set_irq(vcpu_vlapic(v), int_vec, 0);
else
- test_and_set_bool(v->nmi_pending);
+ v->nmi_pending = 1;
return 1;
}
diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c
index 6d23880a38..19ac9cbb04 100644
--- a/xen/arch/x86/hvm/vmx/vpmu_core2.c
+++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c
@@ -574,7 +574,7 @@ static int core2_vpmu_do_interrupt(struct cpu_user_regs *regs)
if ( GET_APIC_DELIVERY_MODE(vlapic_lvtpc) == APIC_MODE_FIXED )
vlapic_set_irq(vcpu_vlapic(v), int_vec, 0);
else
- test_and_set_bool(v->nmi_pending);
+ v->nmi_pending = 1;
return 1;
}
diff --git a/xen/arch/x86/oprofile/nmi_int.c b/xen/arch/x86/oprofile/nmi_int.c
index 70930b245a..a58a0e9892 100644
--- a/xen/arch/x86/oprofile/nmi_int.c
+++ b/xen/arch/x86/oprofile/nmi_int.c
@@ -92,7 +92,7 @@ static int nmi_callback(struct cpu_user_regs *regs, int cpu)
send_guest_vcpu_virq(current, VIRQ_XENOPROF);
if ( ovf == 2 )
- test_and_set_bool(current->nmi_pending);
+ current->nmi_pending = 1;
return 1;
}
diff --git a/xen/include/asm-x86/debugger.h b/xen/include/asm-x86/debugger.h
index e47935f631..0408bec896 100644
--- a/xen/include/asm-x86/debugger.h
+++ b/xen/include/asm-x86/debugger.h
@@ -55,7 +55,12 @@ static inline int debugger_trap_fatal(
#else
-#define debugger_trap_fatal(v, r) (0)
+static inline int debugger_trap_fatal(
+ unsigned int vector, struct cpu_user_regs *regs)
+{
+ return 0;
+}
+
#define debugger_trap_immediate() ((void)0)
#endif
diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h
index 5373dab51e..826cb3302c 100644
--- a/xen/include/asm-x86/hvm/hvm.h
+++ b/xen/include/asm-x86/hvm/hvm.h
@@ -235,7 +235,7 @@ int hvm_girq_dest_2_vcpu_id(struct domain *d, uint8_t dest, uint8_t dest_mode);
#define hvm_long_mode_enabled(v) \
((v)->arch.hvm_vcpu.guest_efer & EFER_LMA)
#else
-#define hvm_long_mode_enabled(v) (v,0)
+#define hvm_long_mode_enabled(v) ((void)(v),0)
#endif
enum hvm_intblk
diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h
index 3dbf6f800a..76ab44069e 100644
--- a/xen/include/xen/tmem_xen.h
+++ b/xen/include/xen/tmem_xen.h
@@ -365,7 +365,7 @@ static inline int tmh_page_cmp(pfp_t *pfp1, pfp_t *pfp2)
// FIXME: code in assembly?
ASSERT(p1 != NULL);
ASSERT(p2 != NULL);
- for ( i = PAGE_SIZE/sizeof(uint64_t); i && *p1 == *p2; i--, *p1++, *p2++ );
+ for ( i = PAGE_SIZE/sizeof(uint64_t); i && *p1 == *p2; i--, p1++, p2++ );
if ( !i )
return 0;
if ( *p1 < *p2 )
@@ -386,7 +386,7 @@ static inline int tmh_pcd_cmp(void *va1, pagesize_t len1, void *va2, pagesize_t
if ( len1 > len2 )
return 1;
ASSERT(len1 == len2);
- for ( i = len2; i && *p1 == *p2; i--, *p1++, *p2++ );
+ for ( i = len2; i && *p1 == *p2; i--, p1++, p2++ );
if ( !i )
return 0;
if ( *p1 < *p2 )
@@ -413,7 +413,7 @@ static inline int tmh_tze_pfp_cmp(pfp_t *pfp1, pagesize_t pfp_len, void *tva, pa
if ( pfp_len > tze_len )
return 1;
ASSERT(pfp_len == tze_len);
- for ( i = tze_len/sizeof(uint64_t); i && *p1 == *p2; i--, *p1++, *p2++ );
+ for ( i = tze_len/sizeof(uint64_t); i && *p1 == *p2; i--, p1++, p2++ );
if ( !i )
return 0;
if ( *p1 < *p2 )
diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h
index 0afe49f437..ce3b6aa9d5 100644
--- a/xen/include/xsm/xsm.h
+++ b/xen/include/xsm/xsm.h
@@ -163,7 +163,7 @@ extern struct xsm_operations *xsm_ops;
static inline void xsm_security_domaininfo (struct domain *d,
struct xen_domctl_getdomaininfo *info)
{
- xsm_call(security_domaininfo(d, info));
+ (void)xsm_call(security_domaininfo(d, info));
}
static inline int xsm_setvcpucontext(struct domain *d)
@@ -310,7 +310,7 @@ static inline int xsm_evtchn_interdomain (struct domain *d1,
static inline void xsm_evtchn_close_post (struct evtchn *chn)
{
- xsm_call(evtchn_close_post(chn));
+ (void)xsm_call(evtchn_close_post(chn));
}
static inline int xsm_evtchn_send (struct domain *d, struct evtchn *chn)
@@ -366,7 +366,7 @@ static inline int xsm_alloc_security_domain (struct domain *d)
static inline void xsm_free_security_domain (struct domain *d)
{
- xsm_call(free_security_domain(d));
+ (void)xsm_call(free_security_domain(d));
}
static inline int xsm_alloc_security_evtchn (struct evtchn *chn)
@@ -376,7 +376,7 @@ static inline int xsm_alloc_security_evtchn (struct evtchn *chn)
static inline void xsm_free_security_evtchn (struct evtchn *chn)
{
- xsm_call(free_security_evtchn(chn));
+ (void)xsm_call(free_security_evtchn(chn));
}
static inline int xsm_memory_adjust_reservation (struct domain *d1, struct
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 07:03:21 +0000