Merge branch '1.5' into 2.0

This commit is contained in:
Julien Duponchelle
2016-05-02 16:59:56 +02:00
8 changed files with 180 additions and 64 deletions

View File

@ -1261,6 +1261,8 @@ class QemuVM(BaseVM):
"backing_file={}".format(disk_image),
"-f", "qcow2", disk)
retcode = yield from process.wait()
if retcode is not None and retcode != 0:
raise QemuError("Could not create {} disk image".format(disk_name))
log.info("{} returned with {}".format(qemu_img_path, retcode))
except (OSError, subprocess.SubprocessError) as e:
raise QemuError("Could not create {} disk image {}".format(disk_name, e))