diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2020-09-07 03:55:34 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-30 19:09:20 +0200 |
| commit | b7dd40d40bfa44536bee4aa4d643b26621097d27 (patch) | |
| tree | 949ba5698d076a176de60595efdf38b85fc229ee /hw/char | |
| parent | 1fa2c0eb6c7e5a5cf714c2a9dfea7633429af76d (diff) | |
| download | qemu-b7dd40d40bfa44536bee4aa4d643b26621097d27.zip qemu-b7dd40d40bfa44536bee4aa4d643b26621097d27.tar.gz qemu-b7dd40d40bfa44536bee4aa4d643b26621097d27.tar.bz2 | |
hw/char/serial-{isa, pci}: Alias QDEV properties from generic serial object
Instead of overwritting the properties of the generic 'state'
object, alias them.
Note we can now propagate the "baudbase" property.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200907015535.827885-7-f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/char')
| -rw-r--r-- | hw/char/serial-isa.c | 4 | ||||
| -rw-r--r-- | hw/char/serial-pci.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c index fc8ff78..1b8b303 100644 --- a/hw/char/serial-isa.c +++ b/hw/char/serial-isa.c @@ -116,8 +116,6 @@ static Property serial_isa_properties[] = { DEFINE_PROP_UINT32("index", ISASerialState, index, -1), DEFINE_PROP_UINT32("iobase", ISASerialState, iobase, -1), DEFINE_PROP_UINT32("irq", ISASerialState, isairq, -1), - DEFINE_PROP_CHR("chardev", ISASerialState, state.chr), - DEFINE_PROP_BOOL("wakeup", ISASerialState, state.wakeup, false), DEFINE_PROP_END_OF_LIST(), }; @@ -138,6 +136,8 @@ static void serial_isa_initfn(Object *o) ISASerialState *self = ISA_SERIAL(o); object_initialize_child(o, "serial", &self->state, TYPE_SERIAL); + + qdev_alias_all_properties(DEVICE(&self->state), o); } static const TypeInfo serial_isa_info = { diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c index b0520a5..93d6f99 100644 --- a/hw/char/serial-pci.c +++ b/hw/char/serial-pci.c @@ -82,7 +82,6 @@ static const VMStateDescription vmstate_pci_serial = { }; static Property serial_pci_properties[] = { - DEFINE_PROP_CHR("chardev", PCISerialState, state.chr), DEFINE_PROP_UINT8("prog_if", PCISerialState, prog_if, 0x02), DEFINE_PROP_END_OF_LIST(), }; @@ -107,6 +106,8 @@ static void serial_pci_init(Object *o) PCISerialState *ps = PCI_SERIAL(o); object_initialize_child(o, "serial", &ps->state, TYPE_SERIAL); + + qdev_alias_all_properties(DEVICE(&ps->state), o); } static const TypeInfo serial_pci_info = { |