From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQGIf-0001FQ-7f for qemu-devel@nongnu.org; Wed, 19 Mar 2014 09:12:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQGIY-0003kz-Nc for qemu-devel@nongnu.org; Wed, 19 Mar 2014 09:12:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37249) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQGIY-0003kq-FE for qemu-devel@nongnu.org; Wed, 19 Mar 2014 09:12:46 -0400 From: Kevin Wolf Date: Wed, 19 Mar 2014 14:12:07 +0100 Message-Id: <1395234727-6841-9-git-send-email-kwolf@redhat.com> In-Reply-To: <1395234727-6841-1-git-send-email-kwolf@redhat.com> References: <1395234727-6841-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 8/8] dataplane: fix implicit IOThread refcount List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, anthony@codemonkey.ws From: Stefan Hajnoczi When creating an IOThread implicitly (the user did not specify x-iothread=) remember that iothread_find() does not return the object with an incremented refcount. Signed-off-by: Stefan Hajnoczi Reviewed-by: Fam Zheng Signed-off-by: Kevin Wolf --- hw/block/dataplane/virtio-blk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c index a5afc21..f558b45 100644 --- a/hw/block/dataplane/virtio-blk.c +++ b/hw/block/dataplane/virtio-blk.c @@ -393,7 +393,6 @@ void virtio_blk_data_plane_create(VirtIODevice *vdev, VirtIOBlkConf *blk, if (blk->iothread) { s->internal_iothread = false; s->iothread = blk->iothread; - object_ref(OBJECT(s->iothread)); } else { /* Create per-device IOThread if none specified */ Error *local_err = NULL; @@ -408,6 +407,7 @@ void virtio_blk_data_plane_create(VirtIODevice *vdev, VirtIOBlkConf *blk, s->iothread = iothread_find(vdev->name); assert(s->iothread); } + object_ref(OBJECT(s->iothread)); s->ctx = iothread_get_aio_context(s->iothread); /* Prevent block operations that conflict with data plane thread */ -- 1.8.3.1