x86/traps: move {un,}register_guest_nmi_callback to pv/callback.c

Move these helper functions along side their users. Now all users of
these functions are within the same file, make them static.

Take the chance to change v to curr and remove some unneeded
parentheses.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/xen/arch/x86/pv/callback.c b/xen/arch/x86/pv/callback.c
index 5317ae8f050850b14397f3235ace82cbcb4b31af..739ccb4d06426a31d4c21c848ed46b27d9bf34d4 100644 (file)
--- a/xen/arch/x86/pv/callback.c
+++ b/xen/arch/x86/pv/callback.c
@@ -26,10 +26,47 @@
 
 #include <asm/current.h>
 #include <asm/nmi.h>
+#include <asm/shared.h>
 #include <asm/traps.h>
 
 #include <public/callback.h>
 
+static long register_guest_nmi_callback(unsigned long address)
+{
+    struct vcpu *curr = current;
+    struct domain *d = curr->domain;
+    struct trap_info *t = &curr->arch.pv_vcpu.trap_ctxt[TRAP_nmi];
+
+    if ( !is_canonical_address(address) )
+        return -EINVAL;
+
+    t->vector  = TRAP_nmi;
+    t->flags   = 0;
+    t->cs      = (is_pv_32bit_domain(d) ?
+                  FLAT_COMPAT_KERNEL_CS : FLAT_KERNEL_CS);
+    t->address = address;
+    TI_SET_IF(t, 1);
+
+    /*
+     * If no handler was registered we can 'lose the NMI edge'. Re-assert it
+     * now.
+     */
+    if ( curr->vcpu_id == 0 && arch_get_nmi_reason(d) != 0 )
+        curr->nmi_pending = 1;
+
+    return 0;
+}
+
+static long unregister_guest_nmi_callback(void)
+{
+    struct vcpu *curr = current;
+    struct trap_info *t = &curr->arch.pv_vcpu.trap_ctxt[TRAP_nmi];
+
+    memset(t, 0, sizeof(*t));
+
+    return 0;
+}
+
 static long register_guest_callback(struct callback_register *reg)
 {
     long ret = 0;

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 0b7cf68c4dc0d73c8e85b7b4c5d1bae7984024db..11bd3df058adcd9e9bd656090ef637faf701d446 100644 (file)
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -1979,42 +1979,6 @@ void __init trap_init(void)
     open_softirq(PCI_SERR_SOFTIRQ, pci_serr_softirq);
 }
 
-long register_guest_nmi_callback(unsigned long address)
-{
-    struct vcpu *v = current;
-    struct domain *d = v->domain;
-    struct trap_info *t = &v->arch.pv_vcpu.trap_ctxt[TRAP_nmi];
-
-    if ( !is_canonical_address(address) )
-        return -EINVAL;
-
-    t->vector  = TRAP_nmi;
-    t->flags   = 0;
-    t->cs      = (is_pv_32bit_domain(d) ?
-                  FLAT_COMPAT_KERNEL_CS : FLAT_KERNEL_CS);
-    t->address = address;
-    TI_SET_IF(t, 1);
-
-    /*
-     * If no handler was registered we can 'lose the NMI edge'. Re-assert it
-     * now.
-     */
-    if ( (v->vcpu_id == 0) && (arch_get_nmi_reason(d) != 0) )
-        v->nmi_pending = 1;
-
-    return 0;
-}
-
-long unregister_guest_nmi_callback(void)
-{
-    struct vcpu *v = current;
-    struct trap_info *t = &v->arch.pv_vcpu.trap_ctxt[TRAP_nmi];
-
-    memset(t, 0, sizeof(*t));
-
-    return 0;
-}
-
 int pv_raise_interrupt(struct vcpu *v, uint8_t trap_nr)
 {
     struct softirq_trap *st = &per_cpu(softirq_trap, smp_processor_id());

diff --git a/xen/include/asm-x86/nmi.h b/xen/include/asm-x86/nmi.h
index fb0f57aa09646715efe6e82446d4ed17fe0754b7..cb66e4b3f23375df73870fd558b3b012b4f7a285 100644 (file)
--- a/xen/include/asm-x86/nmi.h
+++ b/xen/include/asm-x86/nmi.h
@@ -29,19 +29,4 @@ nmi_callback_t *set_nmi_callback(nmi_callback_t *callback);
  */
 void unset_nmi_callback(void);
  
-/**
- * register_guest_nmi_callback
- *
- * The default NMI handler passes the NMI to a guest callback. This
- * function registers the address of that callback.
- */
-long register_guest_nmi_callback(unsigned long address);
-
-/**
- * unregister_guest_nmi_callback
- *
- * Unregister a guest NMI handler.
- */
-long unregister_guest_nmi_callback(void);
-
 #endif /* ASM_NMI_H */