From 251f772780d72ae71e50bf7133eb5c9fa9f87c0e Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Sun, 10 Jun 2012 17:11:00 +0300 Subject: [PATCH] --- yaml --- r: 315879 b: refs/heads/master c: cbd27ee783f1e56d56415e8c5f2492ccedd565c4 h: refs/heads/master i: 315877: a5723ccdc1f25f1ee8fd121471740dab16f0572a 315875: b57ed0b88ca8543af14b2232a6b05ad4e0aa207c 315871: d9d2e013929396e72f2acbb8c46fc4b378914491 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/kvm_emulate.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5883a44acd19..b59c40e43cd4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f47cfa3174ad8bd39e56524b36e79c463bf820b1 +refs/heads/master: cbd27ee783f1e56d56415e8c5f2492ccedd565c4 diff --git a/trunk/arch/x86/include/asm/kvm_emulate.h b/trunk/arch/x86/include/asm/kvm_emulate.h index cd5c96b2496e..c764f43b71c5 100644 --- a/trunk/arch/x86/include/asm/kvm_emulate.h +++ b/trunk/arch/x86/include/asm/kvm_emulate.h @@ -280,9 +280,9 @@ struct x86_emulate_ctxt { u8 modrm_seg; bool rip_relative; unsigned long _eip; + struct operand memop; /* Fields above regs are cleared together. */ unsigned long regs[NR_VCPU_REGS]; - struct operand memop; struct operand *memopp; struct fetch_cache fetch; struct read_cache io_read;