search for: wait_qemu_nbd

--- 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; struct timeval timeout = { .tv_usec = 0 }; char magic[8]; /* NBDMAGIC */ @@ -413,10 +414,40 @@...

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.

...| 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 guaranteed to always + * bind to 50124, but it will hint the kernel to start there and try + * incrementally higher ports if needed. This avoids the case where + * the k...

...s.h> #include <sys/wait.h> +#include <arpa/inet.h> +#include <netinet/in.h> #include <glib.h> @@ -49,6 +51,7 @@ struct data_conn { static int send_quoted (mexp_h *, const char *s); static pid_t start_qemu_nbd (int nbd_local_port, const char *device); +static int wait_qemu_nbd (int nbd_local_port, int timeout_seconds); static void cleanup_data_conns (struct data_conn *data_conns, size_t nr); static char *generate_libvirt_xml (struct config *, struct data_conn *); static const char *map_interface_to_network (struct config *, const char *interface); @@ -156,6 +159,12 @@...

qemu-nbd is a fine NBD server. However it's not easy to compile a reliably working version on RHEL 5. This patch series allows nbdkit to be used as an alternative (qemu-nbd is still the default). Rich.

(I don't have a BZ# for this yet, but I'm expecting it to be filed as an RFE) Currently if the user is in the virt-p2v GUI and cancels the conversion, all that happens is we abruptly close the ssh session to virt-v2v. That is bad .. possibly (or maybe not). But in any case there is an alternative: we can send a ^C key to the virt-v2v process, which it could catch and handle gracefully,

In the run dialog, I have implemented an ANSI colour escape sequence interpreter, so that colours displayed by the remote virt-v2v are now shown to the user. (https://bugzilla.redhat.com/show_bug.cgi?id=1314244) This requires virt-v2v to send colours. It wasn't doing that because the output was a pipe (as we capture the output into the log file). So I added a global --colours option to make

...caml_local_roots = caml__frame; \ + return (caml__temp_result); \ + }while(0) #endif /* These prototypes are solely to quiet gcc warning. */ diff --git a/p2v/conversion.c b/p2v/conversion.c index b19bd49..e2f37cd 100644 --- a/p2v/conversion.c +++ b/p2v/conversion.c @@ -584,7 +584,7 @@ wait_qemu_nbd (int nbd_local_port, int timeout_seconds) } result = 0; -cleanup: + cleanup: close (sockfd); return result; @@ -615,25 +615,25 @@ cleanup_data_conns (struct data_conn *data_conns, size_t nr) /* Macros "inspired" by src/launch-libvirt.c */ /* <element */ -#define sta...

Result of earlier copy and paste. --- align/scan.c | 35 ++++++++++--------- cat/cat.c | 39 +++++++++++---------- cat/filesystems.c | 69 +++++++++++++++++++------------------- cat/log.c | 35 ++++++++++--------- cat/ls.c | 61 +++++++++++++++++---------------- df/main.c | 43 ++++++++++++------------ diff/diff.c | 67