On Thu, 07/13 15:42, Paolo Bonzini wrote: > On 04/07/2017 08:43, Fam Zheng wrote: > > Signed-off-by: Fam Zheng <[email protected]> > > --- > > hw/block/dataplane/virtio-blk.c | 2 +- > > hw/block/virtio-blk.c | 5 +---- > > hw/s390x/virtio-ccw.c | 2 -- > > hw/virtio/virtio-pci.c | 2 -- > > include/hw/virtio/virtio-blk.h | 3 ++- > > 5 files changed, 4 insertions(+), 10 deletions(-) > > > > diff --git a/hw/block/dataplane/virtio-blk.c > > b/hw/block/dataplane/virtio-blk.c > > index 5556f0e..6fdc6f6 100644 > > --- a/hw/block/dataplane/virtio-blk.c > > +++ b/hw/block/dataplane/virtio-blk.c > > @@ -116,7 +116,7 @@ void virtio_blk_data_plane_create(VirtIODevice *vdev, > > VirtIOBlkConf *conf, > > s->conf = conf; > > > > if (conf->iothread) { > > - s->iothread = conf->iothread; > > + s->iothread = IOTHREAD(conf->iothread); > > object_ref(OBJECT(s->iothread)); > > s->ctx = iothread_get_aio_context(s->iothread); > > } else { > > diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c > > index c0bd247..8146306 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", "/disk@0,0", > > DEVICE(obj), NULL); > > @@ -1014,6 +1010,7 @@ 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), > > DEFINE_PROP_END_OF_LIST(), > > }; > > > > diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c > > index 90d37cb..a17ce84 100644 > > --- a/hw/s390x/virtio-ccw.c > > +++ b/hw/s390x/virtio-ccw.c > > @@ -789,8 +789,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 301920e..984baf8 100644 > > --- a/hw/virtio/virtio-pci.c > > +++ b/hw/virtio/virtio-pci.c > > @@ -1996,8 +1996,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); > > } > > diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h > > index d3c8a6f..2452074 100644 > > --- a/include/hw/virtio/virtio-blk.h > > +++ b/include/hw/virtio/virtio-blk.h > > @@ -33,7 +33,8 @@ struct virtio_blk_inhdr > > struct VirtIOBlkConf > > { > > BlockConf conf; > > - IOThread *iothread; > > + /* IOThread pointer to be filled by link property */ > > + Object *iothread; > > Is this necessary? Can we instead add a type argument to the > DEFINE_PROP_LINK macro, or just cast something to void*? > > I understand this means the series risks missing 2.10 (but I can send a > second pull request just for it tomorrow too).
OK, will send v4 today. Fam
