From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54032) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcHOx-00022G-Ia for qemu-devel@nongnu.org; Sun, 29 Mar 2015 13:53:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcHOw-0003Xp-C8 for qemu-devel@nongnu.org; Sun, 29 Mar 2015 13:53:35 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 29 Mar 2015 19:53:17 +0200 Message-Id: <1427651603-9210-3-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? 2/8] pc87312: Create isa-parallel in-place and add alias par0-chardev property 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 the parallel_hds[] code to the PReP machine. Signed-off-by: Andreas F=C3=A4rber --- hw/isa/pc87312.c | 25 +++++++++++++++---------- hw/ppc/prep.c | 9 +++++++++ include/hw/isa/pc87312.h | 5 ++--- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c index 40a1106..ded6c01 100644 --- a/hw/isa/pc87312.c +++ b/hw/isa/pc87312.c @@ -268,6 +268,7 @@ static void pc87312_realize(DeviceState *dev, Error *= *errp) ISABus *bus; CharDriverState *chr; DriveInfo *drive; + Error *local_err =3D NULL; char name[5]; int i; =20 @@ -278,20 +279,19 @@ static void pc87312_realize(DeviceState *dev, Error= **errp) pc87312_hard_reset(s); =20 if (is_parallel_enabled(s)) { - chr =3D parallel_hds[0]; - if (chr =3D=3D NULL) { - chr =3D qemu_chr_new("par0", "null", NULL); - } - isa =3D isa_create(bus, "isa-parallel"); - d =3D DEVICE(isa); - qdev_prop_set_uint32(d, "index", 0); + d =3D DEVICE(&s->parallel); + qdev_set_parent_bus(d, BUS(bus)); qdev_prop_set_uint32(d, "iobase", get_parallel_iobase(s)); qdev_prop_set_uint32(d, "irq", get_parallel_irq(s)); - qdev_prop_set_chr(d, "chardev", chr); - qdev_init_nofail(d); - s->parallel.dev =3D isa; trace_pc87312_info_parallel(get_parallel_iobase(s), get_parallel_irq(s)); + object_property_set_bool(OBJECT(&s->parallel), true, "realized", + &local_err); + object_unref(OBJECT(&s->parallel)); + if (local_err) { + error_propagate(errp, local_err); + return; + } } =20 for (i =3D 0; i < 2; i++) { @@ -351,6 +351,11 @@ static void pc87312_initfn(Object *obj) PC87312State *s =3D PC87312(obj); =20 memory_region_init_io(&s->io, obj, &pc87312_io_ops, s, "pc87312", 2)= ; + + object_initialize(&s->parallel, sizeof(s->parallel), TYPE_ISA_PARALL= EL); + object_property_add_alias(obj, "par0-chardev", + OBJECT(&s->parallel), "chardev", &error_ab= ort); + qdev_prop_set_uint32(DEVICE(&s->parallel), "index", 0); } =20 static const VMStateDescription vmstate_pc87312 =3D { diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 7f52662..1dfa051 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -40,6 +40,7 @@ #include "hw/isa/pc87312.h" #include "sysemu/block-backend.h" #include "sysemu/arch_init.h" +#include "sysemu/char.h" #include "sysemu/qtest.h" #include "exec/address-spaces.h" #include "elf.h" @@ -528,6 +529,7 @@ static void ppc_prep_init(MachineState *machine) PCIDevice *pci; ISABus *isa_bus; ISADevice *isa; + CharDriverState *chr; qemu_irq *cpu_exit_irq; int ppc_boot_device; DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; @@ -639,6 +641,13 @@ static void ppc_prep_init(MachineState *machine) /* Super I/O (parallel + serial ports) */ isa =3D isa_create(isa_bus, TYPE_PC87312); dev =3D DEVICE(isa); + chr =3D parallel_hds[0]; + if (chr =3D=3D NULL) { + chr =3D qemu_chr_new("par0", "null", NULL); + } + if (chr !=3D NULL) { + qdev_prop_set_chr(dev, "par0-chardev", chr); + } 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 bf74470..b473b3b 100644 --- a/include/hw/isa/pc87312.h +++ b/include/hw/isa/pc87312.h @@ -26,6 +26,7 @@ #define QEMU_PC87312_H =20 #include "hw/isa/isa.h" +#include "hw/char/parallel.h" =20 =20 #define TYPE_PC87312 "pc87312" @@ -37,9 +38,7 @@ typedef struct PC87312State { uint32_t iobase; uint8_t config; /* initial configuration */ =20 - struct { - ISADevice *dev; - } parallel; + ISAParallelState parallel; =20 struct { ISADevice *dev; --=20 2.1.4