From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54833) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcHQe-0005Hm-T9 for qemu-devel@nongnu.org; Sun, 29 Mar 2015 13:55:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcHQd-0004jm-S9 for qemu-devel@nongnu.org; Sun, 29 Mar 2015 13:55:20 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 29 Mar 2015 19:53:23 +0200 Message-Id: <1427651603-9210-9-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? 8/8] pc87312: Create IDE in-place 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, =?UTF-8?q?Andreas=20F=C3=A4rber?= , hpoussin@reactos.org, qemu-ppc@nongnu.org, jsnow@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/isa/pc87312.c | 17 ++++++++++++----- include/hw/isa/pc87312.h | 6 ++---- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c index d35eb0e..37e2df4 100644 --- a/hw/isa/pc87312.c +++ b/hw/isa/pc87312.c @@ -324,14 +324,18 @@ static void pc87312_realize(DeviceState *dev, Error= **errp) } =20 if (is_ide_enabled(s)) { - isa =3D isa_create(bus, "isa-ide"); - d =3D DEVICE(isa); + d =3D DEVICE(&s->ide); + qdev_set_parent_bus(d, BUS(bus)); qdev_prop_set_uint32(d, "iobase", get_ide_iobase(s)); qdev_prop_set_uint32(d, "iobase2", get_ide_iobase(s) + 0x206); - qdev_prop_set_uint32(d, "irq", 14); - qdev_init_nofail(d); - s->ide.dev =3D isa; trace_pc87312_info_ide(get_ide_iobase(s)); + object_property_set_bool(OBJECT(&s->ide), true, "realized", + &local_err); + object_unref(OBJECT(&s->fdc)); + if (local_err) { + error_propagate(errp, local_err); + return; + } } } =20 @@ -363,6 +367,9 @@ static void pc87312_initfn(Object *obj) object_property_add_alias(obj, "fdc-driveB", OBJECT(&s->fdc), "driveB", &error_abort); qdev_prop_set_uint32(DEVICE(&s->fdc), "irq", 6); + + object_initialize(&s->ide, sizeof(s->ide), TYPE_ISA_IDE); + qdev_prop_set_uint32(DEVICE(&s->ide), "irq", 14); } =20 static const VMStateDescription vmstate_pc87312 =3D { diff --git a/include/hw/isa/pc87312.h b/include/hw/isa/pc87312.h index c49a06d..ffc2b96 100644 --- a/include/hw/isa/pc87312.h +++ b/include/hw/isa/pc87312.h @@ -29,6 +29,7 @@ #include "hw/char/parallel.h" #include "hw/char/serial.h" #include "hw/block/fdc.h" +#include "hw/ide.h" =20 =20 #define TYPE_PC87312 "pc87312" @@ -43,10 +44,7 @@ typedef struct PC87312State { ISAParallelState parallel; ISASerialState uart[2]; FDCtrlISABus fdc; - - struct { - ISADevice *dev; - } ide; + ISAIDEState ide; =20 MemoryRegion io; =20 --=20 2.1.4