[Xen-changelog] [qemu-upstream-unstable] kvmvapic: Clear also physical ROM address when entering INACTIVE state

[patchbot@xxxxxxx]

commit 5d2de77798cacf1dadf6a4211972473e057cc6e5
Author:     Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
AuthorDate: Tue Sep 3 18:08:52 2013 +0200
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Tue Sep 24 22:54:39 2013 -0500

    kvmvapic: Clear also physical ROM address when entering INACTIVE state
    
    To avoid misinterpreting INACTIVE after migration as old qemu-kvm's
    STANDBY, also clear rom_state_paddr when going back to this state.
    
    CC: qemu-stable@xxxxxxxxxx
    Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
    Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
    (cherry picked from commit 4357930b8a7d2fcff2d8121ec518117428a781e7)
    
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 hw/i386/kvmvapic.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
index f2e335d..cf6c714 100644
--- a/hw/i386/kvmvapic.c
+++ b/hw/i386/kvmvapic.c
@@ -511,6 +511,7 @@ static void vapic_reset(DeviceState *dev)
     VAPICROMState *s = VAPIC(dev);
 
     s->state = VAPIC_INACTIVE;
+    s->rom_state_paddr = 0;
     vapic_enable_tpr_reporting(false);
 }
 
@@ -664,6 +665,7 @@ static void vapic_write(void *opaque, hwaddr addr, uint64_t 
data,
         }
         if (vapic_prepare(s) < 0) {
             s->state = VAPIC_INACTIVE;
+            s->rom_state_paddr = 0;
             break;
         }
         break;
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog