From patchwork Tue Jun 24 06:06:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 363309 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D548D14007C for ; Tue, 24 Jun 2014 16:07:33 +1000 (EST) Received: from localhost ([::1]:57691 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzJtD-0004jA-Po for incoming@patchwork.ozlabs.org; Tue, 24 Jun 2014 02:07:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzJs5-0002ks-Og for qemu-devel@nongnu.org; Tue, 24 Jun 2014 02:06:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WzJrz-0007Sg-QE for qemu-devel@nongnu.org; Tue, 24 Jun 2014 02:06:21 -0400 Received: from mail-yh0-x22e.google.com ([2607:f8b0:4002:c01::22e]:44022) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzJrz-0007SV-MK for qemu-devel@nongnu.org; Tue, 24 Jun 2014 02:06:15 -0400 Received: by mail-yh0-f46.google.com with SMTP id c41so5804196yho.33 for ; Mon, 23 Jun 2014 23:06:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=KC9P1oensR2tc7lbx5QwxmNU9xKbRTOJqD/4EegBhA4=; b=y91XR5uL+I91joP4fsPk31tKytiizfZrsO+Dab8jXwzMnhyg/2lzkx8dMzSL62MyF5 a/E4jlfx0Nxg9l6AofQaIwW9yUqc2Z5tQzb8K2O/cEVoKB9wgCLElPHMY2U/EXtj1nnY 8MwuM4RbnVpH8qvx0eMyvyscHf5AW2x/wV185ld6lYsVi3udJEHfIutu+d4Gv3Lh4eaV BUVqPKSvP2/6C9k1PYRF9TRfevTX+kEeMAdGmRMZ9Vk5+C/1k6No/OdIeWzEILeOwF2t akrH1cVKIrx7hDKkUy+iiAOFfVfeG6Huodyz+Jk9ahNCoVaUfe8JD2ccrzw8dBF7ECSd sQKw== X-Received: by 10.236.29.7 with SMTP id h7mr9124481yha.42.1403589975259; Mon, 23 Jun 2014 23:06:15 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id w4sm9249563yhd.38.2014.06.23.23.06.12 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Mon, 23 Jun 2014 23:06:14 -0700 (PDT) From: Alistair Francis To: qemu-devel@nongnu.org Date: Tue, 24 Jun 2014 16:06:08 +1000 Message-Id: <22b9e550138022caa0368f12c12c55f1675420a5.1403588925.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 1.9.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4002:c01::22e Cc: peter.crosthwaite@xilinx.com, afaerber@suse.de, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v1 1/1] char: cadence_uart: Convert to realize() 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 SysBusDevice::init is deprecated. Convert to Object::init and Device::realize as prescribed by QOM conventions. Signed-off-by: Alistair Francis Reviewed-by: Peter Crosthwaite Reviewed-by: Peter Maydell --- hw/char/cadence_uart.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c index bf0c853..5a22a72 100644 --- a/hw/char/cadence_uart.c +++ b/hw/char/cadence_uart.c @@ -468,27 +468,30 @@ static void cadence_uart_reset(DeviceState *dev) uart_update_status(s); } -static int cadence_uart_init(SysBusDevice *dev) +static void candence_uart_realize(DeviceState *dev, Error **errp) { UartState *s = CADENCE_UART(dev); - memory_region_init_io(&s->iomem, OBJECT(s), &uart_ops, s, "uart", 0x1000); - sysbus_init_mmio(dev, &s->iomem); - sysbus_init_irq(dev, &s->irq); - - s->fifo_trigger_handle = timer_new_ns(QEMU_CLOCK_VIRTUAL, - (QEMUTimerCB *)fifo_trigger_update, s); - - s->char_tx_time = (get_ticks_per_sec() / 9600) * 10; - s->chr = qemu_char_get_next_serial(); if (s->chr) { qemu_chr_add_handlers(s->chr, uart_can_receive, uart_receive, uart_event, s); } +} - return 0; +static void cadence_uart_init(Object *obj) +{ + UartState *s = CADENCE_UART(obj); + + memory_region_init_io(&s->iomem, obj, &uart_ops, s, "uart", 0x1000); + sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->iomem); + sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq); + + s->fifo_trigger_handle = timer_new_ns(QEMU_CLOCK_VIRTUAL, + (QEMUTimerCB *)fifo_trigger_update, s); + + s->char_tx_time = (get_ticks_per_sec() / 9600) * 10; } static int cadence_uart_post_load(void *opaque, int version_id) @@ -520,9 +523,8 @@ static const VMStateDescription vmstate_cadence_uart = { static void cadence_uart_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass); - sdc->init = cadence_uart_init; + dc->realize = candence_uart_realize; dc->vmsd = &vmstate_cadence_uart; dc->reset = cadence_uart_reset; } @@ -531,6 +533,7 @@ static const TypeInfo cadence_uart_info = { .name = TYPE_CADENCE_UART, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(UartState), + .instance_init = cadence_uart_init, .class_init = cadence_uart_class_init, };