Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


added symbiotic virtio device
[palacios.git] / palacios / src / palacios / vmm_config.c
index 89a3f6c..3d1db47 100644 (file)
@@ -1,4 +1,4 @@
-/* 
+ /* 
  * This file is part of the Palacios Virtual Machine Monitor developed
  * by the V3VEE Project with funding from the United States National 
  * Science Foundation and the Department of Energy.  
 #include <palacios/vmm_profiler.h>
 #include <palacios/vmm_mem.h>
 #include <palacios/vmm_hypercall.h>
+#include <palacios/vmm_dev_mgr.h>
 
 
-#include <devices/serial.h>
-#include <devices/keyboard.h>
-#include <devices/8259a.h>
-#include <devices/8254.h>
-#include <devices/nvram.h>
 #include <devices/generic.h>
 #include <devices/ide.h>
 #include <devices/ram_cd.h>
+#include <devices/net_cd.h>
 #include <devices/ram_hd.h>
-#include <devices/bochs_debug.h>
-#include <devices/os_debug.h>
-#include <devices/apic.h>
-#include <devices/io_apic.h>
-#include <devices/para_net.h>
-#include <devices/pci.h>
-#include <devices/i440fx.h>
-#include <devices/piix3.h>
+#include <devices/net_hd.h>
 
 
 #include <palacios/vmm_host_events.h>
 #define USE_GENERIC 1
 
 
-
+#include <palacios/vmm_socket.h>
 
 
 static int setup_memory_map(struct guest_info * info, struct v3_vm_config * config_ptr);
 static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr);
-static struct vm_device *  configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr);
+static int configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr);
 
 
 
@@ -72,30 +62,31 @@ static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, v
 }
 
 
-
-int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
-    extern v3_cpu_arch_t v3_cpu_type;
+int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
+   extern v3_cpu_arch_t v3_cpu_type;
 
     // Amount of ram the Guest will have, rounded to a 4K page boundary
     info->mem_size = config_ptr->mem_size & ~(addr_t)0xfff;
 
+
     // Initialize the subsystem data strutures
     v3_init_time(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_host_events(info);
-    
+
+
     v3_init_decoder(info);
     
     v3_init_hypercall_map(info);
 
-    
+
     // Initialize the memory map
     v3_init_shadow_map(info);
     
-    
     if ((v3_cpu_type == V3_SVM_REV3_CPU) && 
        (config_ptr->enable_nested_paging == 1)) {
        PrintDebug("Guest Page Mode: NESTED_PAGING\n");
@@ -105,38 +96,64 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
        v3_init_shadow_page_state(info);
        info->shdw_pg_mode = SHADOW_PAGING;
     }
+
+    if (config_ptr->enable_profiling) {
+       info->enable_profiler = 1;
+       v3_init_profiler(info);
+    } else {
+       info->enable_profiler = 0;
+    }
+
+    if (config_ptr->schedule_freq == 0) {
+       // set the schedule frequency to 100 HZ
+       config_ptr->schedule_freq = 100;
+    }
+
+    PrintDebug("CPU_KHZ = %d, schedule_freq=%p\n", V3_CPU_KHZ(), (void *)config_ptr->schedule_freq);
+
+    info->yield_cycle_period = (V3_CPU_KHZ() * 1000) / config_ptr->schedule_freq;
     
     // Initial CPU operating mode
     info->cpu_mode = REAL;
     info->mem_mode = PHYSICAL_MEM;
-    
+
+    return 0;
+}
+
+
+int v3_post_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
+
     // Configure the memory map for the guest
     if (setup_memory_map(info, config_ptr) == -1) {
        PrintError("Setting up guest memory map failed...\n");
        return -1;
     }
     
-    // Configure the devices for the guest
-    setup_devices(info, config_ptr);
-    
-    if (config_ptr->enable_profiling) {
-       info->enable_profiler = 1;
-       v3_init_profiler(info);
-    } else {
-       info->enable_profiler = 0;
-    }
-
     //v3_hook_io_port(info, 1234, &IO_Read, NULL, info);
-    
-    // Setup initial cpu register state
-    info->rip = 0xfff0;
-    info->vm_regs.rsp = 0x0;
   
-    
+    if (setup_devices(info, config_ptr) == -1) {
+       PrintError("Failed to setup devices\n");
+       return -1;
+    }
+
+    info->run_state = VM_STOPPED;
+
+    info->vm_regs.rdi = 0;
+    info->vm_regs.rsi = 0;
+    info->vm_regs.rbp = 0;
+    info->vm_regs.rsp = 0;
+    info->vm_regs.rbx = 0;
+    info->vm_regs.rdx = 0;
+    info->vm_regs.rcx = 0;
+    info->vm_regs.rax = 0;
+
     return 0;
 }
 
 
+
+
+
 /* TODO:
  * The amount of guest memory is stored in info->mem_size
  * We need to make sure the memory map extends to cover it
@@ -152,7 +169,7 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf
        }
     } else {
        v3_hook_write_mem(info, 0xa0000, 0xc0000, 0xa0000,  passthrough_mem_write, NULL);
-    }  
+    }
 
 #define VGABIOS_START 0x000c0000
 #define ROMBIOS_START 0x000f0000
@@ -179,7 +196,7 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf
            return -1;
        }
     }
-#endif    
+#endif
 
     print_shadow_map(info);
 
@@ -190,99 +207,122 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf
 
 static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr) {
 
-    struct vm_device * ide = NULL;
-    struct vm_device * ramdisk = NULL;
+    v3_create_device(info, "8259A", NULL);
+    v3_create_device(info, "KEYBOARD", NULL);
+    v3_create_device(info, "8254_PIT", NULL); 
+    v3_create_device(info, "BOCHS_DEBUG", NULL);
+    v3_create_device(info, "OS_DEBUG", NULL);
+    v3_create_device(info, "LAPIC", NULL);
+    v3_create_device(info, "IOAPIC", "LAPIC");
+    v3_create_device(info, "VMNET", NULL);
     
-    struct vm_device * pci = NULL;
-    struct vm_device * northbridge = NULL;
-    struct vm_device * southbridge = NULL;
-
-    struct vm_device * nvram = NULL;
-    struct vm_device * pic = v3_create_pic();
-    struct vm_device * keyboard = v3_create_keyboard();
-    struct vm_device * pit = v3_create_pit(); 
-    struct vm_device * bochs_debug = v3_create_bochs_debug();
-    struct vm_device * os_debug = v3_create_os_debug();
-    struct vm_device * apic = v3_create_apic();
-    struct vm_device * ioapic = v3_create_io_apic(apic);
-    struct vm_device * para_net = v3_create_para_net();
-
-
-    //struct vm_device * serial = v3_create_serial();
-    struct vm_device * generic = NULL;
-
-
     int use_generic = USE_GENERIC;
 
     if (config_ptr->enable_pci == 1) {
-       pci = v3_create_pci();
-       northbridge = v3_create_i440fx(pci);
-       southbridge = v3_create_piix3(pci);
-       ide = v3_create_ide(pci, southbridge);
-    } else {
-       ide = v3_create_ide(NULL, NULL);
-    }
-
+       struct ide_cfg ide_config = {"PCI", "PIIX3"};
+       
+       v3_create_device(info, "PCI", NULL);
+       v3_create_device(info, "i440FX", "PCI");
+       v3_create_device(info, "PIIX3", "PCI");
+       
 
+       v3_create_device(info, "LNX_VIRTIO_SYM", "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");
 
-    nvram = v3_create_nvram(ide);
 
-    if (config_ptr->use_ram_cd == 1) {
-       PrintDebug("Creating Ram CD\n");
-       ramdisk = v3_create_ram_cd(ide, 0, 0, 
-                                  (addr_t)(config_ptr->ramdisk), 
-                                  config_ptr->ramdisk_size);
-    } else if (config_ptr->use_ram_hd == 1) {
-       PrintDebug("Creating Ram HD\n");
-       ramdisk = v3_create_ram_hd(ide, 0, 0, 
-                                  (addr_t)(config_ptr->ramdisk), 
-                                  config_ptr->ramdisk_size);
-    }
-    
-    
-    if (use_generic) {
-       generic = configure_generic(info, config_ptr);
+       v3_create_device(info, "IDE", &ide_config);
+    } else {
+       v3_create_device(info, "IDE", NULL);
     }
 
 
+    if (config_ptr->pri_disk_type != NONE) {
+       if (config_ptr->pri_disk_type == CDROM) {
+           if (config_ptr->pri_disk_con == RAM) {
+               struct ram_cd_cfg cfg = {"IDE", 0, 0, 
+                                        (addr_t)(config_ptr->pri_disk_info.ram.data_ptr), 
+                                        config_ptr->pri_disk_info.ram.size};
+
+               PrintDebug("Creating RAM CD\n");
+
+               v3_create_device(info, "RAM-CD", &cfg);
+           } else if (config_ptr->pri_disk_con == NETWORK) {
+               struct net_cd_cfg cfg = {"IDE", 0, 0, 
+                                        config_ptr->pri_disk_info.net.ip_str,
+                                        config_ptr->pri_disk_info.net.port, 
+                                        config_ptr->pri_disk_info.net.disk_name};
+               PrintDebug("Creating NET CD\n");
+
+               v3_create_device(info, "NET-CD", &cfg);
+           }
+       } else if (config_ptr->pri_disk_type == HARDDRIVE) {
+           if (config_ptr->pri_disk_con == RAM) {
+               struct ram_hd_cfg cfg = {"IDE", 0, 0, 
+                                        (addr_t)(config_ptr->pri_disk_info.ram.data_ptr), 
+                                        config_ptr->pri_disk_info.ram.size};
+
+               PrintDebug("Creating RAM HD\n");
+
+               v3_create_device(info, "RAM-HD", &cfg);
+           } else if (config_ptr->pri_disk_con == NETWORK) {
+               struct net_hd_cfg cfg  = {"IDE", 0, 0, 
+                                         config_ptr->pri_disk_info.net.ip_str,
+                                         config_ptr->pri_disk_info.net.port, 
+                                         config_ptr->pri_disk_info.net.disk_name};
+               PrintDebug("Creating NET HD\n");
+               v3_create_device(info, "NET-HD", &cfg);
+           }
+       }
+    }
 
 
 
-    v3_attach_device(info, pic);
-    v3_attach_device(info, pit);
-    v3_attach_device(info, keyboard);
-    // v3_attach_device(info, serial);
-    v3_attach_device(info, bochs_debug);
-    v3_attach_device(info, os_debug);
-
-    v3_attach_device(info, apic);
-    v3_attach_device(info, ioapic);
-
-    v3_attach_device(info, para_net);
-
-    if (config_ptr->enable_pci == 1) {
-       PrintDebug("Attaching PCI\n");
-       v3_attach_device(info, pci);
-       PrintDebug("Attaching Northbridge\n");
-       v3_attach_device(info, northbridge);
-       PrintDebug("Attaching Southbridge\n");
-       v3_attach_device(info, southbridge);
+    if (config_ptr->sec_disk_type != NONE) {
+       if (config_ptr->sec_disk_type == CDROM) {
+           if (config_ptr->sec_disk_con == RAM) {
+               struct ram_cd_cfg cfg = {"IDE", 0, 1, 
+                                        (addr_t)(config_ptr->sec_disk_info.ram.data_ptr), 
+                                        config_ptr->sec_disk_info.ram.size};
+
+               PrintDebug("Creating RAM CD\n");
+               v3_create_device(info, "RAM-CD", &cfg);
+           } else if (config_ptr->sec_disk_con == NETWORK) {
+               struct net_cd_cfg cfg = {"IDE", 0, 1, 
+                                        config_ptr->sec_disk_info.net.ip_str,
+                                        config_ptr->sec_disk_info.net.port, 
+                                        config_ptr->sec_disk_info.net.disk_name};
+
+               PrintDebug("Creating NET CD\n");
+               v3_create_device(info, "NET-CD", &cfg);    
+           }
+       } else if (config_ptr->sec_disk_type == HARDDRIVE) {
+           if (config_ptr->sec_disk_con == RAM) {
+               struct ram_hd_cfg cfg = {"IDE", 0, 1, 
+                                        (addr_t)(config_ptr->sec_disk_info.ram.data_ptr), 
+                                        config_ptr->sec_disk_info.ram.size};
+               PrintDebug("Creating RAM HD\n");
+               v3_create_device(info, "RAM-HD", &cfg);
+           } else if (config_ptr->sec_disk_con == NETWORK) {
+               struct net_hd_cfg cfg = {"IDE", 0, 1, 
+                                        config_ptr->sec_disk_info.net.ip_str,
+                                        config_ptr->sec_disk_info.net.port, 
+                                        config_ptr->sec_disk_info.net.disk_name};
+               PrintDebug("Creating NET HD\n");
+               v3_create_device(info, "NET-HD", &cfg);
+           }
+       }
     }
 
-    PrintDebug("Attaching IDE\n");
-    v3_attach_device(info, ide);
 
-    if (ramdisk != NULL) {
-       v3_attach_device(info, ramdisk);
-    }
 
     if (use_generic) {
-       // Important that this be attached last!
-       v3_attach_device(info, generic);
+       configure_generic(info, config_ptr);
     }
 
-    // This should go last because it contains the hardware state
-    v3_attach_device(info, nvram);
+    // This should go last because it requires information about the Harddrives
+    v3_create_device(info, "NVRAM", "IDE");
     
     PrintDebugDevMgr(info);
 
@@ -291,10 +331,22 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
 
 
 
-static struct vm_device *  configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr) {
+
+static int configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr) {
     PrintDebug("Creating Generic Device\n");
-    struct vm_device * generic = v3_create_generic();
+    v3_create_device(info, "GENERIC", NULL);
     
+
+    struct vm_device * generic = v3_find_dev(info, "GENERIC");
+
+    if (!generic) {
+       PrintError("Could not find generic device\n");
+       return -1;
+    }
+
+    // port 0x92: A20 enable/disable (bit 2) (This causes an MMU flush)
+
+
     // Make the DMA controller invisible
     v3_generic_add_port_range(generic, 0x00, 0x07, GENERIC_PRINT_AND_IGNORE);   // DMA 1 channels 0,1,2,3 (address, counter)
     v3_generic_add_port_range(generic, 0xc0, 0xc7, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channels 4,5,6,7 (address, counter)
@@ -391,10 +443,7 @@ static struct vm_device *  configure_generic(struct guest_info * info, struct v3
     v3_generic_add_port_range(generic, 0xc100, 0xc1ff, GENERIC_PRINT_AND_PASSTHROUGH);
 #endif
 
-
-
     //  v3_generic_add_port_range(generic, 0x378, 0x400, GENERIC_PRINT_AND_IGNORE);
     
-
-    return generic;
+    return 0;
 }