From 5f3777945d22248d805fb7c134e206c2d943b77b Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 12 Apr 2012 14:01:01 +0200 Subject: [PATCH] block: push bdrv_change_backing_file error checking up from drivers 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 ?: ""); -- 2.7.4