Attachment #343372 for bug #460244

Lines 544-549 static void qemu_rbd_close(BlockDriverSt Link Here

(-)a/block/rbd.c (-1 / +4 lines)
544	{	544	{
545	BDRVRBDState *s = bs->opaque;	545	BDRVRBDState *s = bs->opaque;
546		546
		547	if (!s->image)
		548	return;
		549
547	close(s->fds[0]);	550	close(s->fds[0]);
548	close(s->fds[1]);	551	close(s->fds[1]);
549	qemu_aio_set_fd_handler(s->fds[RBD_FD_READ], NULL, NULL, NULL, NULL);	552	qemu_aio_set_fd_handler(s->fds[RBD_FD_READ], NULL, NULL, NULL, NULL);
Lines 766-772 static int qemu_rbd_co_flush(BlockDriver Link Here
766	#if LIBRBD_VERSION_CODE >= LIBRBD_VERSION(0, 1, 1)	769	#if LIBRBD_VERSION_CODE >= LIBRBD_VERSION(0, 1, 1)
767	/* rbd_flush added in 0.1.1 */	770	/* rbd_flush added in 0.1.1 */
768	BDRVRBDState *s = bs->opaque;	771	BDRVRBDState *s = bs->opaque;
769	return rbd_flush(s->image);	772	return s->image ? rbd_flush(s->image) : 0;
770	#else	773	#else
771	return 0;	774	return 0;
772	#endif	775	#endif

Return to bug 460244