Commit e84a0dd5 authored Oct 09, 2016 by Xu Tian Committed by Kevin Wolf Oct 24, 2016

block: failed qemu-img command should return non-zero exit code



If the backing file cannot be opened when doing qemu-img rebase, the
variable 'ret' was not assigned a non-zero value, and the qemu-img
process terminated with exit code zero. Fix this.

Signed-off-by: Xu Tian <xutian@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

parent a3ae21ec

qemu-img.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -2956,6 +2956,7 @@ static int img_rebase(int argc, char **argv)
		error_reportf_err(local_err,
		"Could not open old backing file '%s': ",
		backing_name);
		ret = -1;
		goto out;
		}

		@@ -2973,6 +2974,7 @@ static int img_rebase(int argc, char **argv)
		error_reportf_err(local_err,
		"Could not open new backing file '%s': ",
		out_baseimg);
		ret = -1;
		goto out;
		}
		}