search for: notify_ui

.../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); struct data_conn data_conns[nr_disks]; @@ -276,7 +277,7 @@ start_conversion (struct config *config, if (mexp_printf (control_h, " ) | tee %...

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

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.

...} + if (!WIFEXITED (r) || WEXITSTATUS (r) != 0) { + fprintf (stderr, "'dmesg' failed (ignored)\n"); + goto skip_dmesg; + } + + ignore_value (read_whole_file (dmesg_file, &dmesg, NULL)); + skip_dmesg: + /* Open the control connection and start conversion */ if (notify_ui) notify_ui (NOTIFY_STATUS, _("Setting up the control connection ...")); - control_h = start_remote_connection (config, remote_dir, libvirt_xml); + control_h = start_remote_connection (config, remote_dir, libvirt_xml, dmesg); if (control_h == NULL) { const char *err = get_...

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

...+cleanup: + close(sockfd); + + return result; +} + static void cleanup_data_conns (struct data_conn *data_conns, size_t nr) { diff --git a/p2v/p2v.h b/p2v/p2v.h index c3ca0f6..7c4c115 100644 --- a/p2v/p2v.h +++ b/p2v/p2v.h @@ -98,6 +98,7 @@ extern int start_conversion (struct config *, void (*notify_ui) (int type, const #define NOTIFY_STATUS 3 /* stage in conversion process */ extern const char *get_conversion_error (void); extern void cancel_conversion (void); +#define WAIT_QEMU_NBD_TIMEOUT 10 /* ssh.c */ extern int test_connection (struct config *); -- 1.9.3

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

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

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.

..._("Opening data connection for %s ..."), - config->disks[i]) == -1) { - perror ("asprintf"); - exit (EXIT_FAILURE); - } + config->disks[i]) == -1) + error (EXIT_FAILURE, errno, "asprintf"); notify_ui (NOTIFY_STATUS, msg); } @@ -910,10 +905,8 @@ generate_libvirt_xml (struct config *config, struct data_conn *data_conns) map_interface_to_network (config, config->interfaces[i]); if (asprintf (&mac_filename, "/sys/class/net/%s/address", -...