[Xen-changelog] [xen-3.2-testing] Fix the build.

["Xen patchbot-3.2-testing" <patchbot-3.2-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1204735310 0
# Node ID 02c4362349d85afe2d1c17628629597dfca50980
# Parent  6b805f7b65e50229bea9a53f561324c977b09912
Fix the build.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/ioemu/hw/pass-through.h |    9 +++++++++
 xen/arch/x86/x86_emulate.c    |    2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff -r 6b805f7b65e5 -r 02c4362349d8 tools/ioemu/hw/pass-through.h
--- a/tools/ioemu/hw/pass-through.h     Wed Mar 05 16:22:57 2008 +0000
+++ b/tools/ioemu/hw/pass-through.h     Wed Mar 05 16:41:50 2008 +0000
@@ -43,6 +43,15 @@
 #define PCI_EXP_DEVCTL_FLR      (1 << 15)
 #define PCI_BAR_ENTRIES         (6)
 
+/* libpci may export the following PCI Express definitions. */
+#ifndef PCI_CAP_ID_EXP
+#define PCI_CAP_ID_EXP 0x10
+#define PCI_EXP_DEVCAP         4       /* Device capabilities */
+#define PCI_EXP_DEVCTL         8       /* Device Control */
+#define PCI_EXP_DEVSTA         10      /* Device Status */
+#define PCI_EXP_DEVSTA_TRPND   0x20    /* Transactions Pending */
+#endif
+
 struct pt_region {
     /* Virtual phys base & size */
     uint32_t e_physbase;
diff -r 6b805f7b65e5 -r 02c4362349d8 xen/arch/x86/x86_emulate.c
--- a/xen/arch/x86/x86_emulate.c        Wed Mar 05 16:22:57 2008 +0000
+++ b/xen/arch/x86/x86_emulate.c        Wed Mar 05 16:41:50 2008 +0000
@@ -492,7 +492,7 @@ do{ int _exn;                           
         "   "__FIXUP_WORD" 1b,3b\n"             \
         ".previous"                             \
         : "=r" (_exn) : "0" (0) );              \
-    generate_exception_if(_exn, EXC_MF, -1);    \
+    generate_exception_if(_exn, EXC_MF);        \
 } while (0)
 #else
 #define __emulate_fpu_insn(_op)                 \

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