From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49934) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSRsP-0000kd-Nx for qemu-devel@nongnu.org; Thu, 10 May 2012 07:49:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSRsN-0006BP-LX for qemu-devel@nongnu.org; Thu, 10 May 2012 07:49:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18292) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSRsN-0006BA-DS for qemu-devel@nongnu.org; Thu, 10 May 2012 07:49:43 -0400 From: Kevin Wolf Date: Thu, 10 May 2012 13:49:08 +0200 Message-Id: <1336650574-12835-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1336650574-12835-1-git-send-email-kwolf@redhat.com> References: <1336650574-12835-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 04/30] block: push bdrv_change_backing_file error checking up from drivers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Paolo Bonzini This check applies to all drivers, but QED lacks it. Reviewed-by: Kevin Wolf Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- block.c | 5 +++++ block/qcow2.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/block.c b/block.c index a307fe1..068e41d 100644 --- a/block.c +++ b/block.c @@ -1460,6 +1460,11 @@ int bdrv_change_backing_file(BlockDriverState *bs, { BlockDriver *drv = bs->drv; + /* Backing file format doesn't make sense without a backing file */ + if (backing_fmt && !backing_file) { + return -EINVAL; + } + if (drv->bdrv_change_backing_file != NULL) { return drv->bdrv_change_backing_file(bs, backing_file, backing_fmt); } else { diff --git a/block/qcow2.c b/block/qcow2.c index ee4678f..3bae2d8 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1011,11 +1011,6 @@ fail: static int qcow2_change_backing_file(BlockDriverState *bs, const char *backing_file, const char *backing_fmt) { - /* Backing file format doesn't make sense without a backing file */ - if (backing_fmt && !backing_file) { - return -EINVAL; - } - pstrcpy(bs->backing_file, sizeof(bs->backing_file), backing_file ?: ""); pstrcpy(bs->backing_format, sizeof(bs->backing_format), backing_fmt ?: ""); -- 1.7.6.5