From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Tue, 15 Jul 2008 17:45:12 +0000 (+0100)
Subject: Corrected fixes for passthrough compilation.
X-Git-Tag: xen-3.3.0-rc1~28^2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8b26e14cadd800d1346c305014a96e947bc89eba;p=qemu-xen-3.3-testing.git

Corrected fixes for passthrough compilation.
---

diff --git a/hw/pass-through.c b/hw/pass-through.c
index 1bd8d66d..05405866 100644
--- a/hw/pass-through.c
+++ b/hw/pass-through.c
@@ -27,8 +27,6 @@
 #include "pci/pci.h"
 #include "pt-msi.h"
 
-extern FILE *logfile;
-
 struct php_dev {
     struct pt_dev *pt_dev;
     uint8_t valid;
diff --git a/hw/pass-through.h b/hw/pass-through.h
index d642be37..183ae099 100644
--- a/hw/pass-through.h
+++ b/hw/pass-through.h
@@ -22,12 +22,13 @@
 #include "pci.h"
 #include "pci/header.h"
 #include "pci/pci.h"
+#include "exec-all.h"
 
 /* Log acesss */
 #define PT_LOGGING_ENABLED
 
 #ifdef PT_LOGGING_ENABLED
-#define PT_LOG(_f, _a...)   fprintf(stdout, "%s: " _f, __func__, ##_a)
+#define PT_LOG(_f, _a...)   fprintf(logfile, "%s: " _f, __func__, ##_a)
 #else
 #define PT_LOG(_f, _a...)
 #endif
diff --git a/hw/pt-msi.h b/hw/pt-msi.h
index 4d214776..1bfbeefc 100644
--- a/hw/pt-msi.h
+++ b/hw/pt-msi.h
@@ -7,6 +7,8 @@
 #define  PCI_CAP_ID_MSI     0x05    /* Message Signalled Interrupts */
 #define  PCI_CAP_ID_MSIX    0x11    /* MSI-X */
 
+#ifndef PCI_MSI_FLAGS
+
 /* Message Signalled Interrupts registers */
 #define PCI_MSI_FLAGS       2   /* Various flags */
 #define  PCI_MSI_FLAGS_64BIT    0x80    /* 64-bit addresses allowed */
@@ -19,6 +21,8 @@
 #define PCI_MSI_DATA_32     8   /* 16 bits of data for 32-bit devices */
 #define PCI_MSI_DATA_64     12  /* 16 bits of data for 64-bit devices */
 
+#endif
+
 /* MSI-X */
 #define  PCI_MSIX_ENABLE    0x8000
 #define  PCI_MSIX_MASK      0x4000