From patchwork Tue Dec 15 13:34:35 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 41188 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 A1B94B6F14 for ; Wed, 16 Dec 2009 00:40:35 +1100 (EST) Received: from localhost ([127.0.0.1]:36979 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKXdg-00089e-NB for incoming@patchwork.ozlabs.org; Tue, 15 Dec 2009 08:40:32 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NKXZ3-0005al-0F for qemu-devel@nongnu.org; Tue, 15 Dec 2009 08:35:45 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NKXYw-0005Rh-UU for qemu-devel@nongnu.org; Tue, 15 Dec 2009 08:35:43 -0500 Received: from [199.232.76.173] (port=51846 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKXYw-0005RR-Oc for qemu-devel@nongnu.org; Tue, 15 Dec 2009 08:35:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:64242) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NKXYw-0004no-Cy for qemu-devel@nongnu.org; Tue, 15 Dec 2009 08:35:38 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBFDZbq1002925 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 15 Dec 2009 08:35:37 -0500 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBFDZVfK031630; Tue, 15 Dec 2009 08:35:36 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 15 Dec 2009 14:34:35 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 2/2] fdc: fix migration from 0.11 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 0.11 uses as instance ide io_base, get it back Signed-off-by: Juan Quintela --- hw/fdc.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index 1352dc4..0579b03 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1907,7 +1907,7 @@ fdctrl_t *sun4m_fdctrl_init (qemu_irq irq, target_phys_addr_t io_base, return fdctrl; } -static int fdctrl_init_common(fdctrl_t *fdctrl) +static int fdctrl_init_common(fdctrl_t *fdctrl, target_phys_addr_t io_base) { int i, j; static int command_tables_inited = 0; @@ -1938,6 +1938,7 @@ static int fdctrl_init_common(fdctrl_t *fdctrl) DMA_register_channel(fdctrl->dma_chann, &fdctrl_transfer_handler, fdctrl); fdctrl_connect_drives(fdctrl); + vmstate_register(io_base, &vmstate_fdc, fdctrl); return 0; } @@ -1961,7 +1962,7 @@ static int isabus_fdc_init1(ISADevice *dev) isa_init_irq(&isa->busdev, &fdctrl->irq, isairq); fdctrl->dma_chann = dma_chann; - ret = fdctrl_init_common(fdctrl); + ret = fdctrl_init_common(fdctrl, iobase); return ret; } @@ -1979,7 +1980,7 @@ static int sysbus_fdc_init1(SysBusDevice *dev) qdev_init_gpio_in(&dev->qdev, fdctrl_handle_tc, 1); fdctrl->dma_chann = -1; - ret = fdctrl_init_common(fdctrl); + ret = fdctrl_init_common(fdctrl, io); return ret; } @@ -1996,7 +1997,7 @@ static int sun4m_fdc_init1(SysBusDevice *dev) qdev_init_gpio_in(&dev->qdev, fdctrl_handle_tc, 1); fdctrl->sun4m = 1; - return fdctrl_init_common(fdctrl); + return fdctrl_init_common(fdctrl, io); } static ISADeviceInfo isa_fdc_info = { @@ -2004,7 +2005,6 @@ static ISADeviceInfo isa_fdc_info = { .qdev.name = "isa-fdc", .qdev.size = sizeof(fdctrl_isabus_t), .qdev.no_user = 1, - .qdev.vmsd = &vmstate_fdc, .qdev.reset = fdctrl_external_reset_isa, .qdev.props = (Property[]) { DEFINE_PROP_DRIVE("driveA", fdctrl_isabus_t, state.drives[0].dinfo), @@ -2017,7 +2017,6 @@ static SysBusDeviceInfo sysbus_fdc_info = { .init = sysbus_fdc_init1, .qdev.name = "sysbus-fdc", .qdev.size = sizeof(fdctrl_sysbus_t), - .qdev.vmsd = &vmstate_fdc, .qdev.reset = fdctrl_external_reset_sysbus, .qdev.props = (Property[]) { DEFINE_PROP_DRIVE("driveA", fdctrl_sysbus_t, state.drives[0].dinfo), @@ -2030,7 +2029,6 @@ static SysBusDeviceInfo sun4m_fdc_info = { .init = sun4m_fdc_init1, .qdev.name = "SUNW,fdtwo", .qdev.size = sizeof(fdctrl_sysbus_t), - .qdev.vmsd = &vmstate_fdc, .qdev.reset = fdctrl_external_reset_sysbus, .qdev.props = (Property[]) { DEFINE_PROP_DRIVE("drive", fdctrl_sysbus_t, state.drives[0].dinfo),