Sophie

Sophie

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

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

From e29d1d7f8fdd18d82e7dbd6c96cb4101782df2fa Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Thu, 17 Sep 2009 14:06:03 -0300
Subject: [PATCH 29/38] uhci_reset() should have QEMUResetHandler type

RH-Author: Juan Quintela <quintela@redhat.com>
Message-id: <83491bc4d53430eff73ce3f200da5a933aa9241d.1249487147.git.quintela@redhat.com>
Patchwork-id: 3195
O-Subject: [PATCH 28/38] uhci_reset() should have QEMUResetHandler type
Bugzilla: 515749
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
RH-Acked-by: Dor Laor <dlaor@redhat.com>
RH-Acked-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 qemu/hw/usb-uhci.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu/hw/usb-uhci.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/qemu/hw/usb-uhci.c b/qemu/hw/usb-uhci.c
index ec4ce91..4d31db9 100644
--- a/qemu/hw/usb-uhci.c
+++ b/qemu/hw/usb-uhci.c
@@ -320,8 +320,9 @@ static void uhci_update_irq(UHCIState *s)
     qemu_set_irq(s->dev.irq[3], level);
 }
 
-static void uhci_reset(UHCIState *s)
+static void uhci_reset(void *opaque)
 {
+    UHCIState *s = opaque;
     uint8_t *pci_conf;
     int i;
     UHCIPort *port;
-- 
1.6.3.rc4.29.g8146