From patchwork Sat Aug 31 05:33:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antony Pavlov X-Patchwork-Id: 271511 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E35762C008E for ; Sat, 31 Aug 2013 15:37:55 +1000 (EST) Received: from localhost ([::1]:53376 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFdsf-000650-UJ for incoming@patchwork.ozlabs.org; Sat, 31 Aug 2013 01:37:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55563) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFdrZ-0004Y5-8E for qemu-devel@nongnu.org; Sat, 31 Aug 2013 01:36:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VFdrU-0007YG-CZ for qemu-devel@nongnu.org; Sat, 31 Aug 2013 01:36:45 -0400 Received: from mail-la0-x22b.google.com ([2a00:1450:4010:c03::22b]:40150) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFdrU-0007Y8-4H for qemu-devel@nongnu.org; Sat, 31 Aug 2013 01:36:40 -0400 Received: by mail-la0-f43.google.com with SMTP id ep20so2201800lab.30 for ; Fri, 30 Aug 2013 22:36:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TP4XbxiMSBh+gG/LxOPNtCe4TFwbACVber08thGBYhI=; b=IxE8CNpplt3A+8r8kzpJd/6giJaDRLTAaRUG+v55EE/PvjTT+aSb9Dz7wTjZESDela GTdzQG1Fr7NJfwG8zTgVon7k1VFmwICkX0jUWjBQkx5X9pqVlycc0diGzP0tR/qvHTYU 5pwo6kdvO4qcR90RXzSTJkFSoNdRCFfyccK/OLFHHqlAEfeO42hewcgZxchXEeoBKhPK ldBGZaSQbD1wCEY1d7HdAqaBsCjP3Oo1qVOxepkxVrjFnuAWbSdwkmBI+HoXt56hsEYl M5rLLeFNb1hibR4SdZJUdBzactv4wC2Sn9EzRh9OnRVtfqSORbKJYcxmBV79eF1jI6im eVbA== X-Received: by 10.152.3.42 with SMTP id 10mr11210746laz.22.1377927399027; Fri, 30 Aug 2013 22:36:39 -0700 (PDT) Received: from localhost.localdomain ([83.149.8.218]) by mx.google.com with ESMTPSA id ap7sm618910lac.10.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 30 Aug 2013 22:36:38 -0700 (PDT) From: Antony Pavlov To: qemu-devel@nongnu.org Date: Sat, 31 Aug 2013 09:33:57 +0400 Message-Id: <1377927237-6092-3-git-send-email-antonynpavlov@gmail.com> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1377927237-6092-1-git-send-email-antonynpavlov@gmail.com> References: <1377927237-6092-1-git-send-email-antonynpavlov@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::22b Cc: Paolo Bonzini , Anthony Liguori , Michael Walle , Peter Crosthwaite , Antony Pavlov Subject: [Qemu-devel] [PATCH 2/2] milkymist-uart: use Device::realize instead of SysBusDevice::init X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Use of SysBusDevice::init is deprecated. Please use Device::realize instead of SysBusDevice::init. Check dma/pl330.c for an example of the pattern. Signed-off-by: Antony Pavlov CC: Peter Crosthwaite CC: Michael Walle Reported-by: Peter Crosthwaite --- hw/char/milkymist-uart.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c index 6e4bc20..66fba82 100644 --- a/hw/char/milkymist-uart.c +++ b/hw/char/milkymist-uart.c @@ -195,22 +195,20 @@ static void milkymist_uart_reset(DeviceState *d) s->regs[R_STAT] = STAT_THRE; } -static int milkymist_uart_init(SysBusDevice *dev) +static void milkymist_uart_realize(DeviceState *dev, Error **errp) { MilkymistUartState *s = MILKYMIST_UART(dev); - sysbus_init_irq(dev, &s->irq); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq); memory_region_init_io(&s->regs_region, OBJECT(s), &uart_mmio_ops, s, "milkymist-uart", R_MAX * 4); - sysbus_init_mmio(dev, &s->regs_region); + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->regs_region); s->chr = qemu_char_get_next_serial(); if (s->chr) { qemu_chr_add_handlers(s->chr, uart_can_rx, uart_rx, uart_event, s); } - - return 0; } static const VMStateDescription vmstate_milkymist_uart = { @@ -227,9 +225,8 @@ static const VMStateDescription vmstate_milkymist_uart = { static void milkymist_uart_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = milkymist_uart_init; + dc->realize = milkymist_uart_realize; dc->reset = milkymist_uart_reset; dc->vmsd = &vmstate_milkymist_uart; }