[GIT PULL] KVM/arm64 fixes for 6.18, take #2