The HVM flavor of the hypercall handlers exists only when GRANT_TABLE is
enabled, while surrogate shim variants exist only for the purpose of PV.
(Also scratch out the Arm variant in that case; what exactly is used in
that cell of the new table row doesn't really matter.)
Fixes: 8523851dbc49 ("xen/x86: call hypercall handlers via generated macro")
Signed-off-by: Jan Beulich <[email protected]>
Reported-by: Andrew Cooper <[email protected]>
--- a/xen/include/hypercall-defs.c
+++ b/xen/include/hypercall-defs.c
@@ -241,8 +241,10 @@ event_channel_op_compat do
xen_version compat do compat do do
console_io do do do do do
physdev_op_compat compat do - - dep
-#if defined(CONFIG_GRANT_TABLE) || defined(CONFIG_PV_SHIM)
+#if defined(CONFIG_GRANT_TABLE)
grant_table_op compat do hvm hvm do
+#elif defined(CONFIG_PV_SHIM)
+grant_table_op compat do - - -
#endif
vm_assist do do do do do
update_va_mapping_otherdomain compat do - - -
