summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2008-04-14 23:27:07 +0300
committerAvi Kivity <avi@qumranet.com>2008-04-27 18:21:33 +0300
commit66b85505736dbd3a3a0ed5ae38c12bb218b231c0 (patch)
tree1515cb412b64efc4b45db4e861943f211f8688f2
parenta79d2f1805da02d7837ec2240f0093c53272fb3a (diff)
downloadlinux-3.10-66b85505736dbd3a3a0ed5ae38c12bb218b231c0.tar.gz
linux-3.10-66b85505736dbd3a3a0ed5ae38c12bb218b231c0.tar.bz2
linux-3.10-66b85505736dbd3a3a0ed5ae38c12bb218b231c0.zip
KVM: x86 emulator: initialize src.val and dst.val for register operands
This lets us treat the case where mod == 3 in the same manner as other cases. Signed-off-by: Avi Kivity <avi@qumranet.com>
-rw-r--r--arch/x86/kvm/x86_emulate.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c
index f59ed93f5d2..8e1b32f2cd5 100644
--- a/arch/x86/kvm/x86_emulate.c
+++ b/arch/x86/kvm/x86_emulate.c
@@ -1001,6 +1001,7 @@ done_prefixes:
*/
if ((c->d & ModRM) && c->modrm_mod == 3) {
c->src.type = OP_REG;
+ c->src.val = c->modrm_val;
break;
}
c->src.type = OP_MEM;
@@ -1044,6 +1045,7 @@ done_prefixes:
case DstMem:
if ((c->d & ModRM) && c->modrm_mod == 3) {
c->dst.type = OP_REG;
+ c->dst.val = c->dst.orig_val = c->modrm_val;
break;
}
c->dst.type = OP_MEM;