Re: [libvirt] maint: backport of 736e017e and friends