Guardiola commits to City long-term.