From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58030) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFoqr-0001Ni-Bo for qemu-devel@nongnu.org; Thu, 05 Apr 2012 11:44:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SFoqj-0005ZV-1f for qemu-devel@nongnu.org; Thu, 05 Apr 2012 11:43:56 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:43649) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFoqh-0005YW-II for qemu-devel@nongnu.org; Thu, 05 Apr 2012 11:43:48 -0400 Received: by pbcuo5 with SMTP id uo5so1867657pbc.4 for ; Thu, 05 Apr 2012 08:43:27 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 5 Apr 2012 17:43:00 +0200 Message-Id: <1333640581-25649-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1333640581-25649-1-git-send-email-pbonzini@redhat.com> References: <1333640581-25649-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 6/7] block: push bdrv_change_backing_file error checking up from drivers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- block.c | 5 +++++ block/qcow2.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/block.c b/block.c index e806ad8..e293882 100644 --- a/block.c +++ b/block.c @@ -1403,6 +1403,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 70d3141..342d8ff 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -843,11 +843,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.9.3