[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH RFC for-2.3? 4/8] pc87312: Create UARTs in-place and a
From: |
Andreas Färber |
Subject: |
[Qemu-ppc] [PATCH RFC for-2.3? 4/8] pc87312: Create UARTs in-place and add alias properties |
Date: |
Sun, 29 Mar 2015 19:53:19 +0200 |
Move serial_hds[] code into PReP machine.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/isa/pc87312.c | 33 ++++++++++++++++++++-------------
hw/ppc/prep.c | 13 +++++++++++++
include/hw/isa/pc87312.h | 6 ++----
3 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c
index ded6c01..207eaa8 100644
--- a/hw/isa/pc87312.c
+++ b/hw/isa/pc87312.c
@@ -266,10 +266,8 @@ static void pc87312_realize(DeviceState *dev, Error **errp)
DeviceState *d;
ISADevice *isa;
ISABus *bus;
- CharDriverState *chr;
DriveInfo *drive;
Error *local_err = NULL;
- char name[5];
int i;
s = PC87312(dev);
@@ -296,21 +294,19 @@ static void pc87312_realize(DeviceState *dev, Error
**errp)
for (i = 0; i < 2; i++) {
if (is_uart_enabled(s, i)) {
- chr = serial_hds[i];
- if (chr == NULL) {
- snprintf(name, sizeof(name), "ser%d", i);
- chr = qemu_chr_new(name, "null", NULL);
- }
- isa = isa_create(bus, "isa-serial");
- d = DEVICE(isa);
- qdev_prop_set_uint32(d, "index", i);
+ d = DEVICE(&s->uart[i]);
+ qdev_set_parent_bus(d, BUS(bus));
qdev_prop_set_uint32(d, "iobase", get_uart_iobase(s, i));
qdev_prop_set_uint32(d, "irq", get_uart_irq(s, i));
- qdev_prop_set_chr(d, "chardev", chr);
- qdev_init_nofail(d);
- s->uart[i].dev = isa;
trace_pc87312_info_serial(i, get_uart_iobase(s, i),
get_uart_irq(s, i));
+ object_property_set_bool(OBJECT(&s->uart[i]), true, "realized",
+ &local_err);
+ object_unref(OBJECT(&s->uart[i]));
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
}
}
@@ -349,6 +345,7 @@ static void pc87312_realize(DeviceState *dev, Error **errp)
static void pc87312_initfn(Object *obj)
{
PC87312State *s = PC87312(obj);
+ int i;
memory_region_init_io(&s->io, obj, &pc87312_io_ops, s, "pc87312", 2);
@@ -356,6 +353,16 @@ static void pc87312_initfn(Object *obj)
object_property_add_alias(obj, "par0-chardev",
OBJECT(&s->parallel), "chardev", &error_abort);
qdev_prop_set_uint32(DEVICE(&s->parallel), "index", 0);
+
+ for (i = 0; i < 2; i++) {
+ char *propname = g_strdup_printf("ser%d-chardev", i);
+ object_initialize(&s->uart[i], sizeof(s->uart[i]), TYPE_ISA_SERIAL);
+ qdev_prop_set_uint32(DEVICE(&s->uart[i]), "index", i);
+ object_property_add_alias(obj, propname,
+ OBJECT(&s->uart[i]), "chardev",
+ &error_abort);
+ g_free(propname);
+ }
}
static const VMStateDescription vmstate_pc87312 = {
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 1dfa051..eb29d3c 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -648,6 +648,19 @@ static void ppc_prep_init(MachineState *machine)
if (chr != NULL) {
qdev_prop_set_chr(dev, "par0-chardev", chr);
}
+ for (i = 0; i < 2; i++) {
+ chr = serial_hds[i];
+ if (chr == NULL) {
+ char *name = g_strdup_printf("ser%d", i);
+ chr = qemu_chr_new(name, "null", NULL);
+ g_free(name);
+ }
+ if (chr != NULL) {
+ char *name = g_strdup_printf("ser%d-chardev", i);
+ qdev_prop_set_chr(dev, name, chr);
+ g_free(name);
+ }
+ }
qdev_prop_set_uint8(dev, "config", 13); /* fdc, ser0, ser1, par0 */
qdev_init_nofail(dev);
diff --git a/include/hw/isa/pc87312.h b/include/hw/isa/pc87312.h
index b473b3b..3256e0f 100644
--- a/include/hw/isa/pc87312.h
+++ b/include/hw/isa/pc87312.h
@@ -27,6 +27,7 @@
#include "hw/isa/isa.h"
#include "hw/char/parallel.h"
+#include "hw/char/serial.h"
#define TYPE_PC87312 "pc87312"
@@ -39,10 +40,7 @@ typedef struct PC87312State {
uint8_t config; /* initial configuration */
ISAParallelState parallel;
-
- struct {
- ISADevice *dev;
- } uart[2];
+ ISASerialState uart[2];
struct {
ISADevice *dev;
--
2.1.4
- [Qemu-ppc] [PATCH RFC for-2.3? 0/8] prep: Fix pc87312 for -device usage, Andreas Färber, 2015/03/29
- [Qemu-ppc] [PATCH RFC for-2.3? 2/8] pc87312: Create isa-parallel in-place and add alias par0-chardev property, Andreas Färber, 2015/03/29
- [Qemu-ppc] [PATCH RFC for-2.3? 1/8] parallel: Factor out header for ISAParallelState struct, Andreas Färber, 2015/03/29
- [Qemu-ppc] [PATCH RFC for-2.3? 3/8] serial: Move ISASerialState to header, Andreas Färber, 2015/03/29
- [Qemu-ppc] [PATCH RFC for-2.3? 4/8] pc87312: Create UARTs in-place and add alias properties,
Andreas Färber <=
- [Qemu-ppc] [PATCH RFC for-2.3? 5/8] fdb: Move FDCtrlISABus to header, Andreas Färber, 2015/03/29
- [Qemu-ppc] [PATCH RFC for-2.3? 6/8] pc87312: Create FDC in-place, Andreas Färber, 2015/03/29
- [Qemu-ppc] [PATCH RFC for-2.3? 8/8] pc87312: Create IDE in-place, Andreas Färber, 2015/03/29
- [Qemu-ppc] [PATCH RFC for-2.3? 7/8] ide: Move ISAIDEState to header, Andreas Färber, 2015/03/29
- Re: [Qemu-ppc] [Qemu-devel] [PATCH RFC for-2.3? 0/8] prep: Fix pc87312 for -device usage, Markus Armbruster, 2015/03/30