From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47518) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXr4P-0000q9-Io for qemu-devel@nongnu.org; Fri, 25 May 2012 05:44:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SXr4N-0000bj-3c for qemu-devel@nongnu.org; Fri, 25 May 2012 05:44:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59774) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXr4M-0000b5-SX for qemu-devel@nongnu.org; Fri, 25 May 2012 05:44:27 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q4P9iOil015064 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 25 May 2012 05:44:25 -0400 From: Gerd Hoffmann Date: Fri, 25 May 2012 11:44:16 +0200 Message-Id: <1337939061-13629-6-git-send-email-kraxel@redhat.com> In-Reply-To: <1337939061-13629-1-git-send-email-kraxel@redhat.com> References: <1337939061-13629-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 05/10] uhci: zap uhci_pre_save List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 files changed, 0 insertions(+), 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), -- 1.7.1