aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/irq.h
diff options
context:
space:
mode:
authorGleb Natapov <gleb@redhat.com>2010-08-30 12:49:13 +0300
committerMarcelo Tosatti <mtosatti@redhat.com>2010-09-08 14:50:58 -0300
commiteebb5f31b8d9a2620dcf32297096f8ce1240b179 (patch)
tree430a40dd38588b7306a5df1134238d1ffdbb0ea7 /arch/x86/kvm/irq.h
parentae0635b3580844e320a253a16985f4ce8b5bd0b6 (diff)
downloadmrst-s0i3-test-eebb5f31b8d9a2620dcf32297096f8ce1240b179.tar.gz
mrst-s0i3-test-eebb5f31b8d9a2620dcf32297096f8ce1240b179.tar.xz
mrst-s0i3-test-eebb5f31b8d9a2620dcf32297096f8ce1240b179.zip
KVM: i8259: fix migration
Top of kvm_kpic_state structure should have the same memory layout as kvm_pic_state since it is copied by memcpy. Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/irq.h')
-rw-r--r--arch/x86/kvm/irq.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h
index ffed06871c5..63c31450299 100644
--- a/arch/x86/kvm/irq.h
+++ b/arch/x86/kvm/irq.h
@@ -43,7 +43,6 @@ struct kvm_kpic_state {
u8 irr; /* interrupt request register */
u8 imr; /* interrupt mask register */
u8 isr; /* interrupt service register */
- u8 isr_ack; /* interrupt ack detection */
u8 priority_add; /* highest irq priority */
u8 irq_base;
u8 read_reg_select;
@@ -56,6 +55,7 @@ struct kvm_kpic_state {
u8 init4; /* true if 4 byte init */
u8 elcr; /* PIIX edge/trigger selection */
u8 elcr_mask;
+ u8 isr_ack; /* interrupt ack detection */
struct kvm_pic *pics_state;
};