v2 of:

https://listman.redhat.com/archives/libvir-list/2021-May/msg00767.html

diff to v1:
- Deduplicated the code per Pavel's suggestion

Michal Prívozník (3):
  virxml: Introduce and use virXMLFormatMetadata()
  virxml: Report error if virXMLFormatMetadata() fails
  virxml: Avoid double indentation of <metadata/> element

 src/conf/domain_conf.c   | 23 ++----------------
 src/conf/network_conf.c  | 23 ++----------------
 src/libvirt_private.syms |  1 +
 src/util/virxml.c        | 51 ++++++++++++++++++++++++++++++++++++++++
 src/util/virxml.h        |  3 +++
 5 files changed, 59 insertions(+), 42 deletions(-)

-- 
2.26.3

On 5/25/21 11:48 AM, Michal Privoznik wrote:
> 

Meanwhile, this was fixed in libxml2's upstream:

https://gitlab.gnome.org/GNOME/libxml2/-/commit/13ad8736d294536da4cbcd70a96b0a2fbf47070c

So I guess there won't be any regression with any upstream release of
libxml2. But as I pointed out in v1, some distros are known to already
backport the problematic patch (Fedora and Gentoo) so the question is
how likely they are to backport the fix too. I still think it's worth
fixing on our side.

Michal

On Tue, May 25, 2021 at 11:57:39AM +0200, Michal Prívozník wrote:
> On 5/25/21 11:48 AM, Michal Privoznik wrote:
> > 
> 
> Meanwhile, this was fixed in libxml2's upstream:
> 
> https://gitlab.gnome.org/GNOME/libxml2/-/commit/13ad8736d294536da4cbcd70a96b0a2fbf47070c
> 
> So I guess there won't be any regression with any upstream release of
> libxml2. But as I pointed out in v1, some distros are known to already
> backport the problematic patch (Fedora and Gentoo) so the question is
> how likely they are to backport the fix too. I still think it's worth
> fixing on our side.

I'm not sure if it's worth fixing, on one hand libvirt tests would be
broken, on the other hand running libvirt tests could detect the broken
backport and help others to create bug reports to backport the fix as
well.

Anyway, for the code

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

On 5/25/21 12:12 PM, Pavel Hrdina wrote:
> On Tue, May 25, 2021 at 11:57:39AM +0200, Michal Prívozník wrote:
>> On 5/25/21 11:48 AM, Michal Privoznik wrote:
>>>
>>
>> Meanwhile, this was fixed in libxml2's upstream:
>>
>> https://gitlab.gnome.org/GNOME/libxml2/-/commit/13ad8736d294536da4cbcd70a96b0a2fbf47070c
>>
>> So I guess there won't be any regression with any upstream release of
>> libxml2. But as I pointed out in v1, some distros are known to already
>> backport the problematic patch (Fedora and Gentoo) so the question is
>> how likely they are to backport the fix too. I still think it's worth
>> fixing on our side.
> 
> I'm not sure if it's worth fixing, on one hand libvirt tests would be
> broken, on the other hand running libvirt tests could detect the broken
> backport and help others to create bug reports to backport the fix as
> well.

I hear you but also, if we want to freeze anytime soon we should have
green pipeline :-)

And also, we already have precedence of working around broken libraries
in our code. Remember glib and all the fun we were having?

> 
> Anyway, for the code
> 
> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
> 

Pushed, thank you.

Michal