Merge add libvirt stuff