[PATCH 0/2] Minor emulator cleanups

[PATCH 0/2] Minor emulator cleanups

[Avi Kivity]

A couple of trivial patches that clean up a bit of cruft from the emulator.

Avi Kivity (2):
  KVM: x86 emulator: drop unused #ifndef __KERNEL__
  KVM: x86 emulator: drop DPRINTF()

 arch/x86/kvm/emulate.c |   14 +-------------
 1 files changed, 1 insertions(+), 13 deletions(-)

-- 
1.7.3.1

[PATCH 1/2] KVM: x86 emulator: drop unused #ifndef __KERNEL__

[Avi Kivity]

Signed-off-by: Avi Kivity <avi@redhat.com>
---
 arch/x86/kvm/emulate.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 38b6e8d..ffd6e01 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -20,16 +20,9 @@
  * From: xen-unstable 10676:af9809f51f81a3c43f276f00c81a52ef558afda4
  */
 
-#ifndef __KERNEL__
-#include <stdio.h>
-#include <stdint.h>
-#include <public/xen.h>
-#define DPRINTF(_f, _a ...) printf(_f , ## _a)
-#else
 #include <linux/kvm_host.h>
 #include "kvm_cache_regs.h"
 #define DPRINTF(x...) do {} while (0)
-#endif
 #include <linux/module.h>
 #include <asm/kvm_emulate.h>
 
-- 
1.7.3.1

[PATCH 2/2] KVM: x86 emulator: drop DPRINTF()

[Avi Kivity]

Failed emulation is reported via a tracepoint; the cmps printk is pointless.

Signed-off-by: Avi Kivity <avi@redhat.com>
---
 arch/x86/kvm/emulate.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index ffd6e01..3325b47 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -22,7 +22,6 @@
 
 #include <linux/kvm_host.h>
 #include "kvm_cache_regs.h"
-#define DPRINTF(x...) do {} while (0)
 #include <linux/module.h>
 #include <asm/kvm_emulate.h>
 
@@ -2796,10 +2795,8 @@ done_prefixes:
 	c->execute = opcode.u.execute;
 
 	/* Unrecognised? */
-	if (c->d == 0 || (c->d & Undefined)) {
-		DPRINTF("Cannot emulate %02x\n", c->b);
+	if (c->d == 0 || (c->d & Undefined))
 		return -1;
-	}
 
 	if (mode == X86EMUL_MODE_PROT64 && (c->d & Stack))
 		c->op_bytes = 8;
@@ -3261,7 +3258,6 @@ special_insn:
 		break;
 	case 0xa6 ... 0xa7:	/* cmps */
 		c->dst.type = OP_NONE; /* Disable writeback. */
-		DPRINTF("cmps: mem1=0x%p mem2=0x%p\n", c->src.addr.mem, c->dst.addr.mem);
 		goto cmp;
 	case 0xa8 ... 0xa9:	/* test ax, imm */
 		goto test;
@@ -3778,6 +3774,5 @@ twobyte_insn:
 	goto writeback;
 
 cannot_emulate:
-	DPRINTF("Cannot emulate %02x\n", c->b);
 	return -1;
 }
-- 
1.7.3.1

Re: [PATCH 0/2] Minor emulator cleanups

[Marcelo Tosatti]

On Wed, Nov 17, 2010 at 01:40:49PM +0200, Avi Kivity wrote:
> A couple of trivial patches that clean up a bit of cruft from the emulator.
> 
> Avi Kivity (2):
>   KVM: x86 emulator: drop unused #ifndef __KERNEL__
>   KVM: x86 emulator: drop DPRINTF()
> 
>  arch/x86/kvm/emulate.c |   14 +-------------
>  1 files changed, 1 insertions(+), 13 deletions(-)

Applied, thanks.