#include <palacios/vmm_mem.h>
#include <palacios/vmm_hypercall.h>
#include <palacios/vmm_dev_mgr.h>
+#include <palacios/vmm_cpuid.h>
+#include <palacios/vmm_xml.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_hd.h>
#include <devices/net_hd.h>
-#include <devices/video.h>
+#include <devices/telnet_cons.h>
+#include <devices/pci_passthrough.h>
+
+/*
+static const char * test_cfg_xml = \
+"<root>\n \
+<memory>2048</memory>\n\
+<devices>\n\
+<device id=\"PCI\" />\n\
+<device id=\"IDE\" />\n\
+</devices>\n\
+</root>";
+*/
-#ifndef CONFIG_VIDEO
+#ifdef CONFIG_PASSTHROUGH_VIDEO
static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) {
return length;
#endif
int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
- extern v3_cpu_arch_t v3_cpu_type;
+ extern v3_cpu_arch_t v3_cpu_types[];
+
+
+ /*
+ {
+ struct v3_xml * cfg = v3_xml_parse((char *)test_cfg_xml);
+ struct v3_xml * devs = NULL;
+ struct v3_xml * tmp = NULL;
+ PrintError("Parsed XML COnfig %s\n", v3_xml_name(cfg));
+
+ PrintError("memory=%s\n", v3_xml_txt(v3_xml_child(cfg, "memory")));
+
+ devs = v3_xml_child(cfg, "devices");
+
+ for (tmp = v3_xml_child(devs, "device"); tmp; tmp = v3_xml_next(tmp)) {
+ PrintError("Device: %s, id=%s\n",
+ v3_xml_name(tmp),
+ v3_xml_attr(tmp, "id"));
+ }
+ v3_xml_free(cfg);
+
+ return -1;
+ }
+ */
// Amount of ram the Guest will have, rounded to a 4K page boundary
info->mem_size = config_ptr->mem_size & ~(addr_t)0xfff;
+ info->cpu_id = config_ptr->guest_cpu;
+
/*
* Initialize the subsystem data strutures
*/
}
#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);
+ if (v3_init_shadow_map(info) == -1) {
+ PrintError("Could not initialize shadow map\n");
+ return -1;
+ }
- if ((v3_cpu_type == V3_SVM_REV3_CPU) &&
+ if ((v3_cpu_types[info->cpu_id] == V3_SVM_REV3_CPU) &&
(config_ptr->enable_nested_paging == 1)) {
PrintDebug("Guest Page Mode: NESTED_PAGING\n");
info->shdw_pg_mode = NESTED_PAGING;
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;
*/
static int setup_memory_map(struct guest_info * info, struct v3_vm_config * config_ptr) {
-#ifndef CONFIG_VIDEO
+#ifdef CONFIG_PASSTHROUGH_VIDEO
PrintDebug("Setting up memory map (memory size=%dMB)\n", (uint_t)(info->mem_size / (1024 * 1024)));
// VGA frame buffer
}
#endif
- print_shadow_map(info);
+ v3_print_mem_map(info);
return 0;
}
v3_create_device(info, "VMNET", NULL);
+ v3_create_device(info, "CGA_VIDEO", (void *)1);
+ {
+ struct telnet_cons_cfg cons_cfg = {"CGA_VIDEO", 19997};
+ v3_create_device(info, "TELNET_CONSOLE", &cons_cfg);
+ }
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, "LNX_VIRTIO_BLK", "PCI");
v3_create_device(info, "LNX_VIRTIO_BALLOON", "PCI");
v3_create_device(info, "SYM_SWAP", "LNX_VIRTIO_BLK");
-
- v3_create_device(info, "VIDEO", "PCI");
+ // v3_create_device(info, "TMP_BLK", "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);
}
PrintDebug("Creating NET HD\n");
v3_create_device(info, "NET-HD", &cfg);
}
+
+ } else if (config_ptr->pri_disk_type == VIRTIO) {
+ if (config_ptr->pri_disk_con == RAM) {
+ struct ram_hd_cfg cfg = {"LNX_VIRTIO_BLK", 0, 0,
+ (addr_t)(config_ptr->pri_disk_info.ram.data_ptr),
+ config_ptr->pri_disk_info.ram.size};
+
+ PrintDebug("Creating Virtio RAM HD\n");
+
+ v3_create_device(info, "RAM-HD", &cfg);
+ }
+
}
}
#endif
-#ifndef CONFIG_VIDEO
+#ifdef CONFIG_PASTHROUGH_VIDEO
// Monitor graphics card operations
