Corrected fixes for passthrough compilation.

diff --git a/hw/pass-through.c b/hw/pass-through.c
index 1bd8d66d8e29ac0e3a88aa2dbd87030f702edc44..054058660f64de3ef157033bf031542d33432d92 100644 (file)
--- 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 d642be376f3b85d023af3aef72dc947e018e37a9..183ae09944ce2621bf95e9d321deb1e8f9d20d03 100644 (file)
--- 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 4d214776a78d4f5c0b717d62bd9e22e149ce974c..1bfbeefca6e6672ca1220fb5dce49368e88262ad 100644 (file)
--- 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