From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54196) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcHPK-0002iu-Ho for qemu-devel@nongnu.org; Sun, 29 Mar 2015 13:53:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcHPJ-0003cu-Fd for qemu-devel@nongnu.org; Sun, 29 Mar 2015 13:53:58 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 29 Mar 2015 19:53:19 +0200 Message-Id: <1427651603-9210-5-git-send-email-afaerber@suse.de> In-Reply-To: <1427651603-9210-1-git-send-email-afaerber@suse.de> References: <1427651603-9210-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH RFC for-2.3? 4/8] pc87312: Create UARTs in-place and add alias properties List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mark.cave-ayland@ilande.co.uk, armbru@redhat.com, Alexander Graf , =?UTF-8?q?Andreas=20F=C3=A4rber?= , hpoussin@reactos.org, qemu-ppc@nongnu.org, jsnow@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= Move serial_hds[] code into PReP machine. Signed-off-by: Andreas F=C3=A4rber --- 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 =3D NULL; - char name[5]; int i; =20 s =3D PC87312(dev); @@ -296,21 +294,19 @@ static void pc87312_realize(DeviceState *dev, Error= **errp) =20 for (i =3D 0; i < 2; i++) { if (is_uart_enabled(s, i)) { - chr =3D serial_hds[i]; - if (chr =3D=3D NULL) { - snprintf(name, sizeof(name), "ser%d", i); - chr =3D qemu_chr_new(name, "null", NULL); - } - isa =3D isa_create(bus, "isa-serial"); - d =3D DEVICE(isa); - qdev_prop_set_uint32(d, "index", i); + d =3D 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 =3D 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, "realize= d", + &local_err); + object_unref(OBJECT(&s->uart[i])); + if (local_err) { + error_propagate(errp, local_err); + return; + } } } =20 @@ -349,6 +345,7 @@ static void pc87312_realize(DeviceState *dev, Error *= *errp) static void pc87312_initfn(Object *obj) { PC87312State *s =3D PC87312(obj); + int i; =20 memory_region_init_io(&s->io, obj, &pc87312_io_ops, s, "pc87312", 2)= ; =20 @@ -356,6 +353,16 @@ static void pc87312_initfn(Object *obj) object_property_add_alias(obj, "par0-chardev", OBJECT(&s->parallel), "chardev", &error_ab= ort); qdev_prop_set_uint32(DEVICE(&s->parallel), "index", 0); + + for (i =3D 0; i < 2; i++) { + char *propname =3D g_strdup_printf("ser%d-chardev", i); + object_initialize(&s->uart[i], sizeof(s->uart[i]), TYPE_ISA_SERI= AL); + 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); + } } =20 static const VMStateDescription vmstate_pc87312 =3D { 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 !=3D NULL) { qdev_prop_set_chr(dev, "par0-chardev", chr); } + for (i =3D 0; i < 2; i++) { + chr =3D serial_hds[i]; + if (chr =3D=3D NULL) { + char *name =3D g_strdup_printf("ser%d", i); + chr =3D qemu_chr_new(name, "null", NULL); + g_free(name); + } + if (chr !=3D NULL) { + char *name =3D 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); =20 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 @@ =20 #include "hw/isa/isa.h" #include "hw/char/parallel.h" +#include "hw/char/serial.h" =20 =20 #define TYPE_PC87312 "pc87312" @@ -39,10 +40,7 @@ typedef struct PC87312State { uint8_t config; /* initial configuration */ =20 ISAParallelState parallel; - - struct { - ISADevice *dev; - } uart[2]; + ISASerialState uart[2]; =20 struct { ISADevice *dev; --=20 2.1.4