X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fne2k.c;h=420bc79865ed72918c9b5aaab8fefe8769da1fc8;hb=d597d493eb303496f3bb32e2a73a094a8a20a022;hp=d4e8852640dff1368f9446c4ec9eb92b1c2d994d;hpb=603f73496c7025fc3929f209fd4185627370751c;p=palacios.git

diff --git a/palacios/src/devices/ne2k.c b/palacios/src/devices/ne2k.c
index d4e8852..420bc79 100644
--- a/palacios/src/devices/ne2k.c
+++ b/palacios/src/devices/ne2k.c
@@ -334,7 +334,7 @@ static int ne2k_update_irq(struct ne2k_state * nic_state) {
        if (pci_dev == NULL){
 	    v3_raise_virq(&(nic_state->vm->cores[0]), NE2K_DEFAULT_IRQ);
        } else {	    
-	    v3_pci_raise_irq(nic_state->pci_bus, 0, nic_state->pci_dev);
+	   v3_pci_raise_irq(nic_state->pci_bus, nic_state->pci_dev, 0);
        }
 
        nic_state->statistics.rx_interrupts ++;
@@ -1088,7 +1088,8 @@ static int ne2k_pci_read(struct guest_info * core,
 
 }
 
-static int pci_config_update(uint_t reg_num, 
+static int pci_config_update(struct pci_device * pci_dev,
+                        uint32_t reg_num,
 			     void * src, 
 			     uint_t length,
 			     void * private_data) {
@@ -1115,7 +1116,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;
@@ -1124,7 +1125,7 @@ static int register_dev(struct ne2k_state * nic_state)
 
 	pci_dev = v3_pci_register_device(nic_state->pci_bus, PCI_STD_DEVICE, 0, -1, 0, 
 					 "NE2000", bars,
-					 pci_config_update, NULL, NULL, nic_state);
+					 pci_config_update, NULL, NULL, NULL, nic_state);
 
 
     	if (pci_dev == NULL) {
@@ -1217,6 +1218,12 @@ static int ne2k_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     char * macstr = v3_cfg_val(cfg, "mac");
 
     nic_state  = (struct ne2k_state *)V3_Malloc(sizeof(struct ne2k_state));
+
+    if (!nic_state) {
+	PrintError("Cannot allocate in init\n");
+	return -1;
+    }
+
     memset(nic_state, 0, sizeof(struct ne2k_state));
 
     nic_state->pci_bus = pci_bus;