[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 53/55] mips_cmgcr: Convert to DEFINE_PROP_LINK
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 53/55] mips_cmgcr: Convert to DEFINE_PROP_LINK |
Date: |
Fri, 14 Jul 2017 12:10:26 +0200 |
From: Fam Zheng <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/misc/mips_cmgcr.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c
index a1edb53..211f609 100644
--- a/hw/misc/mips_cmgcr.c
+++ b/hw/misc/mips_cmgcr.c
@@ -181,18 +181,6 @@ static void mips_gcr_init(Object *obj)
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
MIPSGCRState *s = MIPS_GCR(obj);
- object_property_add_link(obj, "gic", TYPE_MEMORY_REGION,
- (Object **)&s->gic_mr,
- qdev_prop_allow_set_link_before_realize,
- OBJ_PROP_LINK_UNREF_ON_RELEASE,
- &error_abort);
-
- object_property_add_link(obj, "cpc", TYPE_MEMORY_REGION,
- (Object **)&s->cpc_mr,
- qdev_prop_allow_set_link_before_realize,
- OBJ_PROP_LINK_UNREF_ON_RELEASE,
- &error_abort);
-
memory_region_init_io(&s->iomem, OBJECT(s), &gcr_ops, s,
"mips-gcr", GCR_ADDRSPACE_SZ);
sysbus_init_mmio(sbd, &s->iomem);
@@ -227,6 +215,10 @@ static Property mips_gcr_properties[] = {
DEFINE_PROP_INT32("num-vp", MIPSGCRState, num_vps, 1),
DEFINE_PROP_INT32("gcr-rev", MIPSGCRState, gcr_rev, 0x800),
DEFINE_PROP_UINT64("gcr-base", MIPSGCRState, gcr_base, GCR_BASE_ADDR),
+ DEFINE_PROP_LINK("gic", MIPSGCRState, gic_mr, TYPE_MEMORY_REGION,
+ MemoryRegion *),
+ DEFINE_PROP_LINK("cpc", MIPSGCRState, cpc_mr, TYPE_MEMORY_REGION,
+ MemoryRegion *),
DEFINE_PROP_END_OF_LIST(),
};
--
1.8.3.1
- [Qemu-devel] [PULL 45/55] qmp: Use ObjectProperty.type if present, (continued)
- [Qemu-devel] [PULL 45/55] qmp: Use ObjectProperty.type if present, Paolo Bonzini, 2017/07/14
- [Qemu-devel] [PULL 44/55] qdev: Introduce DEFINE_PROP_LINK, Paolo Bonzini, 2017/07/14
- [Qemu-devel] [PULL 23/55] mttcg/i386: Patch instruction using async_safe_* framework, Paolo Bonzini, 2017/07/14
- [Qemu-devel] [PULL 46/55] qdev: Add const qualifier to PropertyInfo definitions, Paolo Bonzini, 2017/07/14
- [Qemu-devel] [PULL 47/55] virtio-blk: Convert to DEFINE_PROP_LINK, Paolo Bonzini, 2017/07/14
- [Qemu-devel] [PULL 49/55] virtio-rng: Convert to DEFINE_PROP_LINK, Paolo Bonzini, 2017/07/14
- [Qemu-devel] [PULL 51/55] dimm: Convert to DEFINE_PROP_LINK, Paolo Bonzini, 2017/07/14
- [Qemu-devel] [PULL 48/55] virtio-scsi: Convert to DEFINE_PROP_LINK, Paolo Bonzini, 2017/07/14
- [Qemu-devel] [PULL 50/55] virtio-crypto: Convert to DEFINE_PROP_LINK, Paolo Bonzini, 2017/07/14
- [Qemu-devel] [PULL 52/55] ivshmem: Convert to DEFINE_PROP_LINK, Paolo Bonzini, 2017/07/14
- [Qemu-devel] [PULL 53/55] mips_cmgcr: Convert to DEFINE_PROP_LINK,
Paolo Bonzini <=
- [Qemu-devel] [PULL 54/55] cpu: Convert to DEFINE_PROP_LINK, Paolo Bonzini, 2017/07/14
- [Qemu-devel] [PULL 55/55] spapr_rng: Convert to DEFINE_PROP_LINK, Paolo Bonzini, 2017/07/14
- Re: [Qemu-devel] [PULL v2 00/55] Misc patches for QEMU 2.10 soft freeze, Peter Maydell, 2017/07/14