From 9377defa4a0d3df899cc3f80842b27e499188830 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Thu, 26 Aug 2010 11:56:06 +0300
Subject: [PATCH] --- yaml --- r: 215787 b: refs/heads/master c:
 8d8f4e9f66ab36e4fcc75eca1e828af8466309f1 h: refs/heads/master i:   215785:
 8106cb47dbb28b3ba7f1e629137177b6bb03943c   215783:
 7ba52b5d9fbd65ff5a47d476816c0f9071718eeb v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/kvm/emulate.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 332db8b4209c..5ad9608dbf79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 081bca0e6b87d0c7b9ade7ffee1f44aca336a8fa
+refs/heads/master: 8d8f4e9f66ab36e4fcc75eca1e828af8466309f1
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
index 2b9b0feabdba..1a230b5495e0 100644
--- a/trunk/arch/x86/kvm/emulate.c
+++ b/trunk/arch/x86/kvm/emulate.c
@@ -2330,6 +2330,9 @@ static int em_rdtsc(struct x86_emulate_ctxt *ctxt)
 #define GD(_f, _g) { .flags = ((_f) | Group | GroupDual), .u.gdual = (_g) }
 #define I(_f, _e) { .flags = (_f), .u.execute = (_e) }
 
+#define D2bv(_f)      D((_f) | ByteOp), D(_f)
+#define I2bv(_f, _e)  I((_f) | ByteOp, _e), I(_f, _e)
+
 static struct opcode group1[] = {
 	X7(D(Lock)), N
 };
@@ -2572,6 +2575,9 @@ static struct opcode twobyte_table[256] = {
 #undef GD
 #undef I
 
+#undef D2bv
+#undef I2bv
+
 static unsigned imm_size(struct decode_cache *c)
 {
 	unsigned size;