search for: start_conversion

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 *confi...

After debugging a virt-p2v issue with a customer in the middle of the night on Tuesday, I felt it would have been helpful to know exactly which version(s) of virt-p2v and virt-v2v they were using. That wasn't very clear from the log file I was provided with, so this change makes sure the information is included every time. Rich.

Run sudo with -n (non-interactive), so it will fail right away when not configured to not require a password. This will avoid the connection to time out. --- p2v/ssh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p2v/ssh.c b/p2v/ssh.c index b432cbd..c6bf306 100644 --- a/p2v/ssh.c +++ b/p2v/ssh.c @@ -490,7 +490,7 @@ test_connection (struct config *config) */ if

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

...(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 @@ start_conversion (struct config *config, if (data_conns[i].nbd_pid == 0) goto out; + /* Wait for qemu-nbd to listen */ + if (wait_qemu_nbd (data_conns[i].nbd_local_port, WAIT_QEMU_NBD_TIMEOUT) == -1) { + set_conversion_error("unable to connect to qemu-nbd"); + goto out; +...

...$(PCRE_LIBS) \ $(LIBXML2_LIBS) \ $(GTK_LIBS) \ + $(DBUS_LIBS) \ ../gnulib/lib/libgnu.la # Scripts to build the disk image, USB key, or kickstart. diff --git a/p2v/conversion.c b/p2v/conversion.c index 3be9a45..a5b6769 100644 --- a/p2v/conversion.c +++ b/p2v/conversion.c @@ -208,6 +208,7 @@ start_conversion (struct config *config, char libvirt_xml_file[] = "/tmp/p2v.XXXXXX/physical.xml"; char wrapper_script[] = "/tmp/p2v.XXXXXX/virt-v2v-wrapper.sh"; char dmesg_file[] = "/tmp/p2v.XXXXXX/dmesg"; + int inhibit_fd = -1; #if DEBUG_STDERR print_config (c...

...ram_name); + fprintf (stderr, "virt-p2v looked in /sys/block and in p2v.disks on the kernel command line.\n"); + fprintf (stderr, "This is a fatal error and virt-p2v cannot continue.\n"); + exit (EXIT_FAILURE); + } + /* Perform the conversion in text mode. */ if (start_conversion (config, notify_ui_callback) == -1) { const char *err = get_conversion_error (); diff --git a/p2v/main.c b/p2v/main.c index be32e4b..12ffd01 100644 --- a/p2v/main.c +++ b/p2v/main.c @@ -279,7 +279,8 @@ set_config_defaults (struct config *config) config->flags = 0; find_all_disks (...

...t a/p2v/conversion.c b/p2v/conversion.c index e2f37cd..f781921 100644 --- a/p2v/conversion.c +++ b/p2v/conversion.c @@ -37,6 +37,8 @@ #include <libxml/xmlwriter.h> +#include "ignore-value.h" + #include "miniexpect.h" #include "p2v.h" @@ -129,6 +131,10 @@ start_conversion (struct config *config, time_t now; struct tm tm; mexp_h *control_h = NULL; + char dmesg_file[] = "/tmp/dmesg.XXXXXX"; + char dmesg_cmd[64]; + CLEANUP_FREE char *dmesg = NULL; + int fd, r; #if DEBUG_STDERR print_config (config, stderr); @@ -230,11 +236,35 @@ start_conve...

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

...set_ssh_error ("mexp_printf: %m"); > mexp_close (h); > return -1; ACK, but to be on the safe side shouldn't we also need to do the same thing for the 'virt-v2v --machine-readable' command, and also for the final virt-v2v command that runs from conversion.c:start_conversion? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc...

As the subject says, support socket activation in virt-p2v. I have added upstream support for socket activation to nbdkit already: https://github.com/libguestfs/nbdkit/commit/7ff39d028c6359f5c0925ed2cf4a2c4c751af2e4 I posted a patch for qemu-nbd, still waiting on more reviews for that one: https://www.mail-archive.com/qemu-devel@nongnu.org/msg427246.html I tested this against old and new qemu

See individual patches for details. Pino Toscano (5): Include signal.h Remove unused variables Push -Wsuggest-attribute=noreturn only with GCC tests: do not set libguestfs environment variables Define the GCC version macro Makefile.am | 2 +- conversion.c | 3 +++ p2v.h | 7 +++++++ ssh.c | 8 +++++--- 4 files changed, 16 insertions(+), 4 deletions(-) -- 2.21.0

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.

...: char buf[sizeof ("/dev/fd/%d") + sizeof(int)*3]; It will be slightly bigger than needed, but still short enough. > diff --git a/p2v/conversion.c b/p2v/conversion.c > index f5c518a..8e90ef5 100644 > --- a/p2v/conversion.c > +++ b/p2v/conversion.c > @@ -167,7 +167,7 @@ start_conversion (struct config *config, > int status; > size_t i, len; > size_t nr_disks = guestfs_int_count_strings (config->disks); > - struct data_conn data_conns[nr_disks]; > + CLEANUP_FREE struct data_conn *data_conns; Missing "= NULL" here. > diff --git a/src/appli...

... and a small initial patch which makes it easier to test virt-p2v without having to start up a virtual machine. There is still a bug in Gtk 3 where the GtkTextView on the final (running) dialog ignores gtk_widget_set_size_request and so the window appears just a single pixel high. Rich.

This is basically the same as what I posted earlier today. The main difference is I split out the GDK thread sychronization (removal of) changes from the other Gtk 2/3 changes, which should make it a bit easier to review. Gtk 3 is still not quite perfect. Apart from the problem with the GtkTextView noted before, there are also vertical alignment and padding problems with labels in GtkGrid

...read (fd[0], buffer, sizeof buffer)) > 0) { + while ((r = read (fd[0], buffer, BUFSIZ)) > 0) { *bytes_rtn += r; } if (r == -1) { diff --git a/p2v/conversion.c b/p2v/conversion.c index f5c518a..8e90ef5 100644 --- a/p2v/conversion.c +++ b/p2v/conversion.c @@ -167,7 +167,7 @@ start_conversion (struct config *config, int status; size_t i, len; size_t nr_disks = guestfs_int_count_strings (config->disks); - struct data_conn data_conns[nr_disks]; + CLEANUP_FREE struct data_conn *data_conns; CLEANUP_FREE char *remote_dir = NULL, *libvirt_xml = NULL; time_t now; struct...

In an effort to reduce the code, start to use few bits of GLib: - replace the gnulib c-type module - replace the gnulib getprogname module - use g_spawn_sync to launch curl, and drop a file reading function Pino Toscano (6): Include glib.h in p2v.h Use g_ascii_isspace instead of c_isspace from gnulib Use g_get_prgname instead of getprogname from gnulib build: remove no more used gnulib

Various changes/fixes to use smaller stack frames. Rich.

See individual patches for details. Pino Toscano (4): Add valgrind suppression file podwrapper: the tools here start with p2v Import some internal documentation podwrapper: adapt footer to p2v .gitignore | 6 + Makefile.am | 4 +- configure.ac | 1 + docs/Makefile.am | 65 ++++++++ docs/p2v-building.pod | 259