[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 06/20] virtio-blk: Convert to DEFINE_PROP_LINK
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v4 06/20] virtio-blk: Convert to DEFINE_PROP_LINK |
Date: |
Fri, 14 Jul 2017 10:14:55 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
---
hw/block/virtio-blk.c | 6 ++----
hw/s390x/virtio-ccw.c | 2 --
hw/virtio/virtio-pci.c | 2 --
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index c0bd247..b750bd8 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -983,10 +983,6 @@ static void virtio_blk_instance_init(Object *obj)
{
VirtIOBlock *s = VIRTIO_BLK(obj);
- object_property_add_link(obj, "iothread", TYPE_IOTHREAD,
- (Object **)&s->conf.iothread,
- qdev_prop_allow_set_link_before_realize,
- OBJ_PROP_LINK_UNREF_ON_RELEASE, NULL);
device_add_bootindex_property(obj, &s->conf.conf.bootindex,
"bootindex", "/address@hidden,0",
DEVICE(obj), NULL);
@@ -1014,6 +1010,8 @@ static Property virtio_blk_properties[] = {
DEFINE_PROP_BIT("request-merging", VirtIOBlock, conf.request_merging, 0,
true),
DEFINE_PROP_UINT16("num-queues", VirtIOBlock, conf.num_queues, 1),
+ DEFINE_PROP_LINK("iothread", VirtIOBlock, conf.iothread, TYPE_IOTHREAD,
+ IOThread *),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index e18fd26..a0437d1 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -867,8 +867,6 @@ static void virtio_ccw_blk_instance_init(Object *obj)
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
TYPE_VIRTIO_BLK);
- object_property_add_alias(obj, "iothread", OBJECT(&dev->vdev),"iothread",
- &error_abort);
object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),
"bootindex", &error_abort);
}
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 93480a7..94f72f3 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -2000,8 +2000,6 @@ static void virtio_blk_pci_instance_init(Object *obj)
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
TYPE_VIRTIO_BLK);
- object_property_add_alias(obj, "iothread", OBJECT(&dev->vdev),"iothread",
- &error_abort);
object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),
"bootindex", &error_abort);
}
--
2.9.4
- [Qemu-devel] [PATCH v4 00/20] qdev: Introduce DEFINE_PROP_LINK, Fam Zheng, 2017/07/13
- [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 <=
- [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, 2017/07/13
- [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