[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 2/2] hw/char/serial: Remove TYPE_SERIAL_IO (superset of TYPE_S
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 2/2] hw/char/serial: Remove TYPE_SERIAL_IO (superset of TYPE_SERIAL_MM) |
Date: |
Sat, 12 Sep 2020 10:29:44 +0200 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
TYPE_SERIAL_IO is a superset of TYPE_SERIAL_MM, and it is
not used anymore. Remove it.
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/char/serial.c | 41 -----------------------------------------
1 file changed, 41 deletions(-)
diff --git a/hw/char/serial.c b/hw/char/serial.c
index 23864794929..fd80ae55929 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -985,46 +985,6 @@ const MemoryRegionOps serial_io_ops = {
.endianness = DEVICE_LITTLE_ENDIAN,
};
-static void serial_io_realize(DeviceState *dev, Error **errp)
-{
- SerialIO *sio = SERIAL_IO(dev);
- SerialState *s = &sio->serial;
-
- if (!qdev_realize(DEVICE(s), NULL, errp)) {
- return;
- }
-
- memory_region_init_io(&s->io, OBJECT(dev), &serial_io_ops, s, "serial", 8);
- sysbus_init_mmio(SYS_BUS_DEVICE(sio), &s->io);
- sysbus_init_irq(SYS_BUS_DEVICE(sio), &s->irq);
-}
-
-static void serial_io_class_init(ObjectClass *klass, void* data)
-{
- DeviceClass *dc = DEVICE_CLASS(klass);
-
- dc->realize = serial_io_realize;
- /* No dc->vmsd: class has no migratable state */
-}
-
-static void serial_io_instance_init(Object *o)
-{
- SerialIO *sio = SERIAL_IO(o);
-
- object_initialize_child(o, "serial", &sio->serial, TYPE_SERIAL);
-
- qdev_alias_all_properties(DEVICE(&sio->serial), o);
-}
-
-
-static const TypeInfo serial_io_info = {
- .name = TYPE_SERIAL_IO,
- .parent = TYPE_SYS_BUS_DEVICE,
- .instance_size = sizeof(SerialIO),
- .instance_init = serial_io_instance_init,
- .class_init = serial_io_class_init,
-};
-
static Property serial_properties[] = {
DEFINE_PROP_CHR("chardev", SerialState, chr),
DEFINE_PROP_UINT32("baudbase", SerialState, baudbase, 115200),
@@ -1178,7 +1138,6 @@ static const TypeInfo serial_mm_info = {
static void serial_register_types(void)
{
type_register_static(&serial_info);
- type_register_static(&serial_io_info);
type_register_static(&serial_mm_info);
}
--
2.26.2