[kvm-unit-tests PATCH 1/3] x86: fix "format not a string literal" errors

David Matlack
2017-05-24T21:31:48Z

Fix the following two compilation errors:

x86/msr.c: In function ‘test_msr_rw’:
x86/msr.c:94:5: error: format not a string literal and no format arguments [-Werror=format-security]
report(sptr, expected == r);
^

x8e/vmx.c: In function ‘test_vmx_caps’:
x86/vmx.c:1412:3: error: format not a string literal and no format arguments [-Werror=format-security]
report(vmx_ctl_msr[n].name, ok);
^

Signed-off-by: David Matlack <dmatlack@google.com>
---
x86/msr.c | 2 +-
x86/vmx.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x86/msr.c b/x86/msr.c
index ab97d21d3acb..1d4003144bb5 100644
--- a/x86/msr.c
+++ b/x86/msr.c
@@ -91,7 +91,7 @@ static void test_msr_rw(int msr_index, unsigned long long input, unsigned long l
printf("testing %s: output = %#x:%#x expected = %#x:%#x\n", sptr,
(u32)(r >> 32), (u32)r, (u32)(expected >> 32), (u32)expected);
}
- report(sptr, expected == r);
+ report("%s", expected == r, sptr);
}

static void test_syscall_lazy_load(void)
diff --git a/x86/vmx.c b/x86/vmx.c
index 13366180f514..9189a66759ec 100644
--- a/x86/vmx.c
+++ b/x86/vmx.c
@@ -1409,7 +1409,7 @@ static void test_vmx_caps(void)
ok = ctrl.clr == true_ctrl.clr;
ok = ok && ctrl.set == (true_ctrl.set | default1);
}
- report(vmx_ctl_msr[n].name, ok);
+ report("%s", ok, vmx_ctl_msr[n].name);
}

fixed0 = rdmsr(MSR_IA32_VMX_CR0_FIXED0);
--
2.13.0.219.gdb65acc882-goog