[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/92] hw/char/serial: Remove TYPE_SERIAL_IO
From: |
Paolo Bonzini |
Subject: |
[PULL 17/92] hw/char/serial: Remove TYPE_SERIAL_IO |
Date: |
Thu, 24 Sep 2020 05:21:59 -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 | 9 ---------
2 files changed, 50 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 db4f9af18c..23bd7d3dde 100644
--- a/include/hw/char/serial.h
+++ b/include/hw/char/serial.h
@@ -90,12 +90,6 @@ struct SerialMM {
uint8_t endianness;
};
-struct SerialIO {
- SysBusDevice parent;
-
- SerialState serial;
-};
-
extern const VMStateDescription vmstate_serial;
extern const MemoryRegionOps serial_io_ops;
@@ -107,9 +101,6 @@ OBJECT_DECLARE_SIMPLE_TYPE(SerialState, SERIAL)
#define TYPE_SERIAL_MM "serial-mm"
OBJECT_DECLARE_SIMPLE_TYPE(SerialMM, SERIAL_MM)
-#define TYPE_SERIAL_IO "serial-io"
-OBJECT_DECLARE_SIMPLE_TYPE(SerialIO, SERIAL_IO)
-
SerialMM *serial_mm_init(MemoryRegion *address_space,
hwaddr base, int regshift,
qemu_irq irq, int baudbase,
--
2.26.2
- [PULL 07/92] configure: Do not intent to build WHPX on 32-bit host, (continued)
- [PULL 07/92] configure: Do not intent to build WHPX on 32-bit host, Paolo Bonzini, 2020/09/24
- [PULL 06/92] WHPX: vmware cpuid leaf for tsc and apic frequency, Paolo Bonzini, 2020/09/24
- [PULL 08/92] MAINTAINERS: add Paolo Bonzini as RCU maintainer, Paolo Bonzini, 2020/09/24
- [PULL 09/92] target/i386: support KVM_FEATURE_ASYNC_PF_INT, Paolo Bonzini, 2020/09/24
- [PULL 10/92] memory: Convert IOMMUMemoryRegionClass doc comment to kernel-doc, Paolo Bonzini, 2020/09/24
- [PULL 15/92] numa: remove fixup numa_state->num_nodes to MAX_NODES, Paolo Bonzini, 2020/09/24
- [PULL 12/92] acpi: i386: Move VMBus DSDT entry to SB, Paolo Bonzini, 2020/09/24
- [PULL 11/92] vhost-scsi: support inflight io track, Paolo Bonzini, 2020/09/24
- [PULL 14/92] doc: Cleanup "'-mem-path' fallback to RAM" deprecation text, Paolo Bonzini, 2020/09/24
- [PULL 13/92] numa: drop support for '-numa node' (without memory specified), Paolo Bonzini, 2020/09/24
- [PULL 17/92] hw/char/serial: Remove TYPE_SERIAL_IO,
Paolo Bonzini <=
- [PULL 16/92] hw/mips/mipssim: Use MMIO serial device on fake ISA I/O, Paolo Bonzini, 2020/09/24
- [PULL 20/92] hw/char/serial: Replace commented DPRINTF() by trace event, Paolo Bonzini, 2020/09/24
- [PULL 19/92] hw/char/serial: Assert serial_ioport_read/write offset fits 8 bytes, Paolo Bonzini, 2020/09/24
- [PULL 28/92] i386/cpu: Clear FEAT_XSAVE_COMP_{LO, HI} when XSAVE is not available, Paolo Bonzini, 2020/09/24
- [PULL 23/92] hw/char/serial: Make 'wakeup' property boolean, Paolo Bonzini, 2020/09/24
- [PULL 21/92] hw/char/serial: Remove old DEBUG_SERIAL commented code, Paolo Bonzini, 2020/09/24
- [PULL 25/92] scsi-generic: Fix HM-zoned device scan, Paolo Bonzini, 2020/09/24
- [PULL 27/92] hw: megasas: consider 'iov_count=0' is an error in megasas_map_sgl, Paolo Bonzini, 2020/09/24
- [PULL 18/92] configure: rename QEMU_GA_MSI_ENABLED to CONFIG_QGA_MSI, Paolo Bonzini, 2020/09/24
- [PULL 29/92] meson: move libudev test, Paolo Bonzini, 2020/09/24