[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/27] qdev: use a wrapper to access reset and promo
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [PATCH 05/27] qdev: use a wrapper to access reset and promote reset to a class method |
Date: |
Tue, 20 Dec 2011 10:51:34 -0600 |
Signed-off-by: Anthony Liguori <address@hidden>
---
hw/intel-hda.c | 4 +---
hw/lsi53c895a.c | 2 +-
hw/qdev.c | 22 +++++++++++++++++-----
hw/qdev.h | 10 +++++++++-
4 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/hw/intel-hda.c b/hw/intel-hda.c
index 1b42e10..09459b8 100644
--- a/hw/intel-hda.c
+++ b/hw/intel-hda.c
@@ -1116,9 +1116,7 @@ static void intel_hda_reset(DeviceState *dev)
/* reset codecs */
QTAILQ_FOREACH(qdev, &d->codecs.qbus.children, sibling) {
cdev = DO_UPCAST(HDACodecDevice, qdev, qdev);
- if (qdev_get_info(qdev)->reset) {
- qdev_get_info(qdev)->reset(qdev);
- }
+ device_reset(DEVICE(cdev));
d->state_sts |= (1 << cdev->cad);
}
intel_hda_update_irq(d);
diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
index 9f475e0..3a87171 100644
--- a/hw/lsi53c895a.c
+++ b/hw/lsi53c895a.c
@@ -1681,7 +1681,7 @@ static void lsi_reg_writeb(LSIState *s, int offset,
uint8_t val)
DeviceState *dev;
QTAILQ_FOREACH(dev, &s->bus.qbus.children, sibling) {
- qdev_get_info(dev)->reset(dev);
+ device_reset(dev);
}
s->sstat0 |= LSI_SSTAT0_RST;
lsi_script_scsi_interrupt(s, LSI_SIST0_RST, 0);
diff --git a/hw/qdev.c b/hw/qdev.c
index 5d63c10..3a7c98f 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -48,7 +48,12 @@ static BusState *qbus_find(const char *path);
static void qdev_subclass_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
+
dc->info = data;
+ dc->reset = dc->info->reset;
+
+ /* Poison to try to detect future uses */
+ dc->info->reset = NULL;
}
DeviceInfo *qdev_get_info(DeviceState *dev)
@@ -374,8 +379,8 @@ int qdev_init(DeviceState *dev)
dev->alias_required_for_version);
}
dev->state = DEV_STATE_INITIALIZED;
- if (dev->hotplugged && qdev_get_info(dev)->reset) {
- qdev_get_info(dev)->reset(dev);
+ if (dev->hotplugged) {
+ device_reset(dev);
}
return 0;
}
@@ -408,9 +413,7 @@ int qdev_unplug(DeviceState *dev)
static int qdev_reset_one(DeviceState *dev, void *opaque)
{
- if (qdev_get_info(dev)->reset) {
- qdev_get_info(dev)->reset(dev);
- }
+ device_reset(dev);
return 0;
}
@@ -1556,6 +1559,15 @@ void qdev_machine_init(void)
qdev_get_peripheral();
}
+void device_reset(DeviceState *dev)
+{
+ DeviceClass *klass = DEVICE_GET_CLASS(dev);
+
+ if (klass->reset) {
+ klass->reset(dev);
+ }
+}
+
static TypeInfo device_type_info = {
.name = TYPE_DEVICE,
.parent = TYPE_OBJECT,
diff --git a/hw/qdev.h b/hw/qdev.h
index a29ee94..c1fcf28 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -75,6 +75,7 @@ typedef struct DeviceProperty
typedef struct DeviceClass {
ObjectClass parent_class;
DeviceInfo *info;
+ void (*reset)(DeviceState *dev);
} DeviceClass;
/* This structure should not be accessed directly. We declare it here
@@ -402,7 +403,7 @@ static inline const char *qdev_fw_name(DeviceState *dev)
return info->alias;
}
- return info->name;
+ return object_get_type(OBJECT(dev));
}
char *qdev_get_fw_dev_path(DeviceState *dev);
@@ -646,4 +647,11 @@ char *qdev_get_type(DeviceState *dev, Error **errp);
*/
void qdev_machine_init(void);
+/**
+ * @device_reset
+ *
+ * Reset a single device (by calling the reset method).
+ */
+void device_reset(DeviceState *dev);
+
#endif
--
1.7.4.1
- [Qemu-devel] [PATCH 00/27] qom: add QEMU Object Model type hierarchy to qdev, Anthony Liguori, 2011/12/20
- [Qemu-devel] [PATCH 02/27] qdev: integrate with QEMU Object Model, Anthony Liguori, 2011/12/20
- [Qemu-devel] [PATCH 05/27] qdev: use a wrapper to access reset and promote reset to a class method,
Anthony Liguori <=
- [Qemu-devel] [PATCH 01/27] qom: add the base Object class, Anthony Liguori, 2011/12/20
- Re: [Qemu-devel] [PATCH 01/27] qom: add the base Object class, Paolo Bonzini, 2011/12/21
- Re: [Qemu-devel] [PATCH 01/27] qom: add the base Object class, Anthony Liguori, 2011/12/21
- Re: [Qemu-devel] [PATCH 01/27] qom: add the base Object class, Paolo Bonzini, 2011/12/21
- Re: [Qemu-devel] [PATCH 01/27] qom: add the base Object class, Kevin O'Connor, 2011/12/22
- Re: [Qemu-devel] [PATCH 01/27] qom: add the base Object class, Anthony Liguori, 2011/12/22
- Re: [Qemu-devel] [PATCH 01/27] qom: add the base Object class, Kevin O'Connor, 2011/12/22
- Re: [Qemu-devel] [PATCH 01/27] qom: add the base Object class, Anthony Liguori, 2011/12/22
- Re: [Qemu-devel] [PATCH 01/27] qom: add the base Object class, Paolo Bonzini, 2011/12/22
[Qemu-devel] [PATCH 03/27] qdev: move qdev->info to class, Anthony Liguori, 2011/12/20