From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:48625) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0Flg-0003f1-PF for qemu-devel@nongnu.org; Wed, 22 Feb 2012 12:14:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S0Flc-0008OF-6a for qemu-devel@nongnu.org; Wed, 22 Feb 2012 12:14:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:23214) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0Flb-0008O8-Sv for qemu-devel@nongnu.org; Wed, 22 Feb 2012 12:14:12 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q1MHEBwc004898 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 22 Feb 2012 12:14:11 -0500 From: Federico Simoncelli Date: Wed, 22 Feb 2012 17:13:34 +0000 Message-Id: <1329930815-7995-3-git-send-email-fsimonce@redhat.com> In-Reply-To: <1329930815-7995-1-git-send-email-fsimonce@redhat.com> References: <1329930815-7995-1-git-send-email-fsimonce@redhat.com> Subject: [Qemu-devel] [PATCH 2/3] Update the blkmirror block driver List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Federico Simoncelli , mtosatti@redhat.com Signed-off-by: Federico Simoncelli --- block/blkmirror.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/block/blkmirror.c b/block/blkmirror.c index 1c02710..1cfd2fb 100644 --- a/block/blkmirror.c +++ b/block/blkmirror.c @@ -46,7 +46,7 @@ static int blkmirror_open(BlockDriverState *bs, const char *filename, int flags) filename += strlen("blkmirror:"); /* Parse the raw image filename */ - filename2 = qemu_malloc(strlen(filename)+1); + filename2 = qemu_vmalloc(strlen(filename)+1); escape = 0; for (i = n = 0; i < strlen(filename); i++) { if (!escape && filename[i] == ':') { @@ -66,11 +66,11 @@ static int blkmirror_open(BlockDriverState *bs, const char *filename, int flags) m->bs[0] = bdrv_new(""); if (m->bs[0] == NULL) { - free(filename2); + qemu_vfree(filename2); return -ENOMEM; } ret = bdrv_open(m->bs[0], filename2, flags, NULL); - free(filename2); + qemu_vfree(filename2); if (ret < 0) { return ret; } @@ -81,7 +81,7 @@ static int blkmirror_open(BlockDriverState *bs, const char *filename, int flags) bdrv_delete(m->bs[0]); return -ENOMEM; } - ret = bdrv_open(m->bs[1], filename, flags, NULL); + ret = bdrv_open(m->bs[1], filename, flags | BDRV_O_NO_BACKING, NULL); if (ret < 0) { bdrv_delete(m->bs[0]); return ret; @@ -101,17 +101,17 @@ static void blkmirror_close(BlockDriverState *bs) } } -static int blkmirror_flush(BlockDriverState *bs) +static coroutine_fn int blkmirror_co_flush(BlockDriverState *bs) { BdrvMirrorState *m = bs->opaque; int ret; - ret = bdrv_flush(m->bs[0]); + ret = bdrv_co_flush(m->bs[0]); if (ret < 0) { return ret; } - return bdrv_flush(m->bs[1]); + return bdrv_co_flush(m->bs[1]); } static int64_t blkmirror_getlength(BlockDriverState *bs) @@ -242,18 +242,18 @@ static BlockDriverAIOCB *blkmirror_aio_flush(BlockDriverState *bs, return &dcb->common; } -static int blkmirror_discard(BlockDriverState *bs, int64_t sector_num, - int nb_sectors) +static coroutine_fn int blkmirror_co_discard(BlockDriverState *bs, + int64_t sector_num, int nb_sectors) { BdrvMirrorState *m = bs->opaque; int ret; - ret = bdrv_discard(m->bs[0], sector_num, nb_sectors); + ret = bdrv_co_discard(m->bs[0], sector_num, nb_sectors); if (ret < 0) { return ret; } - return bdrv_discard(m->bs[1], sector_num, nb_sectors); + return bdrv_co_discard(m->bs[1], sector_num, nb_sectors); } @@ -266,8 +266,8 @@ static BlockDriver bdrv_blkmirror = { .bdrv_file_open = blkmirror_open, .bdrv_close = blkmirror_close, - .bdrv_flush = blkmirror_flush, - .bdrv_discard = blkmirror_discard, + .bdrv_co_flush_to_disk = blkmirror_co_flush, + .bdrv_co_discard = blkmirror_co_discard, .bdrv_aio_readv = blkmirror_aio_readv, .bdrv_aio_writev = blkmirror_aio_writev, -- 1.7.1