[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC for-2.3? 8/8] pc87312: Create IDE in-place
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH RFC for-2.3? 8/8] pc87312: Create IDE in-place |
Date: |
Sun, 29 Mar 2015 19:53:23 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
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)
}
if (is_ide_enabled(s)) {
- isa = isa_create(bus, "isa-ide");
- d = DEVICE(isa);
+ d = 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 = 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;
+ }
}
}
@@ -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);
}
static const VMStateDescription vmstate_pc87312 = {
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"
#define TYPE_PC87312 "pc87312"
@@ -43,10 +44,7 @@ typedef struct PC87312State {
ISAParallelState parallel;
ISASerialState uart[2];
FDCtrlISABus fdc;
-
- struct {
- ISADevice *dev;
- } ide;
+ ISAIDEState ide;
MemoryRegion io;
--
2.1.4
- [Qemu-devel] [PATCH RFC for-2.3? 0/8] prep: Fix pc87312 for -device usage, Andreas Färber, 2015/03/29
- [Qemu-devel] [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-devel] [PATCH RFC for-2.3? 1/8] parallel: Factor out header for ISAParallelState struct, Andreas Färber, 2015/03/29
- [Qemu-devel] [PATCH RFC for-2.3? 3/8] serial: Move ISASerialState to header, Andreas Färber, 2015/03/29
- [Qemu-devel] [PATCH RFC for-2.3? 4/8] pc87312: Create UARTs in-place and add alias properties, Andreas Färber, 2015/03/29
- [Qemu-devel] [PATCH RFC for-2.3? 5/8] fdb: Move FDCtrlISABus to header, Andreas Färber, 2015/03/29
- [Qemu-devel] [PATCH RFC for-2.3? 6/8] pc87312: Create FDC in-place, Andreas Färber, 2015/03/29
- [Qemu-devel] [PATCH RFC for-2.3? 8/8] pc87312: Create IDE in-place,
Andreas Färber <=
- [Qemu-devel] [PATCH RFC for-2.3? 7/8] ide: Move ISAIDEState to header, Andreas Färber, 2015/03/29
- Re: [Qemu-devel] [PATCH RFC for-2.3? 0/8] prep: Fix pc87312 for -device usage, Markus Armbruster, 2015/03/30
- Re: [Qemu-devel] [PATCH RFC for-2.3? 0/8] prep: Fix pc87312 for -device usage, Andreas Färber, 2015/03/30