mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

p2v: show error dialog if virt-v2v fails (RHBZ#1167601)

Browse Source 
Ensure the control connection exits with the same status code as
virt-v2v, and return an error from start_conversion if virt-v2v
failed.
This commit is contained in:
John Eckersberg
2014-12-11 08:38:49 -05:00
committed by Richard W.M. Jones
parent 3d7ea11272
commit 841aa0faf3
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
p2v/conversion.c
View File

@@ -100,6 +100,7 @@ start_conversion (struct config *config,
void (*notify_ui) (int type, const char *data))
{
int ret = -1;
int status;
size_t i, len;
size_t nr_disks = guestfs___count_strings (config->disks);
struct data_conn data_conns[nr_disks];
@@ -276,7 +277,7 @@ start_conversion (struct config *config,
if (mexp_printf (control_h, " ) | tee %s/virt-v2v-conversion-log.txt",
remote_dir) == -1)
goto printf_fail;
if (mexp_printf (control_h, "; exit") == -1)
if (mexp_printf (control_h, "; exit $(< %s/status)", remote_dir) == -1)
goto printf_fail;
if (mexp_printf (control_h, "\n") == -1)
goto printf_fail;
@@ -313,8 +314,18 @@ start_conversion (struct config *config,
ret = 0;
out:
if (control_h)
mexp_close (control_h);
if (control_h) {
if ((status = mexp_close (control_h)) == -1) {
set_conversion_error ("mexp_close: %m");
ret = -1;
} else if (ret == 0 &&
WIFEXITED (status) &&
WEXITSTATUS (status) != 0) {
set_conversion_error ("virt-v2v exited with status %d",
WEXITSTATUS (status));
ret = -1;
}
}
cleanup_data_conns (data_conns, nr_disks);
return ret;
}