From: Peter Maydell <peter.maydell@linaro.org>
To: "Marc-André Lureau" <marcandre.lureau@redhat.com>
Cc: "Corey Minyard" <cminyard@mvista.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Jason Wang" <jasowang@redhat.com>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"QEMU Developers" <qemu-devel@nongnu.org>,
"KONRAD Frederic" <frederic.konrad@adacore.com>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
"Paul Burton" <pburton@wavecomp.com>,
"Magnus Damm" <magnus.damm@gmail.com>,
"Hervé Poussineau" <hpoussin@reactos.org>,
"Artyom Tarasenko" <atar4qemu@gmail.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Fabien Chouteau" <chouteau@adacore.com>,
qemu-arm <qemu-arm@nongnu.org>,
"Richard Henderson" <rth@twiddle.net>,
"Daniel P. Berrangé" <berrange@redhat.com>,
qemu-ppc <qemu-ppc@nongnu.org>,
"Aleksandar Markovic" <amarkovic@wavecomp.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: Re: [PATCH v3 16/33] serial-mm: use sysbus facilities
Date: Mon, 18 Nov 2019 15:09:43 +0000 [thread overview]
Message-ID: <CAFEAcA-dShnHHGEYrsmc+27aUrH7WUMn3=Pvn92B8XH=qtYFBQ@mail.gmail.com> (raw)
In-Reply-To: <20191023173154.30051-17-marcandre.lureau@redhat.com>
On Wed, 23 Oct 2019 at 18:34, Marc-André Lureau
<marcandre.lureau@redhat.com> wrote:
>
> Make SerialMM a regular sysbus device, by registering the irq, and the
> mmio region. Reexport the internal serial properties.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> hw/char/serial.c | 35 ++++++++++++++++++++++++-----------
> 1 file changed, 24 insertions(+), 11 deletions(-)
>
> diff --git a/hw/char/serial.c b/hw/char/serial.c
> index 2f7667c30c..a40bc3ab81 100644
> --- a/hw/char/serial.c
> +++ b/hw/char/serial.c
> @@ -1074,21 +1074,18 @@ SerialMM *serial_mm_init(MemoryRegion *address_space,
> Chardev *chr, enum device_endian end)
> {
> SerialMM *self = SERIAL_MM(qdev_create(NULL, TYPE_SERIAL_MM));
> - SerialState *s = &self->serial;
> + MemoryRegion *mr;
>
> qdev_prop_set_uint8(DEVICE(self), "regshift", regshift);
> - s->irq = irq;
> - qdev_prop_set_uint32(DEVICE(s), "baudbase", baudbase);
> - qdev_prop_set_chr(DEVICE(s), "chardev", chr);
> - qdev_prop_set_int32(DEVICE(s), "instance-id", base);
> - qdev_prop_set_uint8(DEVICE(s), "endianness", end);
> -
> - qdev_init_nofail(DEVICE(s));
> + qdev_prop_set_uint32(DEVICE(self), "baudbase", baudbase);
> + qdev_prop_set_chr(DEVICE(self), "chardev", chr);
> + qdev_prop_set_int32(DEVICE(self), "instance-id", base);
> + qdev_prop_set_uint8(DEVICE(self), "endianness", end);
(this last line should be in patch 15)
> qdev_init_nofail(DEVICE(self));
>
> - memory_region_init_io(&s->io, NULL, &serial_mm_ops[end], self,
> - "serial", 8 << regshift);
> - memory_region_add_subregion(address_space, base, &s->io);
> + sysbus_connect_irq(SYS_BUS_DEVICE(self), 0, irq);
> + mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(self), 0);
> + memory_region_add_subregion(address_space, base, mr);
>
> return self;
> }
> @@ -1099,6 +1096,8 @@ static void serial_mm_instance_init(Object *o)
>
> object_initialize_child(o, "serial", &self->serial, sizeof(self->serial),
> TYPE_SERIAL, &error_abort, NULL);
> +
> + qdev_alias_all_properties(DEVICE(&self->serial), o);
> }
>
> static Property serial_mm_properties[] = {
> @@ -1107,11 +1106,25 @@ static Property serial_mm_properties[] = {
> DEFINE_PROP_END_OF_LIST(),
> };
>
> +static void serial_mm_realize(DeviceState *dev, Error **errp)
> +{
> + SerialMM *self = SERIAL_MM(dev);
> + SerialState *s = &self->serial;
Again, 'self' isn't idiomatic in QOM methods.
> +
> + qdev_init_nofail(DEVICE(s));
> +
> + memory_region_init_io(&s->io, NULL, &serial_mm_ops[self->endianness], self,
> + "serial", 8 << self->regshift);
> + sysbus_init_mmio(SYS_BUS_DEVICE(self), &s->io);
> + sysbus_init_irq(SYS_BUS_DEVICE(self), &self->serial.irq);
> +}
> +
> static void serial_mm_class_init(ObjectClass *klass, void* data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
>
> dc->props = serial_mm_properties;
> + dc->realize = serial_mm_realize;
> }
>
> static const TypeInfo serial_mm_info = {
> --
> 2.23.0.606.g08da6496b6
Otherwise
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
thanks
-- PMM
next prev parent reply other threads:[~2019-11-18 15:10 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-23 17:31 [PATCH v3 00/33] Clean-ups: qom-ify serial and remove QDEV_PROP_PTR Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 01/33] qdev: remove unused qdev_prop_int64 Marc-André Lureau
2019-11-18 14:01 ` Peter Maydell
2019-11-20 3:36 ` Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 02/33] sysbus: remove unused sysbus_try_create* Marc-André Lureau
2019-10-23 22:35 ` Philippe Mathieu-Daudé
2019-11-18 14:02 ` Peter Maydell
2019-10-23 17:31 ` [PATCH v3 03/33] sysbus: remove outdated comment Marc-André Lureau
2019-10-23 22:36 ` Philippe Mathieu-Daudé
2019-10-23 17:31 ` [PATCH v3 04/33] chardev: generate an internal id when none given Marc-André Lureau
2019-11-18 14:12 ` Peter Maydell
2019-11-18 18:54 ` Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 05/33] serial-pci-multi: factor out multi_serial_get_nr_ports Marc-André Lureau
2019-10-23 22:41 ` Philippe Mathieu-Daudé
2019-10-24 9:59 ` Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 06/33] serial: initial qom-ification Marc-André Lureau
2019-10-24 8:48 ` Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 07/33] serial: register vmsd with DeviceClass Marc-André Lureau
2019-11-18 14:21 ` Peter Maydell
2019-11-19 10:22 ` Marc-André Lureau
2019-11-19 10:33 ` Peter Maydell
2019-11-19 11:57 ` Marc-André Lureau
2019-11-20 18:54 ` Dr. David Alan Gilbert
2019-11-21 6:49 ` Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 08/33] serial: add "chardev" property Marc-André Lureau
2019-10-23 22:39 ` Philippe Mathieu-Daudé
2019-11-18 14:23 ` Peter Maydell
2019-10-23 17:31 ` [PATCH v3 09/33] serial: add "baudbase" property Marc-André Lureau
2019-10-23 22:40 ` Philippe Mathieu-Daudé
2019-11-18 14:26 ` Peter Maydell
2019-10-23 17:31 ` [PATCH v3 10/33] serial: add "instance-id" property Marc-André Lureau
2019-11-18 14:29 ` Peter Maydell
2019-11-19 10:32 ` Marc-André Lureau
2019-11-20 9:06 ` Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 11/33] serial: realize the serial device Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 12/33] serial: replace serial_exit_core() with unrealize Marc-André Lureau
2019-11-18 14:32 ` Peter Maydell
2019-11-20 12:32 ` Philippe Mathieu-Daudé
2019-10-23 17:31 ` [PATCH v3 13/33] serial: start making SerialMM a sysbus device Marc-André Lureau
2019-11-18 14:43 ` Peter Maydell
2019-11-20 7:34 ` Marc-André Lureau
2019-11-20 10:36 ` Peter Maydell
2019-11-20 10:40 ` Marc-André Lureau
2019-11-20 10:58 ` Peter Maydell
2019-11-20 11:03 ` Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 14/33] serial-mm: add "regshift" property Marc-André Lureau
2019-11-18 14:54 ` Peter Maydell
2019-11-20 7:53 ` Marc-André Lureau
2019-11-20 10:43 ` Peter Maydell
2019-10-23 17:31 ` [PATCH v3 15/33] serial-mm: add endianness property Marc-André Lureau
2019-11-18 15:02 ` Peter Maydell
2019-11-18 15:07 ` Peter Maydell
2019-11-20 7:59 ` Marc-André Lureau
2019-11-20 12:57 ` Philippe Mathieu-Daudé
2019-10-23 17:31 ` [PATCH v3 16/33] serial-mm: use sysbus facilities Marc-André Lureau
2019-11-18 15:09 ` Peter Maydell [this message]
2019-11-20 8:30 ` Marc-André Lureau
2019-11-20 10:46 ` Peter Maydell
2019-10-23 17:31 ` [PATCH v3 17/33] serial: make SerialIO a sysbus device Marc-André Lureau
2019-11-18 15:16 ` Peter Maydell
2019-11-20 8:41 ` Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 18/33] mips: inline serial_init Marc-André Lureau
2019-11-18 15:24 ` Peter Maydell
2019-11-20 11:14 ` Marc-André Lureau
2019-11-20 0:07 ` Aleksandar Markovic
2019-10-23 17:31 ` [PATCH v3 19/33] sm501: make SerialMM a child, export chardev property Marc-André Lureau
2019-10-23 22:57 ` Philippe Mathieu-Daudé
2019-10-24 10:28 ` Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 20/33] vmmouse: replace PROP_PTR with PROP_LINK Marc-André Lureau
2019-10-23 22:59 ` Philippe Mathieu-Daudé
2019-10-23 17:31 ` [PATCH v3 21/33] lance: " Marc-André Lureau
2019-10-23 23:00 ` Philippe Mathieu-Daudé
2019-10-24 11:09 ` Marc-André Lureau
2019-10-24 11:47 ` Philippe Mathieu-Daudé
2019-10-24 11:52 ` Peter Maydell
2019-10-24 18:07 ` Eduardo Habkost
2019-10-25 7:31 ` Peter Maydell
2019-10-24 12:25 ` Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 22/33] etraxfs: remove PROP_PTR usage Marc-André Lureau
2019-11-18 15:28 ` Peter Maydell
2019-10-23 17:31 ` [PATCH v3 23/33] dp8393x: replace PROP_PTR with PROP_LINK Marc-André Lureau
2019-10-23 23:02 ` Philippe Mathieu-Daudé
2019-10-24 11:12 ` Marc-André Lureau
2019-10-24 11:48 ` Philippe Mathieu-Daudé
2019-10-23 17:31 ` [PATCH v3 24/33] leon3: use qemu_irq framework instead of callback as property Marc-André Lureau
2019-11-18 14:15 ` KONRAD Frederic
2019-11-18 15:34 ` Peter Maydell
2019-10-23 17:31 ` [PATCH v3 25/33] sparc: move PIL irq handling to cpu.c Marc-André Lureau
2019-11-18 15:38 ` Peter Maydell
2019-10-23 17:31 ` [PATCH v3 26/33] RFC: mips/cps: fix setting saar property Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 27/33] cris: improve passing PIC interrupt vector to the CPU Marc-André Lureau
2019-11-18 15:40 ` Peter Maydell
2019-10-23 17:31 ` [PATCH v3 28/33] smbus-eeprom: remove PROP_PTR Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 29/33] omap-intc: " Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 30/33] omap-i2c: " Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 31/33] omap-gpio: " Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 32/33] qdev: remove PROP_MEMORY_REGION Marc-André Lureau
2019-10-23 23:07 ` Philippe Mathieu-Daudé
2019-10-23 17:31 ` [PATCH v3 33/33] qdev: remove QDEV_PROP_PTR Marc-André Lureau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAFEAcA-dShnHHGEYrsmc+27aUrH7WUMn3=Pvn92B8XH=qtYFBQ@mail.gmail.com' \
--to=peter.maydell@linaro.org \
--cc=amarkovic@wavecomp.com \
--cc=atar4qemu@gmail.com \
--cc=aurelien@aurel32.net \
--cc=berrange@redhat.com \
--cc=chouteau@adacore.com \
--cc=cminyard@mvista.com \
--cc=edgar.iglesias@gmail.com \
--cc=ehabkost@redhat.com \
--cc=frederic.konrad@adacore.com \
--cc=hpoussin@reactos.org \
--cc=jasowang@redhat.com \
--cc=magnus.damm@gmail.com \
--cc=marcandre.lureau@redhat.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=pburton@wavecomp.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).