diff -r 39cb0de3ee2f tools/ioemu/hw/pass-through.c
--- a/tools/ioemu/hw/pass-through.c	Tue Jul 29 17:00:29 2008 +0100
+++ b/tools/ioemu/hw/pass-through.c	Wed Jul 30 14:47:03 2008 +0900
@@ -821,7 +821,7 @@ void pt_iomem_map(PCIDevice *d, int i, u
     assigned_device->bases[i].e_size= e_size;
 
     PT_LOG("e_phys=%08x maddr=%lx type=%d len=%d index=%d first_map=%d\n",
-        e_phys, assigned_device->bases[i].access.maddr, 
+        e_phys, (unsigned long)assigned_device->bases[i].access.maddr, 
         type, e_size, i, first_map);
 
     if ( e_size == 0 )
@@ -1389,7 +1389,7 @@ static int pt_register_regions(struct pt
     return 0;
 }
 
-static int pt_unregister_regions(struct pt_dev *assigned_device)
+static void pt_unregister_regions(struct pt_dev *assigned_device)
 {
     int i, type, ret;
     uint32_t e_size;
diff -r 39cb0de3ee2f tools/ioemu/hw/pass-through.h
--- a/tools/ioemu/hw/pass-through.h	Tue Jul 29 17:00:29 2008 +0100
+++ b/tools/ioemu/hw/pass-through.h	Wed Jul 30 14:34:30 2008 +0900
@@ -47,12 +47,20 @@
 /* because the current version of libpci (2.2.0) doesn't define these ID,
  * so we define Capability ID here.
  */
+#ifndef PCI_CAP_ID_HOTPLUG
 /* SHPC Capability List Item reg group */
 #define PCI_CAP_ID_HOTPLUG      0x0C
+#endif
+
+#ifndef PCI_CAP_ID_SSVID
 /* Subsystem ID and Subsystem Vendor ID Capability List Item reg group */
 #define PCI_CAP_ID_SSVID        0x0D
+#endif
+
+#ifndef PCI_MSI_FLAGS_MASK_BIT
 /* interrupt masking & reporting supported */
 #define PCI_MSI_FLAGS_MASK_BIT  0x0100
+#endif
 
 #define PT_INVALID_REG          0xFFFFFFFF      /* invalid register value */
 #define PT_BAR_ALLF             0xFFFFFFFF      /* BAR ALLF value */