]> xenbits.xensource.com Git - xen.git/commitdiff
x86/PV32: fix physdev_op_compat handling
authorJan Beulich <jbeulich@suse.com>
Fri, 15 Oct 2021 09:20:04 +0000 (11:20 +0200)
committerJan Beulich <jbeulich@suse.com>
Fri, 15 Oct 2021 09:20:04 +0000 (11:20 +0200)
The conversion of the original code failed to recognize that the 32-bit
compat variant of this (sorry, two different meanings of "compat" here)
needs to continue to invoke the compat handler, not the native one.
Arrange for this by adding yet another #define.

Affected functions (having existed prior to the introduction of the new
hypercall) are PHYSDEVOP_set_iobitmap and PHYSDEVOP_apic_{read,write}.
For all others the operand struct layout doesn't differ.

Fixes: 1252e2823117 ("x86/pv: Export pv_hypercall_table[] rather than working around it in several ways")
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
master commit: 834cb8761051f7d87816785c0d99fe9bd5f0ce30
master date: 2021-10-12 11:55:42 +0200

xen/arch/x86/x86_64/compat.c

index 0e4c71f2aa17b051ea62982426687966ff2ed963..fcbc1cc0d780da2be46f958ee957dac737187b88 100644 (file)
@@ -12,6 +12,7 @@ EMIT_FILE;
 #define physdev_op_t                  physdev_op_compat_t
 #define do_physdev_op                 compat_physdev_op
 #define do_physdev_op_compat(x)       compat_physdev_op_compat(_##x)
+#define native                        compat
 
 #define COMPAT
 #define _XEN_GUEST_HANDLE(t) XEN_GUEST_HANDLE(t)