[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 11/20] ivshmem: Convert to DEFINE_PROP_LINK
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v4 11/20] ivshmem: Convert to DEFINE_PROP_LINK |
Date: |
Fri, 14 Jul 2017 10:15:00 +0800 |
Unlike the usual object_property_add_link() invocations in other
devices, ivshmem checks the "is mapped" state of the backend in addition
to qdev_prop_allow_set_link_before_realize. To convert it without
specializing DEFINE_PROP_LINK which always uses the qdev callback, move
the extra check to device realize time.
Signed-off-by: Fam Zheng <address@hidden>
---
hw/misc/ivshmem.c | 24 +++++++-----------------
1 file changed, 7 insertions(+), 17 deletions(-)
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index 97beaf6..4b38248 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -1009,18 +1009,6 @@ static const TypeInfo ivshmem_common_info = {
.class_init = ivshmem_common_class_init,
};
-static void ivshmem_check_memdev_is_busy(const Object *obj, const char *name,
- Object *val, Error **errp)
-{
- if (host_memory_backend_is_mapped(MEMORY_BACKEND(val))) {
- char *path = object_get_canonical_path_component(val);
- error_setg(errp, "can't use already busy memdev: %s", path);
- g_free(path);
- } else {
- qdev_prop_allow_set_link_before_realize(obj, name, val, errp);
- }
-}
-
static const VMStateDescription ivshmem_plain_vmsd = {
.name = TYPE_IVSHMEM_PLAIN,
.version_id = 0,
@@ -1037,6 +1025,8 @@ static const VMStateDescription ivshmem_plain_vmsd = {
static Property ivshmem_plain_properties[] = {
DEFINE_PROP_ON_OFF_AUTO("master", IVShmemState, master, ON_OFF_AUTO_OFF),
+ DEFINE_PROP_LINK("memdev", IVShmemState, hostmem, TYPE_MEMORY_BACKEND,
+ HostMemoryBackend *),
DEFINE_PROP_END_OF_LIST(),
};
@@ -1044,11 +1034,6 @@ static void ivshmem_plain_init(Object *obj)
{
IVShmemState *s = IVSHMEM_PLAIN(obj);
- object_property_add_link(obj, "memdev", TYPE_MEMORY_BACKEND,
- (Object **)&s->hostmem,
- ivshmem_check_memdev_is_busy,
- OBJ_PROP_LINK_UNREF_ON_RELEASE,
- &error_abort);
s->not_legacy_32bit = 1;
}
@@ -1059,6 +1044,11 @@ static void ivshmem_plain_realize(PCIDevice *dev, Error
**errp)
if (!s->hostmem) {
error_setg(errp, "You must specify a 'memdev'");
return;
+ } else if (host_memory_backend_is_mapped(s->hostmem)) {
+ char *path = object_get_canonical_path_component(OBJECT(s->hostmem));
+ error_setg(errp, "can't use already busy memdev: %s", path);
+ g_free(path);
+ return;
}
ivshmem_common_realize(dev, errp);
--
2.9.4
- [Qemu-devel] [PATCH v4 01/20] qom: enforce readonly nature of link's check callback, (continued)
- [Qemu-devel] [PATCH v4 01/20] qom: enforce readonly nature of link's check callback, Fam Zheng, 2017/07/13
- [Qemu-devel] [PATCH v4 03/20] qdev: Introduce DEFINE_PROP_LINK, Fam Zheng, 2017/07/13
- [Qemu-devel] [PATCH v4 02/20] qdev: Introduce PropertyInfo.create, Fam Zheng, 2017/07/13
- [Qemu-devel] [PATCH v4 04/20] qmp: Use ObjectProperty.type if present, Fam Zheng, 2017/07/13
- [Qemu-devel] [PATCH v4 05/20] qdev: Add const qualifier to PropertyInfo definitions, Fam Zheng, 2017/07/13
- [Qemu-devel] [PATCH v4 06/20] virtio-blk: Convert to DEFINE_PROP_LINK, Fam Zheng, 2017/07/13
- [Qemu-devel] [PATCH v4 07/20] virtio-scsi: Convert to DEFINE_PROP_LINK, Fam Zheng, 2017/07/13
- [Qemu-devel] [PATCH v4 08/20] virtio-rng: Convert to DEFINE_PROP_LINK, Fam Zheng, 2017/07/13
- [Qemu-devel] [PATCH v4 09/20] virtio-crypto: Convert to DEFINE_PROP_LINK, Fam Zheng, 2017/07/13
- [Qemu-devel] [PATCH v4 10/20] dimm: Convert to DEFINE_PROP_LINK, Fam Zheng, 2017/07/13
- [Qemu-devel] [PATCH v4 11/20] ivshmem: Convert to DEFINE_PROP_LINK,
Fam Zheng <=
- [Qemu-devel] [PATCH v4 12/20] armv7m: Convert bitband.source-mamory to DEFINE_PROP_LINK, Fam Zheng, 2017/07/13
- [Qemu-devel] [PATCH v4 13/20] armv7m: Convert armv7m.memory to DEFINE_PROP_LINK, Fam Zheng, 2017/07/13
- [Qemu-devel] [PATCH v4 14/20] gicv3: Convert to DEFINE_PROP_LINK, Fam Zheng, 2017/07/13
- [Qemu-devel] [PATCH v4 16/20] xilinx_axienet: Convert to DEFINE_PROP_LINK, Fam Zheng, 2017/07/13
- [Qemu-devel] [PATCH v4 15/20] xlnx_zynqmp: Convert to DEFINE_PROP_LINK, Fam Zheng, 2017/07/13
- [Qemu-devel] [PATCH v4 17/20] xilinx_axidma: Convert to DEFINE_PROP_LINK, Fam Zheng, 2017/07/13
- [Qemu-devel] [PATCH v4 18/20] mips_cmgcr: Convert to DEFINE_PROP_LINK, Fam Zheng, 2017/07/13
- [Qemu-devel] [PATCH v4 19/20] cpu: Convert to DEFINE_PROP_LINK, Fam Zheng, 2017/07/13
- [Qemu-devel] [PATCH v4 20/20] spapr_rng: Convert to DEFINE_PROP_LINK, Fam Zheng, 2017/07/13
- Re: [Qemu-devel] [PATCH v4 00/20] qdev: Introduce DEFINE_PROP_LINK, Paolo Bonzini, 2017/07/14