From: Peter Dinda <pdinda@northwestern.edu>
Date: Mon, 11 Jan 2010 20:34:16 +0000 (-0600)
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=73f7dfbeb661474a53ed5b3c73898a431e5e737e;hp=-c

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

73f7dfbeb661474a53ed5b3c73898a431e5e737e
diff --combined palacios/src/devices/pci_passthrough.c
index 7b0c2d3,18e4ef4..a799e1f
--- a/palacios/src/devices/pci_passthrough.c
+++ b/palacios/src/devices/pci_passthrough.c
@@@ -191,7 -191,6 +191,6 @@@ static int pci_bar_init(int bar_num, ui
  
  	pbar->size = (uint16_t)~PCI_IO_BASE(max_val) + 1;
  
- 
  	
  	V3_Print("IO Bar with %d (%x) ports %x->%x\n", pbar->size, pbar->size, pbar->addr, pbar->addr + pbar->size);
  	// setup a set of null io hooks
@@@ -262,8 -261,6 +261,6 @@@
  
  	}
      }
-     
- 
  
  
      // Initially the virtual bars match the physical ones
@@@ -279,8 -276,6 +276,6 @@@
  	       state->virt_bars[bar_num].type, state->virt_bars[bar_num].addr, 
  	       state->virt_bars[bar_num].size);
  
- 
- 
      // Update the pci subsystem versions
      *dst = bar_val;
  
@@@ -336,11 -331,7 +331,11 @@@ static int pci_bar_write(int bar_num, u
      struct pt_bar * pbar = &(state->phys_bars[bar_num]);
      struct pt_bar * vbar = &(state->virt_bars[bar_num]);
  
 -    PrintDebug("Bar update src=0x%x\n", *src);
 +    PrintDebug("Bar update: bar_num=%d, src=0x%x\n", bar_num,*src);
 +    PrintDebug("vbar is size=%u, type=%d, addr=0x%x, val=0x%x\n",vbar->size, vbar->type, vbar->addr, vbar->val);
 +    PrintDebug("pbar is size=%u, type=%d, addr=0x%x, val=0x%x\n",pbar->size, pbar->type, pbar->addr, pbar->val);
 +
 +
  
      if (vbar->type == PT_BAR_NONE) {
  	return 0;