#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/net_hd.h>
#include <devices/telnet_cons.h>
+#include <devices/pci_passthrough.h>
}
#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);
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) {
return -1;
}
+ // v3_print_io_map(info);
+ v3_print_msr_map(info);
+
info->run_state = VM_STOPPED;
info->vm_regs.rdi = 0;
}
#endif
- print_shadow_map(info);
+ v3_print_mem_map(info);
return 0;
}
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");
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);
}