Skip to contentSkip to conversation

kvm-unit-tests: minor: remove unused variable

PATCH In review Eugene Korenevsky 2 participants 2 messages Dec 12, 2014 – Dec 15, 2014 KVM

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kvm-unit-tests: minor: remove unused variable

Remove unused variable to get rid of compiler warning. And remove commented out code (it can always be restored from git logs).

---
 x86/vmx_tests.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
x86/vmx_tests.c +3 -7
index 184fafc..0daaacf 100644
@@ -1439,12 +1439,10 @@ static int dbgctls_init(struct vmcs *vmcs)
 
 static void dbgctls_main(void)
 {
-	u64 dr7, debugctl;
+	u64 dr7;
 
 	asm volatile("mov %%dr7,%0" : "=r" (dr7));
-	debugctl = rdmsr(MSR_IA32_DEBUGCTLMSR);
-	/* Commented out: KVM does not support DEBUGCTL so far */
-	report("Load debug controls", dr7 == 0x404 /* && debugctl == 0x2 */);
+	report("Load debug controls", dr7 == 0x404);
 
 	dr7 = 0x408;
 	asm volatile("mov %0,%%dr7" : : "r" (dr7));
@@ -1463,9 +1461,7 @@ static void dbgctls_main(void)
 	vmcall();
 
 	asm volatile("mov %%dr7,%0" : "=r" (dr7));
-	debugctl = rdmsr(MSR_IA32_DEBUGCTLMSR);
-	/* Commented out: KVM does not support DEBUGCTL so far */
-	report("Guest=host debug controls", dr7 == 0x402 /* && debugctl == 0x1 */);
+	report("Guest=host debug controls", dr7 == 0x402);
 
 	dr7 = 0x408;
 	asm volatile("mov %0,%%dr7" : : "r" (dr7));
Signature · 1 line
2.0.4
maintainer
#1 lore raw
Quoted 3 lines · Eugene Korenevsky

Remove unused variable to get rid of compiler warning. And remove commented out code (it can always be restored from git logs).

This is also specifying that the behavior is incorrect. It should be changed to an XFAIL instead.

Paolo

Quoted 36 lines
---
 x86/vmx_tests.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
x86/vmx_tests.c +3 -7
index 184fafc..0daaacf 100644
@@ -1439,12 +1439,10 @@ static int dbgctls_init(struct vmcs *vmcs)
 
 static void dbgctls_main(void)
 {
-	u64 dr7, debugctl;
+	u64 dr7;
 
 	asm volatile("mov %%dr7,%0" : "=r" (dr7));
-	debugctl = rdmsr(MSR_IA32_DEBUGCTLMSR);
-	/* Commented out: KVM does not support DEBUGCTL so far */
-	report("Load debug controls", dr7 == 0x404 /* && debugctl == 0x2 */);
+	report("Load debug controls", dr7 == 0x404);
 
 	dr7 = 0x408;
 	asm volatile("mov %0,%%dr7" : : "r" (dr7));
@@ -1463,9 +1461,7 @@ static void dbgctls_main(void)
 	vmcall();
 
 	asm volatile("mov %%dr7,%0" : "=r" (dr7));
-	debugctl = rdmsr(MSR_IA32_DEBUGCTLMSR);
-	/* Commented out: KVM does not support DEBUGCTL so far */
-	report("Guest=host debug controls", dr7 == 0x402 /* && debugctl == 0x1 */);
+	report("Guest=host debug controls", dr7 == 0x402);
 
 	dr7 = 0x408;
 	asm volatile("mov %0,%%dr7" : : "r" (dr7));