From patchwork Mon Jul 26 19:38:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 59938 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 7CA36B70B7 for ; Tue, 27 Jul 2010 05:43:03 +1000 (EST) Received: from localhost ([127.0.0.1]:34213 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OdTZT-0004u6-TJ for incoming@patchwork.ozlabs.org; Mon, 26 Jul 2010 15:42:43 -0400 Received: from [140.186.70.92] (port=54112 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OdTX6-0003tg-Hi for qemu-devel@nongnu.org; Mon, 26 Jul 2010 15:40:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OdTX4-0007Su-T7 for qemu-devel@nongnu.org; Mon, 26 Jul 2010 15:40:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16301) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OdTX4-0007Sg-HW for qemu-devel@nongnu.org; Mon, 26 Jul 2010 15:40:14 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o6QJeBFg022605 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 26 Jul 2010 15:40:12 -0400 Received: from trasno.mitica (ovpn-113-23.phx2.redhat.com [10.3.113.23]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o6QJe73R016073; Mon, 26 Jul 2010 15:40:10 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 26 Jul 2010 21:38:42 +0200 Message-Id: <7fd733855ace8e2555f012acfa5f99b09ce1963d.1280172745.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH 2/6] 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,