From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Mon, 19 Oct 2020 17:34:44 +0000 (+0100)
Subject: hypercall: Reposition hypercall_xen_version()
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0fb84f57f88a1b83b48e2fd50700dd8cfd206fe9;p=people%2Fandrewcoop%2Fxen-test-framework.git

hypercall: Reposition hypercall_xen_version()

It has gotten out of order.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/include/xtf/hypercall.h b/include/xtf/hypercall.h
index 64473e9..03c49d5 100644
--- a/include/xtf/hypercall.h
+++ b/include/xtf/hypercall.h
@@ -88,11 +88,6 @@ static inline long hypercall_memory_op(unsigned int cmd, void *arg)
     return HYPERCALL2(long, __HYPERVISOR_memory_op, cmd, arg);
 }
 
-static inline long hypercall_xen_version(unsigned int cmd, void *arg)
-{
-    return HYPERCALL2(long, __HYPERVISOR_xen_version, cmd, arg);
-}
-
 /*
  * This hypercall is misnamed in the Xen ABI, and actually operates on a
  * linear address, not a virtual address.
@@ -108,6 +103,11 @@ static inline long hypercall_update_va_mapping(
 #endif
 }
 
+static inline long hypercall_xen_version(unsigned int cmd, void *arg)
+{
+    return HYPERCALL2(long, __HYPERVISOR_xen_version, cmd, arg);
+}
+
 static inline long hypercall_grant_table_op(unsigned int cmd, void *args,
                                             unsigned int count)
 {