From patchwork Sun Mar 6 15:09:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 85580 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 D6870B70EA for ; Mon, 7 Mar 2011 02:11:07 +1100 (EST) Received: from localhost ([127.0.0.1]:40525 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PwFbs-0000tr-2b for incoming@patchwork.ozlabs.org; Sun, 06 Mar 2011 10:11:04 -0500 Received: from [140.186.70.92] (port=37182 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PwFak-0000t5-Me for qemu-devel@nongnu.org; Sun, 06 Mar 2011 10:09:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PwFaj-0002fH-Ax for qemu-devel@nongnu.org; Sun, 06 Mar 2011 10:09:54 -0500 Received: from fmmailgate02.web.de ([217.72.192.227]:48285) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PwFaj-0002dV-0x for qemu-devel@nongnu.org; Sun, 06 Mar 2011 10:09:53 -0500 Received: from smtp05.web.de ( [172.20.4.166]) by fmmailgate02.web.de (Postfix) with ESMTP id 3312819A1C962; Sun, 6 Mar 2011 16:09:51 +0100 (CET) Received: from [92.74.54.57] (helo=mchn199C.mchp.siemens.de) by smtp05.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1PwFah-0007EX-00; Sun, 06 Mar 2011 16:09:51 +0100 Message-ID: <4D73A3BD.2000405@web.de> Date: Sun, 06 Mar 2011 16:09:49 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: qemu-devel , Blue Swirl X-Enigmail-Version: 1.1.2 X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1/ddyNzrWDkkCWliuEbrCTnChzybyuLeQLjYCKg 3t7cwNP5R6gghfZWo+FEYNFScwU6UwXAaz2bO8PBTKc2/UU1Pb XrfAhseJY= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.227 Cc: Subject: [Qemu-devel] [PATCH] i8254: Fix migration from older versions 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 From: Jan Kiszka qdev conversion broke migration as the previous version used vmstate instance IDs derived from the iobase. Fix it by registering a legacy alias. Signed-off-by: Jan Kiszka --- hw/i8254.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/i8254.c b/hw/i8254.c index eaf5d3e..47c9d73 100644 --- a/hw/i8254.c +++ b/hw/i8254.c @@ -520,6 +520,8 @@ static int pit_initfn(ISADevice *dev) register_ioport_read(pit->iobase, 3, 1, pit_ioport_read, pit); isa_init_ioport(dev, pit->iobase); + qdev_set_legacy_instance_id(&dev->qdev, pit->iobase, 2); + return 0; }