Fix what's missing in the current patch for libvirt, get it merged upstream.
With some issues, integrated in libvirt 9.0.0.