[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/12] qdev: Set device's parent before calling real
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 11/12] qdev: Set device's parent before calling realize() down inheritance chain |
Date: |
Tue, 16 Apr 2013 02:46:48 +0200 |
From: Igor Mammedov <address@hidden>
Currently device_set_realized() sets parent only after device was realized,
but qdev_device_add() sets it before device is realized.
Make behavior consistent and alter device_set_realized() to behave like
qdev_device_add().
It will allow to set link<> properties in realize() method in classes
inherited from DEVICE.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/core/qdev.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index bab4ed7..4eb0134 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -684,10 +684,6 @@ static void device_set_realized(Object *obj, bool value,
Error **err)
Error *local_err = NULL;
if (value && !dev->realized) {
- if (dc->realize) {
- dc->realize(dev, &local_err);
- }
-
if (!obj->parent && local_err == NULL) {
static int unattached_count;
gchar *name = g_strdup_printf("device[%d]", unattached_count++);
@@ -698,6 +694,10 @@ static void device_set_realized(Object *obj, bool value,
Error **err)
g_free(name);
}
+ if (dc->realize) {
+ dc->realize(dev, &local_err);
+ }
+
if (qdev_get_vmsd(dev) && local_err == NULL) {
vmstate_register_with_alias_id(dev, -1, qdev_get_vmsd(dev), dev,
dev->instance_id_alias,
--
1.8.1.4
- [Qemu-devel] [PULL 00/12] QOM CPUState patch queue 2013-04-15, Andreas Färber, 2013/04/15
- [Qemu-devel] [PATCH 02/12] target-i386: Improve -cpu ? features output, Andreas Färber, 2013/04/15
- [Qemu-devel] [PATCH 01/12] target-i386: Fix including "host" in -cpu ? output, Andreas Färber, 2013/04/15
- [Qemu-devel] [PATCH 03/12] qdev: Add qdev property for bool type, Andreas Färber, 2013/04/15
- [Qemu-devel] [PATCH 06/12] kvmvapic: Replace FROM_SYSBUS() with QOM type cast, Andreas Färber, 2013/04/15
- [Qemu-devel] [PATCH 04/12] target-i386: Consolidate error propagation in x86_cpu_realizefn(), Andreas Färber, 2013/04/15
- [Qemu-devel] [PATCH 07/12] ioapic: Replace FROM_SYSBUS() with QOM type cast, Andreas Färber, 2013/04/15
- [Qemu-devel] [PATCH 05/12] target-i386: Split APIC creation from initialization in x86_cpu_realizefn(), Andreas Färber, 2013/04/15
- [Qemu-devel] [PATCH 11/12] qdev: Set device's parent before calling realize() down inheritance chain,
Andreas Färber <=
- [Qemu-devel] [PATCH 08/12] target-i386/cpu.c: Coding style fixes, Andreas Färber, 2013/04/15
- [Qemu-devel] [PATCH 10/12] cpu: Pass CPUState to *cpu_synchronize_post*(), Andreas Färber, 2013/04/15
- [Qemu-devel] [PATCH 09/12] target-i386: Split out CPU creation and features parsing, Andreas Färber, 2013/04/15
- [Qemu-devel] [PATCH 12/12] target-cris: Override do_interrupt for pre-v32 CPU cores, Andreas Färber, 2013/04/15