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

Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu//home/palacios/palacios into devel

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

dd3f7ea6cca033e643e66176c08896f0ea5de9e9
diff --cc palacios/src/devices/pci.c
index 8170e6e,de3e0ea..f1d5395
--- a/palacios/src/devices/pci.c
+++ b/palacios/src/devices/pci.c
@@@ -369,19 -380,12 +380,21 @@@ static int data_port_write(ushort_t por
  		    pci_dev->bar[bar_reg].updated = 1;
  		}
  	    } else if ((cur_reg >= 0x30) && (cur_reg < 0x34)) {
- 		pci_dev->ext_rom_updated = 1;
+ 		pci_dev->ext_rom_update_flag = 1;
 -	    } else if ((cur_reg == 0x04) || (cur_reg == 0x05)) {
 -		// COMMAND update
 +	    } else if (cur_reg == 0x04) {
 +	      // COMMAND update	     
 +	      uint8_t command = *((uint8_t *)src + i);
 +
 +	      pci_dev->config_space[cur_reg] = command;	      
 +
 +	      if (pci_dev->cmd_update) {
 +		pci_dev->cmd_update(pci_dev, (command & 0x01), (command & 0x02));
 +	      }
- 	      
++	     
++
  	    } else if (cur_reg == 0x0f) {
  		// BIST update
+ 		pci_dev->config_header.BIST = 0x00;
  	    }
  	}
      }