Patch-mainline: v4.20-rc5

Git-commit: 354cb410d87314e2eda344feea84809e4261570a

References: git-fixes

From: Yi Wang <wang.yi59@zte.com.cn>

Date: Thu, 8 Nov 2018 16:48:36 +0800

Subject: [PATCH] KVM: x86: fix empty-body warnings

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

We get the following warnings about empty statements when building

with 'W=1':

arch/x86/kvm/lapic.c:632:53: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]

arch/x86/kvm/lapic.c:1907:42: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]

arch/x86/kvm/lapic.c:1936:65: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]

arch/x86/kvm/lapic.c:1975:44: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]

Rework the debug helper macro to get rid of these warnings.

Signed-off-by: Yi Wang <wang.yi59@zte.com.cn>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Signed-off-by: Juergen Gross <jgross@suse.com>

---

 arch/x86/kvm/lapic.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c

index 02f2291dcf7e..c4533d05c214 100644

--- a/arch/x86/kvm/lapic.c

+++ b/arch/x86/kvm/lapic.c

@@ -55,7 +55,7 @@

 #define PRIo64 "o"

 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */

-#define apic_debug(fmt, arg...)

+#define apic_debug(fmt, arg...) do {} while (0)

 /* 14 is the version for Xeon and Pentium 8.4.8*/

 #define APIC_VERSION			(0x14UL | ((KVM_APIC_LVT_NUM - 1) << 16))

-- 

2.35.3