This has the issue brought up in D29351, should sys/arm64/include/xen/xen-os.h be created in one commit and the ARM version of this function be brought in here instead of with the aarch64 jumbo commit?
After PVHv1 removal every supported guest is HVM, so we can remove the check (will do that on a different commit), and get away with the HVM vs PV difference in the code.