From: Paolo Bonzini Date: Thu, 1 Oct 2015 08:59:52 +0000 (+0200) Subject: macio: move DBDMA_init from instance_init to realize X-Git-Tag: TizenStudio_2.0_p2.3.2~174^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db97d9d886f7e16571e5eb242d814b6d345affb2;p=sdk%2Femulator%2Fqemu.git macio: move DBDMA_init from instance_init to realize 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 Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Signed-off-by: Markus Armbruster Message-Id: <1443689999-12182-4-git-send-email-armbru@redhat.com> (cherry picked from commit c7104402353bf32ac1d3a276e3619a20e910506b) Signed-off-by: Michael Roth --- 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 = {