X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=136213d7ed456bdef15c836216bda89a4ffda6c3;hb=9eabc1235b1288295a9958ce0af61e6edb329337;hp=ed54ab5b1dc61aba1d4ef491f4366d76343308aa;hpb=3a4e54ec208ea3589963b410d2d73292bbc4a8fe;p=palacios.git diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index ed54ab5..136213d 100644 --- a/palacios/src/palacios/vmm_config.c +++ b/palacios/src/palacios/vmm_config.c @@ -26,11 +26,17 @@ #include #include #include +#include + +#ifdef CONFIG_SYMBIOTIC +#include #ifdef CONFIG_SYMBIOTIC_SWAP #include #endif +#endif + #include #include #include @@ -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; @@ -254,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"); @@ -268,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);