search for: 4ff7ecc

Ensure the control connection exits with the same status code as virt-v2v, and return an error from start_conversion if virt-v2v failed. --- p2v/conversion.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/p2v/conversion.c b/p2v/conversion.c index 9f5a3ad..4ff7ecc 100644 --- a/p2v/conversion.c +++ b/p2v/conversion.c @@ -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);...

--- p2v/conversion.c | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/p2v/conversion.c b/p2v/conversion.c index 4ff7ecc..14e7b3b 100644 --- a/p2v/conversion.c +++ b/p2v/conversion.c @@ -398,7 +398,8 @@ wait_qemu_nbd (int nbd_local_port, int timeout_seconds) { int sockfd; int result = -1; - struct sockaddr_in addr; + int reuseaddr = 1; + struct sockaddr_in src_addr, dst_addr; time_t start_t, now_t; st...

Changes since v1: - Set probing source port to be nbd_local_port+1 instead of always using 50124 to deal with multi-disk scenario. - Set SO_REUSEADDR on client socket to avoid issues with old connections in TIME_WAIT. I've been running this for a few hours now using the updated multi-disk test and haven't seen any problems.

--- p2v/conversion.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/p2v/conversion.c b/p2v/conversion.c index 4ff7ecc..5c0c78e 100644 --- a/p2v/conversion.c +++ b/p2v/conversion.c @@ -44,6 +44,16 @@ /* How long to wait for qemu-nbd to start (seconds). */ #define WAIT_QEMU_NBD_TIMEOUT 10 +/* Source port for probing qemu-nbd. Should be one greater than + * nbd_local_port in ssh.c (50123). It's not guarantee...