[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 47/55] virtio-blk: Convert to DEFINE_PROP_LINK
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 47/55] virtio-blk: Convert to DEFINE_PROP_LINK |
Date: |
Fri, 14 Jul 2017 12:10:20 +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/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);
}
--
1.8.3.1
- [Qemu-devel] [PULL v2 00/55] Misc patches for QEMU 2.10 soft freeze, Paolo Bonzini, 2017/07/14
- [Qemu-devel] [PULL 22/55] Revert "exec.c: Fix breakpoint invalidation race", Paolo Bonzini, 2017/07/14
- [Qemu-devel] [PULL 43/55] qdev: Introduce PropertyInfo.create, Paolo Bonzini, 2017/07/14
- [Qemu-devel] [PULL 42/55] qom: enforce readonly nature of link's check callback, Paolo Bonzini, 2017/07/14
- [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 <=
- [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, 2017/07/14
- [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