[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 29/49] ipack: Convert to QOM realize
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL v2 29/49] ipack: Convert to QOM realize |
Date: |
Mon, 17 Feb 2014 23:24:39 +0100 |
Acked-by: Alberto Garcia <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/char/ipack.c | 41 ++++++++++++++++++++++-------------------
hw/char/ipack.h | 6 ++++--
hw/char/ipoctal232.c | 8 +++-----
3 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/hw/char/ipack.c b/hw/char/ipack.c
index b7e45be..15cef7b 100644
--- a/hw/char/ipack.c
+++ b/hw/char/ipack.c
@@ -34,37 +34,39 @@ void ipack_bus_new_inplace(IPackBus *bus, size_t bus_size,
bus->set_irq = handler;
}
-static int ipack_device_dev_init(DeviceState *qdev)
+static void ipack_device_realize(DeviceState *dev, Error **errp)
{
- IPackBus *bus = IPACK_BUS(qdev_get_parent_bus(qdev));
- IPackDevice *dev = IPACK_DEVICE(qdev);
+ IPackDevice *idev = IPACK_DEVICE(dev);
+ IPackBus *bus = IPACK_BUS(qdev_get_parent_bus(dev));
IPackDeviceClass *k = IPACK_DEVICE_GET_CLASS(dev);
- if (dev->slot < 0) {
- dev->slot = bus->free_slot;
+ if (idev->slot < 0) {
+ idev->slot = bus->free_slot;
}
- if (dev->slot >= bus->n_slots) {
- return -1;
+ if (idev->slot >= bus->n_slots) {
+ error_setg(errp, "Only %" PRIu8 " slots available.", bus->n_slots);
+ return;
}
- bus->free_slot = dev->slot + 1;
+ bus->free_slot = idev->slot + 1;
- dev->irq = qemu_allocate_irqs(bus->set_irq, dev, 2);
+ idev->irq = qemu_allocate_irqs(bus->set_irq, idev, 2);
- return k->init(dev);
+ k->realize(dev, errp);
}
-static int ipack_device_dev_exit(DeviceState *qdev)
+static void ipack_device_unrealize(DeviceState *dev, Error **errp)
{
- IPackDevice *dev = IPACK_DEVICE(qdev);
+ IPackDevice *idev = IPACK_DEVICE(dev);
IPackDeviceClass *k = IPACK_DEVICE_GET_CLASS(dev);
+ Error *err = NULL;
- if (k->exit) {
- k->exit(dev);
+ if (k->unrealize) {
+ k->unrealize(dev, &err);
+ error_propagate(errp, err);
+ return;
}
- qemu_free_irqs(dev->irq);
-
- return 0;
+ qemu_free_irqs(idev->irq);
}
static Property ipack_device_props[] = {
@@ -75,10 +77,11 @@ static Property ipack_device_props[] = {
static void ipack_device_class_init(ObjectClass *klass, void *data)
{
DeviceClass *k = DEVICE_CLASS(klass);
+
set_bit(DEVICE_CATEGORY_INPUT, k->categories);
k->bus_type = TYPE_IPACK_BUS;
- k->init = ipack_device_dev_init;
- k->exit = ipack_device_dev_exit;
+ k->realize = ipack_device_realize;
+ k->unrealize = ipack_device_unrealize;
k->props = ipack_device_props;
}
diff --git a/hw/char/ipack.h b/hw/char/ipack.h
index f8dc0f2..b62066f 100644
--- a/hw/char/ipack.h
+++ b/hw/char/ipack.h
@@ -38,10 +38,12 @@ typedef struct IPackDeviceClass IPackDeviceClass;
OBJECT_GET_CLASS(IPackDeviceClass, (obj), TYPE_IPACK_DEVICE)
struct IPackDeviceClass {
+ /*< private >*/
DeviceClass parent_class;
+ /*< public >*/
- int (*init)(IPackDevice *dev);
- int (*exit)(IPackDevice *dev);
+ DeviceRealize realize;
+ DeviceUnrealize unrealize;
uint16_t (*io_read)(IPackDevice *dev, uint8_t addr);
void (*io_write)(IPackDevice *dev, uint8_t addr, uint16_t val);
diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c
index 88e2cca..b33cfff 100644
--- a/hw/char/ipoctal232.c
+++ b/hw/char/ipoctal232.c
@@ -534,9 +534,9 @@ static void hostdev_event(void *opaque, int event)
}
}
-static int ipoctal_init(IPackDevice *ip)
+static void ipoctal_realize(DeviceState *dev, Error **errp)
{
- IPOctalState *s = IPOCTAL(ip);
+ IPOctalState *s = IPOCTAL(dev);
unsigned i;
for (i = 0; i < N_CHANNELS; i++) {
@@ -552,8 +552,6 @@ static int ipoctal_init(IPackDevice *ip)
DPRINTF("Could not redirect channel %u, no chardev set\n", i);
}
}
-
- return 0;
}
static Property ipoctal_properties[] = {
@@ -573,7 +571,7 @@ static void ipoctal_class_init(ObjectClass *klass, void
*data)
DeviceClass *dc = DEVICE_CLASS(klass);
IPackDeviceClass *ic = IPACK_DEVICE_CLASS(klass);
- ic->init = ipoctal_init;
+ ic->realize = ipoctal_realize;
ic->io_read = io_read;
ic->io_write = io_write;
ic->id_read = id_read;
--
1.8.4.5
- [Qemu-devel] [PULL v2 19/49] i2c: Drop FROM_I2C_SLAVE() macro, (continued)
- [Qemu-devel] [PULL v2 19/49] i2c: Drop FROM_I2C_SLAVE() macro, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 21/49] tests: Add vmxnet3 qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 20/49] tests: Add e1000 qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 24/49] tests: Add eepro100 qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 26/49] tests: Add virtio-net qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 28/49] tests: Add ipoctal232 qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 22/49] tests: Add rtl8139 qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 25/49] tests: Add ne2000 qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 23/49] tests: Add pcnet qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 27/49] tests: Add tpci200 qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 29/49] ipack: Convert to QOM realize,
Andreas Färber <=
- [Qemu-devel] [PULL v2 31/49] ipack: QOM parent field cleanup for IPackDevice, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 30/49] ipack: QOM parent field cleanup for IPackBus, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 33/49] ipack: Move IndustryPack out of hw/char/, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 32/49] ipoctal232: QOM parent field cleanup, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 34/49] qtest: Don't segfault with invalid -qtest option, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 35/49] qapi: Add size parser to StringInputVisitor, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 36/49] qdev: Sizes are now parsed by StringInputVisitor, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 39/49] qdev: Legacy properties are just strings, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 37/49] qdev: Remove legacy parsers for hex8/32/64, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 40/49] qdev: Inline qdev_prop_parse(), Andreas Färber, 2014/02/17