From patchwork Tue Jun 15 13:31:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 55667 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 55B68B7D6D for ; Tue, 15 Jun 2010 23:43:01 +1000 (EST) Received: from localhost ([127.0.0.1]:46402 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOWO4-00052M-Be for incoming@patchwork.ozlabs.org; Tue, 15 Jun 2010 09:41:08 -0400 Received: from [140.186.70.92] (port=53271 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOWEd-0002vP-RJ for qemu-devel@nongnu.org; Tue, 15 Jun 2010 09:31:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OOWER-0006u6-62 for qemu-devel@nongnu.org; Tue, 15 Jun 2010 09:31:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61388) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OOWEQ-0006tv-U8 for qemu-devel@nongnu.org; Tue, 15 Jun 2010 09:31:11 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5FDVACj028874 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 15 Jun 2010 09:31:10 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5FDV5KP014460; Tue, 15 Jun 2010 09:31:09 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 15 Jun 2010 15:31:02 +0200 Message-Id: <75856f45ab9e9cd650694e9a55aa15318c73cca0.1276607973.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 2/5] Revert "ide save/restore current transfer fields" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This reverts commit 42ee76fe82093ba914f0dc83d2decbcf68866144. Signed-off-by: Juan Quintela --- hw/ide/pci.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 4d95cc5..780fc5f 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -123,7 +123,7 @@ void bmdma_addr_writel(void *opaque, uint32_t addr, uint32_t val) static const VMStateDescription vmstate_bmdma = { .name = "ide bmdma", - .version_id = 4, + .version_id = 3, .minimum_version_id = 0, .minimum_version_id_old = 0, .fields = (VMStateField []) { @@ -133,10 +133,6 @@ static const VMStateDescription vmstate_bmdma = { VMSTATE_INT64(sector_num, BMDMAState), VMSTATE_UINT32(nsector, BMDMAState), VMSTATE_UINT8(unit, BMDMAState), - VMSTATE_UINT32_V(cur_addr, BMDMAState, 4), - VMSTATE_UINT32_V(cur_prd_last, BMDMAState, 4), - VMSTATE_UINT32_V(cur_prd_addr, BMDMAState, 4), - VMSTATE_UINT32_V(cur_prd_len, BMDMAState, 4), VMSTATE_END_OF_LIST() } }; @@ -156,7 +152,7 @@ static int ide_pci_post_load(void *opaque, int version_id) const VMStateDescription vmstate_ide_pci = { .name = "ide", - .version_id = 4, + .version_id = 3, .minimum_version_id = 0, .minimum_version_id_old = 0, .post_load = ide_pci_post_load,