made symbiotic intialization compile time configurable

[palacios.git] / palacios / src / palacios / vmm_config.c

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index d4bd23a..136213d 100644 (file)
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -26,12 +26,17 @@
 #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>
 #include <devices/ram_cd.h>
@@ -94,6 +99,7 @@ int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_p
     v3_init_hypercall_map(info);
     v3_init_io_map(info);
     v3_init_msr_map(info);
+    v3_init_cpuid_map(info);
     v3_init_host_events(info);
 
     // Initialize the memory map
@@ -109,7 +115,9 @@ 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);
@@ -155,7 +163,7 @@ int v3_post_config_guest(struct guest_info * info, struct v3_vm_config * config_
        return -1;
     }
 
-    v3_print_io_map(info);
+    //    v3_print_io_map(info);
     v3_print_msr_map(info);
 
     info->run_state = VM_STOPPED;
@@ -256,7 +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_pt_cfg = {"PCI", "E1000", 0x8086, 0x100e};
+       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");
@@ -270,7 +279,9 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
 
        v3_create_device(info, "IDE", &ide_config);
        
-       v3_create_device(info, "PCI_PASSTHROUGH", &pci_pt_cfg);
+       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);