From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Tue, 31 Mar 2009 18:27:00 +0000 (-0500)
Subject: updated pci
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=bc98195a63d8cb1d109eeaa72f57f468c6c9581e

updated pci
---

diff --git a/palacios/include/devices/pci.h b/palacios/include/devices/pci.h
index 51d1d50..79718a7 100644
--- a/palacios/include/devices/pci.h
+++ b/palacios/include/devices/pci.h
@@ -39,15 +39,22 @@ struct pci_device;
 
 struct v3_pci_bar {
     pci_bar_type_t type;
-    int mem_hook;
     
     union {
-	int num_pages;
-	int num_io_ports;
-    };
-
-    int (*bar_update)(struct pci_device * pci_dev, uint_t bar);
+	struct {
+	    int num_pages;
+	    addr_t default_base_addr;
+	    int (*mem_read)(addr_t guest_addr, void * dst, uint_t length, void * private_data);
+	    int (*mem_write)(addr_t guest_addr, void * src, uint_t length, void * private_data);
+	};
 
+	struct {
+	    int num_ports;
+	    uint16_t default_base_port;
+	    int (*io_read)(ushort_t port, void * dst, uint_t length, struct vm_device * dev);
+	    int (*io_write)(ushort_t port, void * src, uint_t length, struct vm_device * dev);
+	};
+    };
 
     // Internal PCI data
     int updated;