From: Lei Xia <lxia@northwestern.edu>
Date: Mon, 16 Mar 2009 18:10:35 +0000 (-0500)
Subject: Merge branch 'devel' of /home/palacios/palacios into devel
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=95ca28a23f949b13c857ba0b061a2ca465683e8e

Merge branch 'devel' of /home/palacios/palacios into devel

Conflicts:
	palacios/src/devices/pci.c
---

95ca28a23f949b13c857ba0b061a2ca465683e8e
diff --cc palacios/include/devices/pci.h
index 01ce86a,23f459c..090ac62
--- a/palacios/include/devices/pci.h
+++ b/palacios/include/devices/pci.h
@@@ -64,10 -64,10 +64,13 @@@ struct pci_device 
  
      int (*config_update)(struct pci_device * pci_dev, uint_t reg_num, int length);
  
 +    int (*cmd_update)(struct pci_dev *pci_dev, uchar_t io_enabled, uchar_t mem_enabled);
 +    int (*ext_rom_update)(struct pci_dev *pci_dev);
 +
  
+     int ext_rom_update_flag;
+     int bar_update_flag;
+ 
      void * priv_data;
  };
  
diff --cc palacios/src/devices/pci.c
index 9162384,e86af94..42077e9
--- a/palacios/src/devices/pci.c
+++ b/palacios/src/devices/pci.c
@@@ -491,9 -528,8 +528,10 @@@ struct pci_device * v3_pci_register_dev
  					   uint_t bus_num,
  					   const char * name,
  					   int dev_num,
 +					   struct v3_pci_bar * bars,
  					   int (*config_update)(struct pci_device * pci_dev, uint_t reg_num, int length),
 +					   int (*cmd_update)(struct pci_dev *pci_dev, uchar_t io_enabled, uchar_t mem_enabled),
+ 					   int (*bar_update)(struct pci_device * pci_dev, uint_t bar),
  					   void * private_data) {
  
      struct pci_internal * pci_state = (struct pci_internal *)pci->private_data;