X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=136213d7ed456bdef15c836216bda89a4ffda6c3;hb=fa05269fd639f61ea0c154e6c4bf1daabeb90459;hp=c7282233eb4793276cbb1b75ae884f3214d8789e;hpb=068d7e66db537f981fde19a098a12e4390fa3de4;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index c728223..136213d 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -26,11 +26,16 @@
 #include <palacios/vmm_mem.h>
 #include <palacios/vmm_hypercall.h>
 #include <palacios/vmm_dev_mgr.h>
+#include <palacios/vmm_cpuid.h>
+
+#ifdef CONFIG_SYMBIOTIC
+#include <palacios/vmm_sym_iface.h>
 
 #ifdef CONFIG_SYMBIOTIC_SWAP
 #include <palacios/vmm_sym_swap.h>
 #endif
 
+#endif
 
 #include <devices/generic.h>
 #include <devices/ide.h>
@@ -40,6 +45,7 @@
 #include <devices/net_hd.h>
 
 #include <devices/telnet_cons.h>
+#include <devices/pci_passthrough.h>
 
 
 
@@ -90,25 +96,12 @@ int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_p
     }
 #endif
 
-    v3_init_time(info);
+    v3_init_hypercall_map(info);
     v3_init_io_map(info);
     v3_init_msr_map(info);
-    v3_init_interrupt_state(info);
-    v3_init_exception_state(info);
-    v3_init_dev_mgr(info);
+    v3_init_cpuid_map(info);
     v3_init_host_events(info);
 
-
-    v3_init_decoder(info);
-    
-    v3_init_hypercall_map(info);
-
-#ifdef CONFIG_SYMBIOTIC_SWAP
-    v3_init_sym_swap(info);
-#endif
-
-
-
     // Initialize the memory map
     v3_init_shadow_map(info);
     
@@ -122,6 +115,20 @@ int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_p
 	info->shdw_pg_mode = SHADOW_PAGING;
     }
 
+#ifdef CONFIG_SYMBIOTIC
+    v3_init_sym_iface(info);
+#endif
+
+    v3_init_time(info);
+    v3_init_interrupt_state(info);
+    v3_init_exception_state(info);
+    v3_init_dev_mgr(info);
+    v3_init_decoder(info);
+    
+#ifdef CONFIG_SYMBIOTIC_SWAP
+    PrintDebug("initializing symbiotic swap\n");
+    v3_init_sym_swap(info);
+#endif
 
 
     if (config_ptr->schedule_freq == 0) {
@@ -156,6 +163,9 @@ int v3_post_config_guest(struct guest_info * info, struct v3_vm_config * config_
 	return -1;
     }
 
+    //    v3_print_io_map(info);
+    v3_print_msr_map(info);
+
     info->run_state = VM_STOPPED;
 
     info->vm_regs.rdi = 0;
@@ -227,7 +237,7 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf
     }
 #endif
 
-    print_shadow_map(info);
+    v3_print_mem_map(info);
 
     return 0;
 }
@@ -254,6 +264,8 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
 
     if (config_ptr->enable_pci == 1) {
 	struct ide_cfg ide_config = {"PCI", "PIIX3"};
+	struct pci_passthrough_cfg pci_qemu_pt_cfg = {"PCI", "E1000", 0x8086, 0x100e};
+	struct pci_passthrough_cfg pci_hw_pt_cfg = {"PCI", "E1000", 0x8086, 0x107c};
 	
 	v3_create_device(info, "PCI", NULL);
 	v3_create_device(info, "i440FX", "PCI");
@@ -266,6 +278,11 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
 	v3_create_device(info, "SYM_SWAP", "LNX_VIRTIO_BLK");
 
 	v3_create_device(info, "IDE", &ide_config);
+       
+	v3_create_device(info, "PCI_PASSTHROUGH", &pci_qemu_pt_cfg);
+	v3_create_device(info, "PCI_PASSTHROUGH", &pci_hw_pt_cfg);
+
+
     } else {
 	v3_create_device(info, "IDE", NULL);
     }