Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > media > main-src > by-pkgid > aadbe78a25743146bb784eee19f007c5 > files > 169

kvm-83-164.el5_5.9.src.rpm

From d471977de32e331ed49e3c53f404b9dc815097e7 Mon Sep 17 00:00:00 2001
From: Gleb Natapov <gleb@redhat.com>
Date: Thu, 11 Jun 2009 11:49:48 +0300
Subject: [PATCH 3/3] Register uhci_reset() callback.

Update IRQ line on reset.

Upstream status: posted for review
BZ: 500796

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Message-ID: <20090611084948.GB19508@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
RH-Upstream-status: submitted
Acked-by: Dor Laor <dlaor@redhat.com>
Acked-by: Avi Kivity <avi@redhat.com>
Acked-by: john cooper <john.cooper@redhat.com>
Bugzilla: 504237
---
 qemu/hw/usb-uhci.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/qemu/hw/usb-uhci.c b/qemu/hw/usb-uhci.c
index b90cf78..ec4ce91 100644
--- a/qemu/hw/usb-uhci.c
+++ b/qemu/hw/usb-uhci.c
@@ -347,6 +347,7 @@ static void uhci_reset(UHCIState *s)
     }
 
     uhci_async_cancel_all(s);
+    uhci_update_irq(s);
 }
 
 static void uhci_save(QEMUFile *f, void *opaque)
@@ -1097,6 +1098,7 @@ void usb_uhci_piix3_init(PCIBus *bus, int devfn)
     }
     s->frame_timer = qemu_new_timer(vm_clock, uhci_frame_timer, s);
 
+    qemu_register_reset(uhci_reset, s);
     uhci_reset(s);
 
     /* Use region 4 for consistency with real hardware.  BSD guests seem
@@ -1134,6 +1136,7 @@ void usb_uhci_piix4_init(PCIBus *bus, int devfn)
     }
     s->frame_timer = qemu_new_timer(vm_clock, uhci_frame_timer, s);
 
+    qemu_register_reset(uhci_reset, s);
     uhci_reset(s);
 
     /* Use region 4 for consistency with real hardware.  BSD guests seem
-- 
1.6.3.rc4.29.g8146