[Xen-changelog] [qemu-upstream-unstable] kvmvapic: Enter inactive state on hardware reset

[patchbot@xxxxxxx]

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

    kvmvapic: Enter inactive state on hardware reset
    
    ROM layout may change after reset of devices are hotplugged, so we have
    to pick up the physical address again when the ROM is initialized. This
    is best achieved by resetting the state to INACTIVE.
    
    CC: qemu-stable@xxxxxxxxxx
    Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
    Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
    (cherry picked from commit c056bc3f3464cfae1c94b7dd633d3ec13b13b655)
    
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 hw/i386/kvmvapic.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
index 7ac0fe1..f2e335d 100644
--- a/hw/i386/kvmvapic.c
+++ b/hw/i386/kvmvapic.c
@@ -510,9 +510,7 @@ static void vapic_reset(DeviceState *dev)
 {
     VAPICROMState *s = VAPIC(dev);
 
-    if (s->state == VAPIC_ACTIVE) {
-        s->state = VAPIC_STANDBY;
-    }
+    s->state = VAPIC_INACTIVE;
     vapic_enable_tpr_reporting(false);
 }
 
--
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