[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 06/13] qdev-core: isolate vmstate handling into separa
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [RFC 06/13] qdev-core: isolate vmstate handling into separate functions |
Date: |
Thu, 4 Oct 2012 16:15:26 -0300 |
Those functions will eventually be moved somewhere else, and won't get
included on *-user.
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/qdev-core.c | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/hw/qdev-core.c b/hw/qdev-core.c
index c3c4d77..242347f 100644
--- a/hw/qdev-core.c
+++ b/hw/qdev-core.c
@@ -40,6 +40,22 @@ const VMStateDescription *qdev_get_vmsd(DeviceState *dev)
return dc->vmsd;
}
+static void qdev_init_vmstate(DeviceState *dev)
+{
+ if (qdev_get_vmsd(dev)) {
+ vmstate_register_with_alias_id(dev, -1, qdev_get_vmsd(dev), dev,
+ dev->instance_id_alias,
+ dev->alias_required_for_version);
+ }
+}
+
+static void qdev_finalize_vmstate(DeviceState *dev)
+{
+ if (qdev_get_vmsd(dev)) {
+ vmstate_unregister(dev, qdev_get_vmsd(dev), dev);
+ }
+}
+
const char *qdev_fw_name(DeviceState *dev)
{
DeviceClass *dc = DEVICE_GET_CLASS(dev);
@@ -131,11 +147,7 @@ int qdev_init(DeviceState *dev)
g_free(name);
}
- if (qdev_get_vmsd(dev)) {
- vmstate_register_with_alias_id(dev, -1, qdev_get_vmsd(dev), dev,
- dev->instance_id_alias,
- dev->alias_required_for_version);
- }
+ qdev_init_vmstate(dev);
dev->state = DEV_STATE_INITIALIZED;
if (dev->hotplugged) {
device_reset(dev);
@@ -608,9 +620,7 @@ static void device_finalize(Object *obj)
bus = QLIST_FIRST(&dev->child_bus);
qbus_free(bus);
}
- if (qdev_get_vmsd(dev)) {
- vmstate_unregister(dev, qdev_get_vmsd(dev), dev);
- }
+ qdev_finalize_vmstate(dev);
if (dc->exit) {
dc->exit(dev);
}
--
1.7.11.4
- [Qemu-devel] [RFC 11/13] qdev: use full qdev.h include path on qdev*.c, (continued)
- [Qemu-devel] [RFC 11/13] qdev: use full qdev.h include path on qdev*.c, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 03/13] qapi-types.h doesn't really need to include qemu-common.h, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 05/13] qdev: rename qdev.c to qdev-core.c, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 09/13] qdev: move reset register/unregister code to qdev-system.c, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 07/13] qdev: move vmstate handling to qdev-system.c, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 01/13] qdev: kill bogus comment, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 02/13] qdev: split up header so it can be used in cpu.h, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 06/13] qdev-core: isolate vmstate handling into separate functions,
Eduardo Habkost <=
- [Qemu-devel] [RFC 13/13] make CPU a child of DeviceState, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 12/13] include core qdev code into *-user, too, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 04/13] qdev: separate core from the code used only by qemu-system-*, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 10/13] move qemu_irq typedef out of cpu-common.h, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 08/13] qdev-core: isolate reset register/unregister code, Eduardo Habkost, 2012/10/04