[IA64] Extract debug_op.h from arch-ia64.h

Signed-off-by: Tristan Gingold <tgingold@free.fr>

diff --git a/xen/arch/ia64/vmx/vmx_vcpu.c b/xen/arch/ia64/vmx/vmx_vcpu.c
index 0fd57b060deabb9a32c2116b85f5ced00d82e69a..577eeeb2b2a85314b5331eb2e8988e1cac5f705d 100644 (file)
--- a/xen/arch/ia64/vmx/vmx_vcpu.c
+++ b/xen/arch/ia64/vmx/vmx_vcpu.c
@@ -35,6 +35,7 @@
 #include <asm/vmx_mm_def.h>
 #include <asm/vmx.h>
 #include <asm/vmx_phy_mode.h>
+#include <asm/debugger.h>
 
 /**************************************************************************
  VCPU general register access routines

diff --git a/xen/arch/ia64/xen/hypercall.c b/xen/arch/ia64/xen/hypercall.c
index 5c97f3bb7e116c5416439027df9de1e28418409d..8a30802c6ea272c6377106c4aa060fdd47cbb710 100644 (file)
--- a/xen/arch/ia64/xen/hypercall.c
+++ b/xen/arch/ia64/xen/hypercall.c
@@ -32,6 +32,7 @@
 #include <public/callback.h>
 #include <xen/event.h>
 #include <xen/perfc.h>
+#include <public/arch-ia64/debug_op.h>
 
 extern long do_physdev_op(int cmd, XEN_GUEST_HANDLE(void) arg);
 extern long do_callback_op(int cmd, XEN_GUEST_HANDLE(void) arg);

diff --git a/xen/include/asm-ia64/debugger.h b/xen/include/asm-ia64/debugger.h
index 7200485d3f0fa624a0142b1df7b826e483c0bb6d..cf93931e65db4c043e923215be8f0a13f35a7db1 100644 (file)
--- a/xen/include/asm-ia64/debugger.h
+++ b/xen/include/asm-ia64/debugger.h
@@ -40,6 +40,7 @@
 #include <xen/sched.h>
 #include <xen/softirq.h>
 #include <xen/gdbstub.h>
+#include <public/arch-ia64/debug_op.h>
 
 void show_registers(struct cpu_user_regs *regs);
 void dump_stack(void);

diff --git a/xen/include/public/arch-ia64.h b/xen/include/public/arch-ia64.h
index 0895dd0eff39ba822e79b1878c5276a586d439a0..805f793d241a2a5682784e4a9c3445eaca7aa6e7 100644 (file)
--- a/xen/include/public/arch-ia64.h
+++ b/xen/include/public/arch-ia64.h
@@ -579,79 +579,6 @@ struct xen_ia64_boot_param {
 /* Extra debug features.  */
 #define __HYPERVISOR_ia64_debug_op  __HYPERVISOR_arch_2
 
-/* Set/Get extra conditions to break.  */
-#define XEN_IA64_DEBUG_OP_SET_FLAGS 1
-#define XEN_IA64_DEBUG_OP_GET_FLAGS 2
-
-/* Break on kernel single step.  */
-#define XEN_IA64_DEBUG_ON_KERN_SSTEP   (1 << 0)
-
-/* Break on kernel debug (breakpoint or watch point).  */
-#define XEN_IA64_DEBUG_ON_KERN_DEBUG   (1 << 1)
-
-/* Break on kernel taken branch.  */
-#define XEN_IA64_DEBUG_ON_KERN_TBRANCH (1 << 2)
-
-/* Break on interrupt injection.  */
-#define XEN_IA64_DEBUG_ON_EXTINT       (1 << 3)
-
-/* Break on interrupt injection.  */
-#define XEN_IA64_DEBUG_ON_EXCEPT       (1 << 4)
-
-/* Break on event injection.  */
-#define XEN_IA64_DEBUG_ON_EVENT        (1 << 5)
-
-/* Break on privop/virtualized instruction (slow path only).  */
-#define XEN_IA64_DEBUG_ON_PRIVOP       (1 << 6)
-
-/* Break on emulated PAL call (at entry).  */
-#define XEN_IA64_DEBUG_ON_PAL          (1 << 7)
-
-/* Break on emulated SAL call (at entry).  */
-#define XEN_IA64_DEBUG_ON_SAL          (1 << 8)
-
-/* Break on emulated EFI call (at entry).  */
-#define XEN_IA64_DEBUG_ON_EFI          (1 << 9)
-
-/* Break on rfi emulation (slow path only, before exec).  */
-#define XEN_IA64_DEBUG_ON_RFI          (1 << 10)
-
-/* Break on address translation switch.  */
-#define XEN_IA64_DEBUG_ON_MMU          (1 << 11)
-
-/* Break on bad guest physical address.  */
-#define XEN_IA64_DEBUG_ON_BAD_MPA      (1 << 12)
-
-/* Force psr.ss bit.  */
-#define XEN_IA64_DEBUG_FORCE_SS        (1 << 13)
-
-/* Force psr.db bit.  */
-#define XEN_IA64_DEBUG_FORCE_DB        (1 << 14)
-
-/* Break on ITR/PTR.  */
-#define XEN_IA64_DEBUG_ON_TR           (1 << 15)
-
-/* Break on ITC/PTC.L/PTC.G/PTC.GA.  */
-#define XEN_IA64_DEBUG_ON_TC           (1 << 16)
-
-/* Get translation cache.  */
-#define XEN_IA64_DEBUG_OP_GET_TC   3
-
-/* Translate virtual address to guest physical address.  */
-#define XEN_IA64_DEBUG_OP_TRANSLATE 4
-
-#ifndef __ASSEMBLY__
-union xen_ia64_debug_op {
-    uint64_t flags;
-    struct xen_ia64_debug_vtlb {
-        uint64_t nbr;                             /* IN/OUT */
-        XEN_GUEST_HANDLE_64(ia64_tr_entry_t) tr;  /* IN/OUT */
-    } vtlb;
-};
-typedef union xen_ia64_debug_op xen_ia64_debug_op_t;
-DEFINE_XEN_GUEST_HANDLE(xen_ia64_debug_op_t);
-#endif /* __ASSEMBLY__ */
-
 /* Xencomm macros.  */
 #define XENCOMM_INLINE_MASK 0xf800000000000000UL
 #define XENCOMM_INLINE_FLAG 0x8000000000000000UL

diff --git a/xen/include/public/arch-ia64/debug_op.h b/xen/include/public/arch-ia64/debug_op.h
new file mode 100644 (file)
index 0000000..868eade
--- /dev/null
+++ b/xen/include/public/arch-ia64/debug_op.h
@@ -0,0 +1,96 @@
+/******************************************************************************
+ * debug_op.h
+ *
+ * Copyright (c) 2007 Tristan Gingold <tgingold@free.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#ifndef __XEN_PUBLIC_IA64_DEBUG_OP_H__
+#define __XEN_PUBLIC_IA64_DEBUG_OP_H__
+
+/* Set/Get extra conditions to break.  */
+#define XEN_IA64_DEBUG_OP_SET_FLAGS 1
+#define XEN_IA64_DEBUG_OP_GET_FLAGS 2
+
+/* Break on kernel single step.  */
+#define XEN_IA64_DEBUG_ON_KERN_SSTEP   (1 << 0)
+
+/* Break on kernel debug (breakpoint or watch point).  */
+#define XEN_IA64_DEBUG_ON_KERN_DEBUG   (1 << 1)
+
+/* Break on kernel taken branch.  */
+#define XEN_IA64_DEBUG_ON_KERN_TBRANCH (1 << 2)
+
+/* Break on interrupt injection.  */
+#define XEN_IA64_DEBUG_ON_EXTINT       (1 << 3)
+
+/* Break on interrupt injection.  */
+#define XEN_IA64_DEBUG_ON_EXCEPT       (1 << 4)
+
+/* Break on event injection.  */
+#define XEN_IA64_DEBUG_ON_EVENT        (1 << 5)
+
+/* Break on privop/virtualized instruction (slow path only).  */
+#define XEN_IA64_DEBUG_ON_PRIVOP       (1 << 6)
+
+/* Break on emulated PAL call (at entry).  */
+#define XEN_IA64_DEBUG_ON_PAL          (1 << 7)
+
+/* Break on emulated SAL call (at entry).  */
+#define XEN_IA64_DEBUG_ON_SAL          (1 << 8)
+
+/* Break on emulated EFI call (at entry).  */
+#define XEN_IA64_DEBUG_ON_EFI          (1 << 9)
+
+/* Break on rfi emulation (slow path only, before exec).  */
+#define XEN_IA64_DEBUG_ON_RFI          (1 << 10)
+
+/* Break on address translation switch.  */
+#define XEN_IA64_DEBUG_ON_MMU          (1 << 11)
+
+/* Break on bad guest physical address.  */
+#define XEN_IA64_DEBUG_ON_BAD_MPA      (1 << 12)
+
+/* Force psr.ss bit.  */
+#define XEN_IA64_DEBUG_FORCE_SS        (1 << 13)
+
+/* Force psr.db bit.  */
+#define XEN_IA64_DEBUG_FORCE_DB        (1 << 14)
+
+/* Break on ITR/PTR.  */
+#define XEN_IA64_DEBUG_ON_TR           (1 << 15)
+
+/* Break on ITC/PTC.L/PTC.G/PTC.GA.  */
+#define XEN_IA64_DEBUG_ON_TC           (1 << 16)
+
+/* Get translation cache.  */
+#define XEN_IA64_DEBUG_OP_GET_TC   3
+
+/* Translate virtual address to guest physical address.  */
+#define XEN_IA64_DEBUG_OP_TRANSLATE 4
+
+union xen_ia64_debug_op {
+    uint64_t flags;
+    struct xen_ia64_debug_vtlb {
+        uint64_t nbr;                             /* IN/OUT */
+        XEN_GUEST_HANDLE_64(ia64_tr_entry_t) tr;  /* IN/OUT */
+    } vtlb;
+};
+typedef union xen_ia64_debug_op xen_ia64_debug_op_t;
+DEFINE_XEN_GUEST_HANDLE(xen_ia64_debug_op_t);
+
+#endif /* __XEN_PUBLIC_IA64_DEBUG_OP_H__ */