From 32b9761a5d6e10484965cf1a6e9cf02817079fe2 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Fri, 13 Jun 2008 22:45:42 +0300
Subject: [PATCH] --- yaml --- r: 103732 b: refs/heads/master c:
 f76c710d759250a43976bcfcab6af6ebb94b7dc2 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/x86.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 273927dfc20f..eadbc0be4c4f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ef621d3be56e1188300476a8102ff54f7b6793f
+refs/heads/master: f76c710d759250a43976bcfcab6af6ebb94b7dc2
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
index 5d21bb69d88c..d1db5aa5c7f4 100644
--- a/trunk/arch/x86/kvm/x86.c
+++ b/trunk/arch/x86/kvm/x86.c
@@ -2076,12 +2076,11 @@ int emulator_set_dr(struct x86_emulate_ctxt *ctxt, int dr, unsigned long value)
 
 void kvm_report_emulation_failure(struct kvm_vcpu *vcpu, const char *context)
 {
-	static int reported;
 	u8 opcodes[4];
 	unsigned long rip = vcpu->arch.rip;
 	unsigned long rip_linear;
 
-	if (reported)
+	if (!printk_ratelimit())
 		return;
 
 	rip_linear = rip + get_segment_base(vcpu, VCPU_SREG_CS);
@@ -2090,7 +2089,6 @@ void kvm_report_emulation_failure(struct kvm_vcpu *vcpu, const char *context)
 
 	printk(KERN_ERR "emulation failed (%s) rip %lx %02x %02x %02x %02x\n",
 	       context, rip, opcodes[0], opcodes[1], opcodes[2], opcodes[3]);
-	reported = 1;
 }
 EXPORT_SYMBOL_GPL(kvm_report_emulation_failure);