X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Finterfaces%2Fhost_pci.c;h=6ed5c0869a22cf3cd51d19effa68d1ccfa19eeb1;hb=4d1d8fadad33de7d3ebce2083d9782048f78b44e;hp=e945b92a7e9eaf85aee8b67abdeb7f2d31872f72;hpb=ffd6d915b585a4a17a2d5b081313f0968885a105;p=palacios.git

diff --git a/palacios/src/interfaces/host_pci.c b/palacios/src/interfaces/host_pci.c
index e945b92..6ed5c08 100644
--- a/palacios/src/interfaces/host_pci.c
+++ b/palacios/src/interfaces/host_pci.c
@@ -31,24 +31,33 @@ static struct v3_host_pci_hooks * pci_hooks = NULL;
 
 void V3_Init_Host_PCI(struct v3_host_pci_hooks * hooks) {
     pci_hooks = hooks;
-    V3_Print("V3 host PCI interface intialized\n");
+    V3_Print(VM_NONE, VCORE_NONE, "V3 host PCI interface intialized\n");
     return;
 }
 
 
 /* This is ugly and should be abstracted out to a function in the memory manager */
-int V3_get_guest_mem_region(struct v3_vm_info * vm, struct v3_guest_mem_region * region) {
+int V3_get_guest_mem_region(struct v3_vm_info * vm, struct v3_guest_mem_region * region, uint64_t gpa) {
+    struct v3_mem_region * v3_reg = NULL;
+    
+    memset(region, 0, sizeof(struct v3_guest_mem_region));
 
     if (!vm) {
-	PrintError("Tried to get a nenregion from a NULL vm pointer\n");
+        PrintError(vm, VCORE_NONE, "Tried to get a menregion from a NULL vm pointer\n");
 	return -1;
     }
 
 
-    region->start = vm->mem_map.base_region.host_addr;
-    region->end = vm->mem_map.base_region.host_addr + (vm->mem_map.base_region.guest_end - vm->mem_map.base_region.guest_start);
+    v3_reg = v3_get_base_region(vm, gpa);
+
+    if (v3_reg == NULL) {
+	return 0;
+    }
+
+    region->start = v3_reg->host_addr;
+    region->end = v3_reg->host_addr + (v3_reg->guest_end - v3_reg->guest_start);
 
-    return 0;
+    return 1;
 }
 
 
@@ -58,14 +67,14 @@ struct v3_host_pci_dev * v3_host_pci_get_dev(struct v3_vm_info * vm,
     struct v3_host_pci_dev * host_dev = NULL;
 
     if ((!pci_hooks) || (!pci_hooks->request_device)) {
-	PrintError("Host PCI Hooks not initialized\n");
+	PrintError(vm, VCORE_NONE, "Host PCI Hooks not initialized\n");
 	return NULL;
     }
 
     host_dev = pci_hooks->request_device(url, vm);
 
     if (host_dev == NULL) {
-	PrintError("Could not find host PCI device (%s)\n", url);
+	PrintError(vm, VCORE_NONE, "Could not find host PCI device (%s)\n", url);
 	return NULL;
     }
 
@@ -81,7 +90,7 @@ int v3_host_pci_config_write(struct v3_host_pci_dev * v3_dev,
 			     uint32_t length) {
 
     if ((!pci_hooks) || (!pci_hooks->config_write)) {
-	PrintError("Host PCI hooks not initialized\n");
+        PrintError(VM_NONE, VCORE_NONE, "Host PCI hooks not initialized\n");
 	return -1;
     }
 
@@ -94,7 +103,7 @@ int v3_host_pci_config_read(struct v3_host_pci_dev * v3_dev,
 			     uint32_t length) {
 
     if ((!pci_hooks) || (!pci_hooks->config_read)) {
-	PrintError("Host PCI hooks not initialized\n");
+	PrintError(VM_NONE, VCORE_NONE, "Host PCI hooks not initialized\n");
 	return -1;
     }
 
@@ -104,7 +113,7 @@ int v3_host_pci_config_read(struct v3_host_pci_dev * v3_dev,
 int v3_host_pci_ack_irq(struct v3_host_pci_dev * v3_dev, uint32_t vec_index) {
 
     if ((!pci_hooks) || (!pci_hooks->ack_irq)) {
-	PrintError("Host PCI hooks not initialized\n");
+	PrintError(VM_NONE, VCORE_NONE, "Host PCI hooks not initialized\n");
 	return -1;
     }
 
@@ -116,7 +125,7 @@ int v3_host_pci_ack_irq(struct v3_host_pci_dev * v3_dev, uint32_t vec_index) {
 int v3_host_pci_cmd_update(struct v3_host_pci_dev * v3_dev, pci_cmd_t cmd, uint64_t arg ) {
 
     if ((!pci_hooks) || (!pci_hooks->pci_cmd)) {
-	PrintError("Host PCI hooks not initialized\n");
+	PrintError(VM_NONE, VCORE_NONE, "Host PCI hooks not initialized\n");
 	return -1;
     }
 
@@ -129,7 +138,7 @@ int v3_host_pci_cmd_update(struct v3_host_pci_dev * v3_dev, pci_cmd_t cmd, uint6
 
 int V3_host_pci_raise_irq(struct v3_host_pci_dev * v3_dev, uint32_t vec_index) {
     if (!v3_dev->irq_handler) {
-	PrintError("No interrupt registerd for host pci device\n");
+	PrintError(VM_NONE, VCORE_NONE, "No interrupt registerd for host pci device\n");
 	return -1;
     }