[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/57] hw/char/serial: Remove TYPE_SERIAL_IO
From: |
Paolo Bonzini |
Subject: |
[PULL 19/57] hw/char/serial: Remove TYPE_SERIAL_IO |
Date: |
Sat, 19 Sep 2020 11:58:38 -0400 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
TYPE_SERIAL_IO is a subset 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>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200907011538.818996-3-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/char/serial.c | 41 ----------------------------------------
include/hw/char/serial.h | 11 -----------
2 files changed, 52 deletions(-)
diff --git a/hw/char/serial.c b/hw/char/serial.c
index 2386479492..fd80ae5592 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);
}
diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h
index 264f529a7f..51397a8a18 100644
--- a/include/hw/char/serial.h
+++ b/include/hw/char/serial.h
@@ -91,13 +91,6 @@ struct SerialMM {
};
typedef struct SerialMM SerialMM;
-struct SerialIO {
- SysBusDevice parent;
-
- SerialState serial;
-};
-typedef struct SerialIO SerialIO;
-
extern const VMStateDescription vmstate_serial;
extern const MemoryRegionOps serial_io_ops;
@@ -111,10 +104,6 @@ DECLARE_INSTANCE_CHECKER(SerialState, SERIAL,
DECLARE_INSTANCE_CHECKER(SerialMM, SERIAL_MM,
TYPE_SERIAL_MM)
-#define TYPE_SERIAL_IO "serial-io"
-DECLARE_INSTANCE_CHECKER(SerialIO, SERIAL_IO,
- TYPE_SERIAL_IO)
-
SerialMM *serial_mm_init(MemoryRegion *address_space,
hwaddr base, int regshift,
qemu_irq irq, int baudbase,
--
2.26.2
- [PULL 08/57] configure: Do not intent to build WHPX on 32-bit host, (continued)
- [PULL 08/57] configure: Do not intent to build WHPX on 32-bit host, Paolo Bonzini, 2020/09/19
- [PULL 09/57] MAINTAINERS: add Paolo Bonzini as RCU maintainer, Paolo Bonzini, 2020/09/19
- [PULL 16/57] doc: Cleanup "'-mem-path' fallback to RAM" deprecation text, Paolo Bonzini, 2020/09/19
- [PULL 12/57] vhost-scsi: support inflight io track, Paolo Bonzini, 2020/09/19
- [PULL 10/57] target/i386: support KVM_FEATURE_ASYNC_PF_INT, Paolo Bonzini, 2020/09/19
- [PULL 11/57] memory: Convert IOMMUMemoryRegionClass doc comment to kernel-doc, Paolo Bonzini, 2020/09/19
- [PULL 17/57] numa: remove fixup numa_state->num_nodes to MAX_NODES, Paolo Bonzini, 2020/09/19
- [PULL 23/57] hw/char/serial: Remove old DEBUG_SERIAL commented code, Paolo Bonzini, 2020/09/19
- [PULL 24/57] hw/char/serial: Rename I/O read/write trace events, Paolo Bonzini, 2020/09/19
- [PULL 28/57] hw: megasas: return -1 when 'megasas_map_sgl' fails, Paolo Bonzini, 2020/09/19
- [PULL 19/57] hw/char/serial: Remove TYPE_SERIAL_IO,
Paolo Bonzini <=
- [PULL 14/57] acpi: i386: Move VMBus DSDT entry to SB, Paolo Bonzini, 2020/09/19
- [PULL 13/57] Simplify the .gitignore file, Paolo Bonzini, 2020/09/19
- [PULL 15/57] numa: drop support for '-numa node' (without memory specified), Paolo Bonzini, 2020/09/19
- [PULL 26/57] hw/char/serial-{isa, pci}: Alias QDEV properties from generic serial object, Paolo Bonzini, 2020/09/19
- [PULL 29/57] hw: megasas: consider 'iov_count=0' is an error in megasas_map_sgl, Paolo Bonzini, 2020/09/19
- [PULL 31/57] meson: move libudev test, Paolo Bonzini, 2020/09/19
- [PULL 45/57] oslib-posix: relocate path to /var, Paolo Bonzini, 2020/09/19
- [PULL 21/57] hw/char/serial: Assert serial_ioport_read/write offset fits 8 bytes, Paolo Bonzini, 2020/09/19
- [PULL 32/57] meson: move libmpathpersist test, Paolo Bonzini, 2020/09/19
- [PULL 47/57] net: relocate paths to helpers and scripts, Paolo Bonzini, 2020/09/19