X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fpci_passthrough.c;h=102c6eb2beee2dd55c2390f9bda9d8c65b6c7cf4;hb=c2218fcbc6023d380dbf88895fed679a8e14a210;hp=2ace0743b90977c8765b89685095294fa93be603;hpb=e2964f7234daa3429275c039769a313f0870c212;p=palacios.git

diff --git a/palacios/src/devices/pci_passthrough.c b/palacios/src/devices/pci_passthrough.c
index 2ace074..102c6eb 100644
--- a/palacios/src/devices/pci_passthrough.c
+++ b/palacios/src/devices/pci_passthrough.c
@@ -588,7 +588,7 @@ static int pci_bar_write(int bar_num, uint32_t * src, void * private_data) {
 }
 
 
-static int pt_config_update(uint_t reg_num, void * src, uint_t length, void * private_data) {
+static int pt_config_update(struct pci_device * pci_dev, uint_t reg_num, void * src, uint_t length, void * private_data) {
     struct vm_device * dev = (struct vm_device *)private_data;
     struct pt_dev_state * state = (struct pt_dev_state *)dev->private_data;
     union pci_addr_reg pci_addr = {state->phys_pci_addr.value};
@@ -732,6 +732,7 @@ static int setup_virt_pci_dev(struct v3_vm_info * vm_info, struct vm_device * de
 				     bus_num, -1, 0, 
 				     state->name, bars,
 				     pt_config_update,
+				     NULL, 
 				     NULL,
 				     pt_exp_rom_write,               
 				     dev);
@@ -762,7 +763,7 @@ static int irq_handler(struct v3_vm_info * vm, struct v3_interrupt * intr, void
     struct pt_dev_state * state = (struct pt_dev_state *)dev->private_data;
 
 
-    v3_pci_raise_irq(state->pci_bus, 0, state->pci_dev);
+    v3_pci_raise_irq(state->pci_bus, state->pci_dev, 0);
 
     V3_ACK_IRQ(intr->irq);
 
@@ -778,6 +779,10 @@ static int passthrough_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct vm_device * pci = v3_find_dev(vm, v3_cfg_val(cfg, "bus"));
     char * dev_id = v3_cfg_val(cfg, "ID");    
 
+    if (!state) {
+	PrintError("Cannot allocate in init\n");
+	return -1;
+    }
 
     memset(state, 0, sizeof(struct pt_dev_state));
 
@@ -790,10 +795,11 @@ static int passthrough_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     strncpy(state->name, dev_id, 32);
 
 
-    dev = v3_allocate_device(dev_id, &dev_ops, state);
+    dev = v3_add_device(vm, dev_id, &dev_ops, state);
 
-    if (v3_attach_device(vm, dev) == -1) {
+    if (dev == NULL) {
 	PrintError("Could not attach device %s\n", dev_id);
+	V3_Free(state);
 	return -1;
     }
 
@@ -804,6 +810,7 @@ static int passthrough_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 	PrintError("Could not find PCI Device %s:%s\n", 
 		   v3_cfg_val(cfg, "vendor_id"), 
 		   v3_cfg_val(cfg, "device_id"));
+	v3_remove_device(dev);
 	return 0;
     }