Switch libvirt over to the branch corresponding to the patches I just submitted upstream.