From: Patrick G. Bridges <bridges@cs.unm.edu>
Date: Fri, 11 Nov 2011 18:42:55 +0000 (-0700)
Subject: Merge branch 'devel' of ssh://newskysaw.cs.northwestern.edu/home/palacios/palacios... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=4a87564dd627efc2fa0b15044ebd16b98cc0009a;hp=c3e451f106e9594b46d7c3dd3c4fdd610d7a2c03

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

diff --git a/palacios/src/devices/ne2k.c b/palacios/src/devices/ne2k.c
index d4e8852..b4796f7 100644
--- a/palacios/src/devices/ne2k.c
+++ b/palacios/src/devices/ne2k.c
@@ -1115,7 +1115,7 @@ static int register_dev(struct ne2k_state * nic_state)
 	}
 
 	bars[0].type = PCI_BAR_IO;
-	bars[0].default_base_port = NIC_REG_BASE_PORT;
+	bars[0].default_base_port = -1;
 	bars[0].num_ports = 256;
 
 	bars[0].io_read = ne2k_pci_read;
diff --git a/palacios/src/devices/rtl8139.c b/palacios/src/devices/rtl8139.c
index 176d053..33a5cfa 100644
--- a/palacios/src/devices/rtl8139.c
+++ b/palacios/src/devices/rtl8139.c
@@ -1713,7 +1713,7 @@ static int register_dev(struct rtl8139_state * nic_state)  {
     }
 
     bars[0].type = PCI_BAR_IO;
-    bars[0].default_base_port = 0xc100;
+    bars[0].default_base_port = -1;
     bars[0].num_ports = 0x100;
 
     bars[0].io_read = rtl8139_ioport_read;