diff options
| author | Xu Tian | 2016-10-09 11:17:27 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2016-10-24 17:54:03 +0200 |
| commit | e84a0dd5a75d8e89bec05fac432941988191df32 (patch) | |
| tree | a73eb5b4fc433aee78f74cc923b37835233aeed9 | |
| parent | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff) | |
| download | qemu-e84a0dd5a75d8e89bec05fac432941988191df32.tar.gz qemu-e84a0dd5a75d8e89bec05fac432941988191df32.tar.xz qemu-e84a0dd5a75d8e89bec05fac432941988191df32.zip | |
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>
| -rw-r--r-- | qemu-img.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qemu-img.c b/qemu-img.c index 67e851248a..ab395a9b1a 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -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; } } |
