[libvirt PATCH 0/4] fix recent commits