libvirt and aws changes