KVM: x86 emulator: handle "far address" source operand

[deliverable/linux.git] / arch / x86 / include / asm / kvm_emulate.h

diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h
index 288cbedcab1c4f2984de766cab68565c7a83d398..69a64a6a36f47c637956812e28d2d0aced2f5c10 100644 (file)
--- a/arch/x86/include/asm/kvm_emulate.h
+++ b/arch/x86/include/asm/kvm_emulate.h
@@ -143,7 +143,11 @@ struct x86_emulate_ops {
 struct operand {
        enum { OP_REG, OP_MEM, OP_IMM, OP_NONE } type;
        unsigned int bytes;
-       unsigned long val, orig_val, *ptr;
+       unsigned long orig_val, *ptr;
+       union {
+               unsigned long val;
+               char valptr[sizeof(unsigned long) + 2];
+       };
 };
 
 struct fetch_cache {