[Xen-changelog] [xen-unstable] xen/xsm: Compile error due to naming clash between XSM and EFI runtime

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User James Carter <jwcart2@xxxxxxxxxxxxx>
# Date 1316272858 -3600
# Node ID da7f016b288fbdd05ba1c2b474bd47dd72b63fa3
# Parent  6684e3bafbbdb031e08fe330e762c4d5f5bcf535
xen/xsm: Compile error due to naming clash between XSM and EFI runtime

The problem is that efi_runtime_call is the name of both a function in
xen/arch/x86/efi/runtime.c and a member of the xsm_operations struct
in xen/include/xsm/xsm.h. This causes the macro "#define
efi_runtime_call(x) efi_compat_runtime_call(x)" on line 15 of
xen/arch/x86/x86_64/platform_hypercall.c to cause the above compile
error.

Renaming the XSM struct member fixes the problem.

Signed-off-by: James Carter <jwcart2@xxxxxxxxxxxxx>
Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
---


diff -r 6684e3bafbbd -r da7f016b288f xen/arch/x86/platform_hypercall.c
--- a/xen/arch/x86/platform_hypercall.c Sat Sep 17 16:19:26 2011 +0100
+++ b/xen/arch/x86/platform_hypercall.c Sat Sep 17 16:20:58 2011 +0100
@@ -306,7 +306,7 @@
         break;
 
     case XENPF_efi_runtime_call:
-        ret = xsm_efi_runtime_call();
+        ret = xsm_efi_call();
         if ( ret )
             break;
 
diff -r 6684e3bafbbd -r da7f016b288f xen/include/xsm/xsm.h
--- a/xen/include/xsm/xsm.h     Sat Sep 17 16:19:26 2011 +0100
+++ b/xen/include/xsm/xsm.h     Sat Sep 17 16:20:58 2011 +0100
@@ -132,7 +132,7 @@
     int (*physinfo) (void);
     int (*platform_quirk) (uint32_t);
     int (*firmware_info) (void);
-    int (*efi_runtime_call) (void);
+    int (*efi_call) (void);
     int (*acpi_sleep) (void);
     int (*change_freq) (void);
     int (*getidletime) (void);
@@ -554,9 +554,9 @@
     return xsm_call(firmware_info());
 }
 
-static inline int xsm_efi_runtime_call (void)
+static inline int xsm_efi_call (void)
 {
-    return xsm_call(efi_runtime_call());
+    return xsm_call(efi_call());
 }
 
 static inline int xsm_acpi_sleep (void)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog