On Tuesday, 10 March 2020 17:33:41 CET Richard W.M. Jones wrote:
On Tue, Mar 10, 2020 at 05:00:00PM +0100, Pino Toscano wrote:
> On Tuesday, 10 March 2020 14:07:56 CET Richard W.M. Jones wrote:
> > Libguestfs itself is obviously now >= 1.42. In virt-v2v we made a
> > similar change upstream to require libguestfs >= 1.42. Therefore the
> > ifdefs are no longer required.
> > ---
>
> Even if we accept this patch, there is the larger unsolved issue of the
> branch strategy for libguestfs-common: there will be for sure "stable"
> fixes, and bumping the common submodule in libguestfs and virt-v2v will
> pull in also new features, possibly requiring new APIs (like this patch
> shows) or internal API changes in the common parts.
>
> How do we deal with that?
I guess we can add branches as needed to libguestfs-common?
(eg. stable-libguestfs-1.42, stable-v2v-1.42)
Thinking about it, also master-v2v might be needed, unless
libguestfs-common/master keeps the support for libguestfs down to the
version that virt-v2v/master requires.
Other than that, the idea seems OK; I'm just worried about the need for
multiple cherry-picks/submodule bumps just for simple bug fixes in
libguestfs-common :-/
--
Pino Toscano