From 665e16268d0b6211be94704a9ce72646d654aecb Mon Sep 17 00:00:00 2001
From: pmf <pmf@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Wed, 6 Jun 2007 01:56:25 +0000
Subject: [PATCH] change some fields in facility xml's to use format strings
 also, change some long's (that are pointers) to ulong's so that they print
 correctly in hex

git-svn-id: http://ltt.polymtl.ca/svn@2533 04897980-b3bd-0310-b5e0-8ef037075253
---
 ltt-control/facilities/kernel_arch_arm.xml     |  4 ++--
 ltt-control/facilities/kernel_arch_i386.xml    |  4 ++--
 ltt-control/facilities/kernel_arch_mips.xml    |  4 ++--
 ltt-control/facilities/kernel_arch_powerpc.xml |  4 ++--
 ltt-control/facilities/kernel_arch_ppc.xml     |  4 ++--
 ltt-control/facilities/kernel_arch_x86_64.xml  |  4 ++--
 ltt-control/facilities/locking.xml             | 12 ++++++------
 ltt-control/facilities/mm.xml                  |  6 +++---
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/ltt-control/facilities/kernel_arch_arm.xml b/ltt-control/facilities/kernel_arch_arm.xml
index fa569c0..92ff249 100644
--- a/ltt-control/facilities/kernel_arch_arm.xml
+++ b/ltt-control/facilities/kernel_arch_arm.xml
@@ -365,7 +365,7 @@
   <event name="trap_entry">
     <description>Entry in a trap</description>
     <field name="trap_id"> <description>Trap number</description> <long/> </field>
-    <field name="address"> <description>Address where trap occured</description> <long/> </field>
+    <field name="address"> <description>Address where trap occured</description> <ulong format="%#x"/> </field>
   </event>
 
   <event name="trap_exit">
@@ -375,7 +375,7 @@
   <event name="syscall_entry">
     <description>System call entry</description>
     <field name="syscall_id"> <description>Syscall entry number in entry.S</description> <typeref name="syscall_name"/> </field>
-    <field name="address"> <description>Address from which call was made</description> <long/> </field>
+    <field name="address"> <description>Address from which call was made</description> <ulong format="%#x"/> </field>
   </event>
 
   <event name="syscall_exit">
diff --git a/ltt-control/facilities/kernel_arch_i386.xml b/ltt-control/facilities/kernel_arch_i386.xml
index 26ad5f3..fddad46 100644
--- a/ltt-control/facilities/kernel_arch_i386.xml
+++ b/ltt-control/facilities/kernel_arch_i386.xml
@@ -335,7 +335,7 @@
   <event name="trap_entry">
     <description>Entry in a trap</description>
     <field name="trap_id"> <description>Trap number</description> <int/> </field>
-    <field name="address"> <description>Address where trap occured</description> <long/> </field>
+    <field name="address"> <description>Address where trap occured</description> <ulong format="%#x"/> </field>
   </event>
 
   <event name="trap_exit">
@@ -345,7 +345,7 @@
   <event name="syscall_entry">
     <description>System call entry</description>
     <field name="syscall_id"> <description>Syscall entry number in entry.S</description> <typeref name="syscall_name"/> </field>
-    <field name="address"> <description>Address from which call was made</description> <long/> </field>
+    <field name="address"> <description>Address from which call was made</description> <ulong format="%#x"/> </field>
   </event>
 
   <event name="syscall_exit">
diff --git a/ltt-control/facilities/kernel_arch_mips.xml b/ltt-control/facilities/kernel_arch_mips.xml
index 6f38a9a..16911ce 100644
--- a/ltt-control/facilities/kernel_arch_mips.xml
+++ b/ltt-control/facilities/kernel_arch_mips.xml
@@ -891,7 +891,7 @@
   <event name="trap_entry">
     <description>Entry in a trap</description>
     <field name="trap_id"> <description>Trap number</description> <int/> </field>
-    <field name="address"> <description>Address where trap occured</description> <long/> </field>
+    <field name="address"> <description>Address where trap occured</description> <ulong format="%#x"/> </field>
   </event>
 
   <event name="trap_exit">
@@ -901,7 +901,7 @@
   <event name="syscall_entry">
     <description>System call entry</description>
     <field name="syscall_id"> <description>Syscall entry number in entry.S</description> <typeref name="syscall_name"/> </field>
-    <field name="address"> <description>Address from which call was made</description> <long/> </field>
+    <field name="address"> <description>Address from which call was made</description> <ulong format="%#x"/> </field>
   </event>
 
   <event name="syscall_exit">
diff --git a/ltt-control/facilities/kernel_arch_powerpc.xml b/ltt-control/facilities/kernel_arch_powerpc.xml
index c59622b..8d3ee68 100644
--- a/ltt-control/facilities/kernel_arch_powerpc.xml
+++ b/ltt-control/facilities/kernel_arch_powerpc.xml
@@ -315,7 +315,7 @@
   <event name="trap_entry">
     <description>Entry in a trap</description>
     <field name="trap_id"> <description>Trap number</description> <long/> </field>
-    <field name="address"> <description>Address where trap occured</description> <long/> </field>
+    <field name="address"> <description>Address where trap occured</description> <ulong format="%#x"/> </field>
   </event>
 
   <event name="trap_exit">
@@ -325,7 +325,7 @@
   <event name="syscall_entry">
     <description>System call entry</description>
     <field name="syscall_id"> <description>Syscall entry number in entry.S</description> <typeref name="syscall_name"/> </field>
-    <field name="address"> <description>Address from which call was made</description> <long/> </field>
+    <field name="address"> <description>Address from which call was made</description> <ulong format="%#x"/> </field>
   </event>
 
   <event name="syscall_exit">
diff --git a/ltt-control/facilities/kernel_arch_ppc.xml b/ltt-control/facilities/kernel_arch_ppc.xml
index 9dcd911..09d45ce 100644
--- a/ltt-control/facilities/kernel_arch_ppc.xml
+++ b/ltt-control/facilities/kernel_arch_ppc.xml
@@ -315,7 +315,7 @@
   <event name="trap_entry">
     <description>Entry in a trap</description>
     <field name="trap_id"> <description>Trap number</description> <long/> </field>
-    <field name="address"> <description>Address where trap occured</description> <long/> </field>
+    <field name="address"> <description>Address where trap occured</description> <ulong format="%#x"/> </field>
   </event>
 
   <event name="trap_exit">
@@ -325,7 +325,7 @@
   <event name="syscall_entry">
     <description>System call entry</description>
     <field name="syscall_id"> <description>Syscall entry number in entry.S</description> <typeref name="syscall_name"/> </field>
-    <field name="address"> <description>Address from which call was made</description> <long/> </field>
+    <field name="address"> <description>Address from which call was made</description> <ulong format="%#x"/> </field>
   </event>
 
   <event name="syscall_exit">
diff --git a/ltt-control/facilities/kernel_arch_x86_64.xml b/ltt-control/facilities/kernel_arch_x86_64.xml
index ba933c6..a65c0af 100644
--- a/ltt-control/facilities/kernel_arch_x86_64.xml
+++ b/ltt-control/facilities/kernel_arch_x86_64.xml
@@ -626,7 +626,7 @@
   <event name="trap_entry">
     <description>Entry in a trap</description>
     <field name="trap_id"> <description>Trap number</description> <int/> </field>
-    <field name="address"> <description>Address where trap occured</description> <long/> </field>
+    <field name="address"> <description>Address where trap occured</description> <ulong format="%#x"/> </field>
   </event>
 
   <event name="trap_exit">
@@ -636,7 +636,7 @@
   <event name="syscall_entry">
     <description>System call entry</description>
     <field name="syscall_id"> <description>Syscall entry number in entry.S</description> <typeref name="syscall_name"/> </field>
-    <field name="address"> <description>Address from which call was made</description> <long/> </field>
+    <field name="address"> <description>Address from which call was made</description> <ulong format="%#x"/> </field>
   </event>
 
   <event name="syscall_exit">
diff --git a/ltt-control/facilities/locking.xml b/ltt-control/facilities/locking.xml
index d4ee266..5dd9e55 100644
--- a/ltt-control/facilities/locking.xml
+++ b/ltt-control/facilities/locking.xml
@@ -4,27 +4,27 @@
 
   <event name="hardirqs_on">
     <description>Enable IRQs</description>
-    <field name="ip"> <description>Instruction address</description> <ulong/> </field>
+    <field name="ip"> <description>Instruction address</description> <ulong format="%#x"/> </field>
   </event>
 
   <event name="hardirqs_off">
     <description>Disable IRQs</description>
-    <field name="ip"> <description>Instruction address</description> <ulong/> </field>
+    <field name="ip"> <description>Instruction address</description> <ulong format="%#x"/> </field>
   </event>
 
   <event name="softirqs_on">
     <description>Enable SoftIRQs</description>
-    <field name="ip"> <description>Instruction address</description> <ulong/> </field>
+    <field name="ip"> <description>Instruction address</description> <ulong format="%#x"/> </field>
   </event>
 
   <event name="softirqs_off">
     <description>Disable SoftIRQs</description>
-    <field name="ip"> <description>Instruction address</description> <ulong/> </field>
+    <field name="ip"> <description>Instruction address</description> <ulong format="%#x"/> </field>
   </event>
 
   <event name="lock_acquire">
     <description>Acquire lock</description>
-    <field name="ip"> <description>Instruction address</description> <ulong/> </field>
+    <field name="ip"> <description>Instruction address</description> <ulong format="%#x"/> </field>
     <field name="subclass"> <description>Lock subclass</description> <uint/> </field>
     <field name="lock"> <description>Lock address</description> <pointer/> </field>
     <field name="trylock"> <description>Trylock ?</description> <int/> </field>
@@ -32,7 +32,7 @@
 
   <event name="lock_release">
     <description>Release lock</description>
-    <field name="ip"> <description>Instruction address</description> <ulong/> </field>
+    <field name="ip"> <description>Instruction address</description> <ulong format="%#x"/> </field>
     <field name="lock"> <description>Lock address</description> <pointer/> </field>
     <field name="nested"> <description>Nested release ?</description> <int/> </field>
   </event>
diff --git a/ltt-control/facilities/mm.xml b/ltt-control/facilities/mm.xml
index 3375bbf..1b2fff2 100644
--- a/ltt-control/facilities/mm.xml
+++ b/ltt-control/facilities/mm.xml
@@ -4,8 +4,8 @@
 
   <event name="handle_fault_entry">
     <description>Entry in the page fault handler</description>
-    <field name="address"> <description>Pointer that caused the page fault</description> <ulong/> </field>
-    <field name="ip"> <description>Instruction at which the page fault occured</description> <long/> </field>
+    <field name="address"> <description>Pointer that caused the page fault</description> <ulong format="%#x"/> </field>
+    <field name="ip"> <description>Instruction at which the page fault occured</description> <ulong format="%#x"/> </field>
   </event>
 
   <event name="handle_fault_exit">
@@ -36,7 +36,7 @@
 
   <event name="swap_in">
     <description>Page swapped into memory</description>
-    <field name="address"> <description>Address of the page to swap in.</description> <ulong/> </field>
+    <field name="address"> <description>Address of the page to swap in.</description> <ulong format="%#x"/> </field>
   </event>
 
   <event name="swap_out">
-- 
2.34.1