diff options
author | Avi Kivity <avi@redhat.com> | 2010-11-17 06:40:51 -0500 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2011-01-12 04:29:33 -0500 |
commit | d53db5efc2f6026f7cb0871c91b887ed55e0f265 (patch) | |
tree | bba09541b05d436abe652c18720b6b73564c0e1b | |
parent | 8a6bcaa6efeb7f970474890d4dcfe89774ff26a4 (diff) |
KVM: x86 emulator: drop DPRINTF()
Failed emulation is reported via a tracepoint; the cmps printk is pointless.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r-- | 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 ffd6e017b619..3325b4747394 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c | |||
@@ -22,7 +22,6 @@ | |||
22 | 22 | ||
23 | #include <linux/kvm_host.h> | 23 | #include <linux/kvm_host.h> |
24 | #include "kvm_cache_regs.h" | 24 | #include "kvm_cache_regs.h" |
25 | #define DPRINTF(x...) do {} while (0) | ||
26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
27 | #include <asm/kvm_emulate.h> | 26 | #include <asm/kvm_emulate.h> |
28 | 27 | ||
@@ -2796,10 +2795,8 @@ done_prefixes: | |||
2796 | c->execute = opcode.u.execute; | 2795 | c->execute = opcode.u.execute; |
2797 | 2796 | ||
2798 | /* Unrecognised? */ | 2797 | /* Unrecognised? */ |
2799 | if (c->d == 0 || (c->d & Undefined)) { | 2798 | if (c->d == 0 || (c->d & Undefined)) |
2800 | DPRINTF("Cannot emulate %02x\n", c->b); | ||
2801 | return -1; | 2799 | return -1; |
2802 | } | ||
2803 | 2800 | ||
2804 | if (mode == X86EMUL_MODE_PROT64 && (c->d & Stack)) | 2801 | if (mode == X86EMUL_MODE_PROT64 && (c->d & Stack)) |
2805 | c->op_bytes = 8; | 2802 | c->op_bytes = 8; |
@@ -3261,7 +3258,6 @@ special_insn: | |||
3261 | break; | 3258 | break; |
3262 | case 0xa6 ... 0xa7: /* cmps */ | 3259 | case 0xa6 ... 0xa7: /* cmps */ |
3263 | c->dst.type = OP_NONE; /* Disable writeback. */ | 3260 | c->dst.type = OP_NONE; /* Disable writeback. */ |
3264 | DPRINTF("cmps: mem1=0x%p mem2=0x%p\n", c->src.addr.mem, c->dst.addr.mem); | ||
3265 | goto cmp; | 3261 | goto cmp; |
3266 | case 0xa8 ... 0xa9: /* test ax, imm */ | 3262 | case 0xa8 ... 0xa9: /* test ax, imm */ |
3267 | goto test; | 3263 | goto test; |
@@ -3778,6 +3774,5 @@ twobyte_insn: | |||
3778 | goto writeback; | 3774 | goto writeback; |
3779 | 3775 | ||
3780 | cannot_emulate: | 3776 | cannot_emulate: |
3781 | DPRINTF("Cannot emulate %02x\n", c->b); | ||
3782 | return -1; | 3777 | return -1; |
3783 | } | 3778 | } |