From 5852d3bfe16c85d4dabc4e0d21658fc680a756e5 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 14 May 2012 14:02:14 +0200 Subject: [PATCH] uhci: zap uhci_pre_save Cancel transactions before saving vmstate is pretty pointless and just causes disruptions. We need to cancel them before *loading* vmstate, but in that case uhci_reset() handles it already and no special action is needed. Signed-off-by: Gerd Hoffmann --- hw/usb/hcd-uhci.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index 2e7c8f9..3ea388c 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -376,13 +376,6 @@ static void uhci_reset(void *opaque) uhci_update_irq(s); } -static void uhci_pre_save(void *opaque) -{ - UHCIState *s = opaque; - - uhci_async_cancel_all(s); -} - static const VMStateDescription vmstate_uhci_port = { .name = "uhci port", .version_id = 1, @@ -399,7 +392,6 @@ static const VMStateDescription vmstate_uhci = { .version_id = 2, .minimum_version_id = 1, .minimum_version_id_old = 1, - .pre_save = uhci_pre_save, .fields = (VMStateField []) { VMSTATE_PCI_DEVICE(dev, UHCIState), VMSTATE_UINT8_EQUAL(num_ports_vmstate, UHCIState), -- 2.7.4