[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 03/10] macio: move DBDMA_init from instance_init
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v5 03/10] macio: move DBDMA_init from instance_init to realize |
Date: |
Thu, 1 Oct 2015 10:59:52 +0200 |
From: Paolo Bonzini <address@hidden>
DBDMA_init is not idempotent, and calling it from instance_init
breaks a simple object_new/object_unref pair. Work around this,
pending qdev-ification of DBDMA, by moving the call to realize.
Reported-by: Markus Armbruster <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/misc/macio/macio.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
index 2548d96..c661f86 100644
--- a/hw/misc/macio/macio.c
+++ b/hw/misc/macio/macio.c
@@ -131,6 +131,10 @@ static void macio_common_realize(PCIDevice *d, Error
**errp)
MacIOState *s = MACIO(d);
SysBusDevice *sysbus_dev;
Error *err = NULL;
+ MemoryRegion *dbdma_mem;
+
+ s->dbdma = DBDMA_init(&dbdma_mem);
+ memory_region_add_subregion(&s->bar, 0x08000, dbdma_mem);
object_property_set_bool(OBJECT(&s->cuda), true, "realized", &err);
if (err) {
@@ -328,16 +332,12 @@ static void macio_newworld_init(Object *obj)
static void macio_instance_init(Object *obj)
{
MacIOState *s = MACIO(obj);
- MemoryRegion *dbdma_mem;
memory_region_init(&s->bar, obj, "macio", 0x80000);
object_initialize(&s->cuda, sizeof(s->cuda), TYPE_CUDA);
qdev_set_parent_bus(DEVICE(&s->cuda), sysbus_get_default());
object_property_add_child(obj, "cuda", OBJECT(&s->cuda), NULL);
-
- s->dbdma = DBDMA_init(&dbdma_mem);
- memory_region_add_subregion(&s->bar, 0x08000, dbdma_mem);
}
static const VMStateDescription vmstate_macio_oldworld = {
--
2.4.3
- [Qemu-devel] [PATCH v5 00/10] Fix device introspection regressions, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PATCH v5 09/10] qdev: Protect device-list-properties against broken devices, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PATCH v5 10/10] Revert "qdev: Use qdev_get_device_class() for -device <type>, help", Markus Armbruster, 2015/10/08
- [Qemu-devel] [PATCH v5 01/10] memory: allow destroying a non-empty MemoryRegion, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PATCH v5 03/10] macio: move DBDMA_init from instance_init to realize,
Markus Armbruster <=
- [Qemu-devel] [PATCH v5 02/10] hw: do not pass NULL to memory_region_init from instance_init, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PATCH v5 05/10] libqtest: Clean up unused QTestState member sigact_old, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PATCH v5 07/10] device-introspect-test: New, covering device introspection, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PATCH v5 06/10] libqtest: New hmp() & friends, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PATCH v5 04/10] tests: Fix how qom-test is run, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PATCH v5 08/10] qmp: Fix device-list-properties not to crash for abstract device, Markus Armbruster, 2015/10/08