From nobody Tue Feb 10 09:58:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571762514; cv=none; d=zoho.com; s=zohoarc; b=S4RxQTXmT+fXADZexw+E0aoRWGo1IA1DFibvG9XBmC0j3OJHLSdoOi6P9ek5PqqzPocfuxucOIq/4/yFq/UcDRR1lPGINKJX2uGbXdCuxAUhyWsdHPPzvAYu+0TIsvPlQrNLMscr5T8bpnD0qLgBg6NDKmqMvcqMy/7XqgoUWlU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571762514; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vNKikGBgZ6nGFsKZ9PDarJpXzXz/Um+xb2CYFyOHYus=; b=ePd8oSs6/ELqnptai5kOkcOrE+s2tJnopgPtEMZz8I8m+T2oedCJH4qUd1vNGOn10r8CY/owzaNS7nUWQZ+fowCVd1gxKHTSkbNfQBocUdGfcgGzfhFvaphXbMhHShOFOwwtf8jfty6cGMjlMK11eTLBe7pCkAyqUq/ERVih2JE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571762514474338.2564581294921; Tue, 22 Oct 2019 09:41:54 -0700 (PDT) Received: from localhost ([::1]:35956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMxED-0003rJ-LG for importer@patchew.org; Tue, 22 Oct 2019 12:41:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38421) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMwwb-0007m9-Nk for qemu-devel@nongnu.org; Tue, 22 Oct 2019 12:23:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMwwa-0007YF-GU for qemu-devel@nongnu.org; Tue, 22 Oct 2019 12:23:37 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:58832 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iMwwa-0007Y3-DG for qemu-devel@nongnu.org; Tue, 22 Oct 2019 12:23:36 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-113-suFCn2pGO-CQY2f-WQbbYA-1; Tue, 22 Oct 2019 12:23:29 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 73E57107AD31; Tue, 22 Oct 2019 16:23:25 +0000 (UTC) Received: from localhost (ovpn-112-21.ams2.redhat.com [10.36.112.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6FC3B10027B8; Tue, 22 Oct 2019 16:23:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571761416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vNKikGBgZ6nGFsKZ9PDarJpXzXz/Um+xb2CYFyOHYus=; b=Ok9Vj4L4orzwv2MjqprDP5zeFnqTmTrED0337ubI7+xE8+e/GFpxgC8vUIWQ8Mtyi9QAeL 1kJ/t4F9nx8plQMXaXZ+qcDuxG/6fowN4GZnLRA6y/EHO5RBsdy76AciS/Y6Io9FCDE63g tJNCnuYn/4sJ+iuMX05ZoJfFUD9jlYE= From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH v2 14/28] sm501: embed the serial device Date: Tue, 22 Oct 2019 18:21:23 +0200 Message-Id: <20191022162137.27161-15-marcandre.lureau@redhat.com> In-Reply-To: <20191022162137.27161-1-marcandre.lureau@redhat.com> References: <20191022162137.27161-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: suFCn2pGO-CQY2f-WQbbYA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Corey Minyard , Peter Maydell , "Michael S. Tsirkin" , Jason Wang , Mark Cave-Ayland , KONRAD Frederic , "Edgar E. Iglesias" , Aleksandar Rikalo , Magnus Damm , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Artyom Tarasenko , Eduardo Habkost , Fabien Chouteau , qemu-arm@nongnu.org, Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-ppc@nongnu.org, Aleksandar Markovic , Paolo Bonzini , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Embedding the serial device allows to expose a property for the associated chardev backend. Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/display/sm501.c | 27 ++++++++++++++++++--------- hw/sh4/r2d.c | 2 +- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 1f33c87e65..a17ff82db8 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -1930,7 +1930,7 @@ typedef struct { SM501State state; uint32_t vram_size; uint32_t base; - void *chr_state; + SerialMMState serial; } SM501SysBusState; =20 static void sm501_realize_sysbus(DeviceState *dev, Error **errp) @@ -1958,17 +1958,20 @@ static void sm501_realize_sysbus(DeviceState *dev, = Error **errp) sysbus_pass_irq(sbd, SYS_BUS_DEVICE(usb_dev)); =20 /* bridge to serial emulation module */ - if (s->chr_state) { - serial_mm_init(&s->state.mmio_region, SM501_UART0, 2, - NULL, /* TODO : chain irq to IRL */ - 115200, s->chr_state, DEVICE_LITTLE_ENDIAN); + if (qemu_chr_fe_backend_connected(&SERIAL(&s->serial)->chr)) { + qdev_prop_set_uint64(DEVICE(&s->serial), "base", SM501_UART0); + qdev_prop_set_uint8(DEVICE(&s->serial), "regshift", 2); + qdev_init_nofail(DEVICE(&s->serial)); + serial_mm_connect(&s->serial, DEVICE_LITTLE_ENDIAN, + &s->state.mmio_region, + NULL /* TODO : chain irq to IRL */); } } =20 static Property sm501_sysbus_properties[] =3D { DEFINE_PROP_UINT32("vram-size", SM501SysBusState, vram_size, 0), DEFINE_PROP_UINT32("base", SM501SysBusState, base, 0), - DEFINE_PROP_PTR("chr-state", SM501SysBusState, chr_state), + DEFINE_PROP_CHR("chardev", SM501SysBusState, serial.parent.chr), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -1999,15 +2002,21 @@ static void sm501_sysbus_class_init(ObjectClass *kl= ass, void *data) dc->props =3D sm501_sysbus_properties; dc->reset =3D sm501_reset_sysbus; dc->vmsd =3D &vmstate_sm501_sysbus; - /* Note: pointer property "chr-state" may remain null, thus - * no need for dc->user_creatable =3D false; - */ +} + +static void sm501_sysbus_init(Object *o) +{ + SM501SysBusState *self =3D SYSBUS_SM501(o); + + object_initialize_child(o, "serial", &self->serial, sizeof(self->seria= l), + TYPE_SERIAL_MM, &error_abort, NULL); } =20 static const TypeInfo sm501_sysbus_info =3D { .name =3D TYPE_SYSBUS_SM501, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(SM501SysBusState), + .instance_init =3D sm501_sysbus_init, .class_init =3D sm501_sysbus_class_init, }; =20 diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index ee0840f380..72bb5285cc 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -272,7 +272,7 @@ static void r2d_init(MachineState *machine) busdev =3D SYS_BUS_DEVICE(dev); qdev_prop_set_uint32(dev, "vram-size", SM501_VRAM_SIZE); qdev_prop_set_uint32(dev, "base", 0x10000000); - qdev_prop_set_ptr(dev, "chr-state", serial_hd(2)); + qdev_prop_set_chr(dev, "chardev", serial_hd(2)); qdev_init_nofail(dev); sysbus_mmio_map(busdev, 0, 0x10000000); sysbus_mmio_map(busdev, 1, 0x13e00000); --=20 2.23.0.606.g08da6496b6