search for: v2v_major

...oftware # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -AC_INIT([virt-v2v],1.41.8) +# The major, minor, and release fields MUST be numbers. Packagers can +# add extra information using --with-extra="..." which may be any +# freeform string. +m4_define([v2v_major], [1]) +m4_define([v2v_minor], [41]) +m4_define([v2v_release], [8]) + +AC_INIT([virt-v2v],v2v_major.v2v_minor.v2v_release) # Headings within the configure script output. m4_define([HEADING], @@ -37,6 +44,25 @@ AC_CONFIG_MACRO_DIR([m4]) dnl Initialize libtool. LT_INIT +dnl Extra string,...

...1 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > > -AC_INIT([virt-v2v],1.41.8) > +# The major, minor, and release fields MUST be numbers. Packagers can > +# add extra information using --with-extra="..." which may be any > +# freeform string. > +m4_define([v2v_major], [1]) > +m4_define([v2v_minor], [41]) > +m4_define([v2v_release], [8]) > + > +AC_INIT([virt-v2v],v2v_major.v2v_minor.v2v_release) > > # Headings within the configure script output. > m4_define([HEADING], > @@ -37,6 +44,25 @@ AC_CONFIG_MACRO_DIR([m4]) > dnl Initi...

...extern char *get_if_vendor (const char *if_name, int truncate); extern void wait_network_online (const struct config *); +/* whole-file.c */ +extern int read_whole_file (const char *filename, char **data_r, size_t *size_r); + /* virt-v2v version and features (read from remote). */ extern int v2v_major; extern int v2v_minor; diff --git a/p2v/ssh.c b/p2v/ssh.c index cd059c5..6dc6854 100644 --- a/p2v/ssh.c +++ b/p2v/ssh.c @@ -848,7 +848,8 @@ wait_for_prompt (mexp_h *h) mexp_h * start_remote_connection (struct config *config, - const char *remote_dir, const char *libvirt...

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

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.