From patchwork Sat May 15 11:32:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 52710 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 10868B7E00 for ; Sat, 15 May 2010 21:40:57 +1000 (EST) Received: from localhost ([127.0.0.1]:33330 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ODFji-0007JK-3J for incoming@patchwork.ozlabs.org; Sat, 15 May 2010 07:40:54 -0400 Received: from [140.186.70.92] (port=56669 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ODFc3-0002xG-MM for qemu-devel@nongnu.org; Sat, 15 May 2010 07:33:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1ODFbv-0003oe-6U for qemu-devel@nongnu.org; Sat, 15 May 2010 07:32:59 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:58610) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1ODFbu-0003oN-TG for qemu-devel@nongnu.org; Sat, 15 May 2010 07:32:51 -0400 Received: from smtp06.web.de ( [172.20.5.172]) by fmmailgate02.web.de (Postfix) with ESMTP id 562EA160BCB2A; Sat, 15 May 2010 13:32:50 +0200 (CEST) Received: from [88.64.22.236] (helo=localhost.localdomain) by smtp06.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #4) id 1ODFbu-0005YN-00; Sat, 15 May 2010 13:32:50 +0200 From: Jan Kiszka To: qemu-devel@nongnu.org Date: Sat, 15 May 2010 13:32:43 +0200 Message-Id: <53b0e99e5fb1872b0a96253eefb519dd0905081a.1273923157.git.jan.kiszka@web.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: References: In-Reply-To: References: X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1/znPwIbSQ98TW2DajTJvEe/UaVtenvvWXCrcme pqw95S4K5lmt1HpapYXcaYKFLq4Nf0w32WeR6JnBX0TBkWhJEg bknRTYt2U= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: Blue Swirl , Jan Kiszka , Juan Quintela Subject: [Qemu-devel] [PATCH v2 6/6] mc146818rtc: Register vmstate via qdev 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 After defining the required alias ID, we can push vmstate registration of mc146818rtc to qdev. Signed-off-by: Jan Kiszka --- hw/mc146818rtc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index 89a423e..905e670 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -609,7 +609,7 @@ static int rtc_initfn(ISADevice *dev) register_ioport_write(base, 2, 1, cmos_ioport_write, s); register_ioport_read(base, 2, 1, cmos_ioport_read, s); - vmstate_register(base, &vmstate_rtc, s); + qdev_set_legacy_instance_id(&dev->qdev, base, 2); qemu_register_reset(rtc_reset, s); return 0; } @@ -628,6 +628,7 @@ static ISADeviceInfo mc146818rtc_info = { .qdev.name = "mc146818rtc", .qdev.size = sizeof(RTCState), .qdev.no_user = 1, + .qdev.vmsd = &vmstate_rtc, .init = rtc_initfn, .qdev.props = (Property[]) { DEFINE_PROP_INT32("base_year", RTCState, base_year, 1980),