search for: wait_prompt

(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,

A mixed bag, but all the patches make sense together! Patch 1: Fix a bug that Tingting found: https://bugzilla.redhat.com/show_bug.cgi?id=1256222 Patch 2: Revert a patch that makes no sense now that we've added virt-v2v into base RHEL. This is just included because it's a cleanup needed before applying patch 3. Patch 3: Add the ability to use SSH identities (private keys) for virt-p2v

Fixes https://bugzilla.redhat.com/1256222

Fix and/or document issues raised in this thread: https://www.redhat.com/archives/libguestfs/2017-February/msg00010.html Rich.

...!WIFEXITED (r)) + error (EXIT_FAILURE, 0, + "%s: unexpected failure of external command", stage); } diff --git a/p2v/ssh.c b/p2v/ssh.c index 6ddfcb2..7158e70 100644 --- a/p2v/ssh.c +++ b/p2v/ssh.c @@ -415,10 +415,8 @@ start_ssh (struct config *config, char **extra_args, int wait_prompt) */ r = pcre_get_substring (h->buffer, ovector, mexp_get_pcre_error (h), 1, &matched); - if (r < 0) { - fprintf (stderr, "error: PCRE error reading substring (%d)\n", r); - exit (EXIT_FAILURE); - } + if (...

...tity_file); - if (fd == -1) { - perror ("mkstemp"); - exit (EXIT_FAILURE); - } + if (fd == -1) + error (EXIT_FAILURE, errno, "mkstemp"); close (fd); /* Curl download URL to file. */ @@ -299,10 +286,8 @@ start_ssh (struct config *config, char **extra_args, int wait_prompt) else nr_args += 13; args = malloc (sizeof (char *) * nr_args); - if (args == NULL) { - perror ("malloc"); - exit (EXIT_FAILURE); - } + if (args == NULL) + error (EXIT_FAILURE, errno, "malloc"); j = 0; args[j++] = "ssh"; @@ -716,16 +701,1...

libguestfs has used double and triple underscores in identifiers. These aren't valid for global names in C++. (http://stackoverflow.com/a/228797) These large but completely mechanical patches change the illegal identifiers to legal ones. Rich.

Now that virt-p2v has its own repository [1] and releases [2], it is time to remove it from libguestfs. [1] https://github.com/libguestfs/virt-p2v [2] http://download.libguestfs.org/virt-p2v/ Pino Toscano (2): Remove virt-p2v Remove remaining virt-p2v bits .gitignore | 4 - Makefile.am | 7 +- bash/Makefile.am