4.9-stable patches

[thirdparty/kernel/stable-queue.git] / releases / 2.6.35.8 / kvm-i8259-fix-migration.patch

From mtosatti@redhat.com  Wed Oct 20 13:28:59 2010
From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Thu, 14 Oct 2010 13:49:55 -0300
Subject: KVM: i8259: fix migration
To: greg@kroah.com
Cc: mtosatti@redhat.com, avi@redhat.com, Gleb Natapov <gleb@redhat.com>, stable@kernel.org
Message-ID: <20101014165150.641000797@redhat.com>

From: Marcelo Tosatti <mtosatti@redhat.com>

commit eebb5f31b8d9a2620dcf32297096f8ce1240b179 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 arch/x86/kvm/irq.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/x86/kvm/irq.h
+++ b/arch/x86/kvm/irq.h
@@ -45,7 +45,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;
@@ -58,6 +57,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;
 };