added mem_size config variable

not yet hooked up in the VMM
restructured the configuration

diff --git a/kitten/palacios-glue/vm.c b/kitten/palacios-glue/vm.c
index 1d3e322..fbc61dc 100644 (file)
--- a/kitten/palacios-glue/vm.c
+++ b/kitten/palacios-glue/vm.c
@@ -38,6 +38,7 @@ v3vee_run_vmm( void )
                .rombios_size           = (&rombios_end)-(&rombios_start),
                .vgabios                = &vgabios_start,
                .vgabios_size           = (&vgabios_end)-(&vgabios_start),
+               .mem_size               = (16 * 1024 * 1024), 
                .use_ramdisk            = 1,
                .ramdisk                = (void*) initrd_start,
                .ramdisk_size           = initrd_end - initrd_start,

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 10a95aa..e1a9199 100644 (file)
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -111,9 +111,11 @@ struct guest_info {
 
   uint_t cpl;
 
+  addr_t mem_size; // Probably in bytes for now....
   struct shadow_map mem_map;
 
   struct vm_time time_state;
+
   
   v3_paging_mode_t shdw_pg_mode;
   struct shadow_page_state shdw_pg_state;
@@ -160,6 +162,10 @@ v3_vm_cpu_mode_t v3_get_cpu_mode(struct guest_info * info);
 v3_vm_mem_mode_t v3_get_mem_mode(struct guest_info * info);
 
 
+const uchar_t * v3_cpu_mode_to_str(v3_vm_cpu_mode_t mode);
+const uchar_t * v3_mem_mode_to_str(v3_vm_mem_mode_t mode);
+
+
 void v3_print_segments(struct guest_info * info);
 void v3_print_ctrl_regs(struct guest_info * info);
 void v3_print_GPRs(struct guest_info * info);

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 3b57710..6f22cfa 100644 (file)
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -251,6 +251,10 @@ struct v3_vm_config {
   void * vgabios;
   int vgabios_size;
 
+  unsigned long mem_size; // in bytes, var should be natural size of cpu
+                          // so we can specify maximum physical address size
+                          // (We're screwed if we want to do 32 bit host/64 bit guest)
+
   int use_ramdisk;
   void * ramdisk;
   int ramdisk_size;

diff --git a/palacios/src/devices/nvram.c b/palacios/src/devices/nvram.c
index 15c8dfa..59e2003 100644 (file)
--- a/palacios/src/devices/nvram.c
+++ b/palacios/src/devices/nvram.c
@@ -428,7 +428,15 @@ static int handle_timer_event(struct guest_info * info,
 }
 
 static int set_nvram_defaults(struct vm_device * dev) {
+  struct guest_info * info = dev->vm;
   struct nvram_internal * nvram_state = (struct nvram_internal *)dev->private_data;
+  
+  /* TODO:
+   * The amount of ram in the system is stored in info->mem_size
+   * We need to reflect that value correctly here
+   */
+  PrintError("TODO: Set the nvram memory register to reflect info->mem_size (%p)\n", (void *)(info->mem_size));
+  
 
   //
   // 2 1.44 MB floppy drives
@@ -593,7 +601,7 @@ static int nvram_write_data_port(ushort_t port,
 
 
 static int nvram_init_device(struct vm_device * dev) {
- 
+
   struct nvram_internal * data = (struct nvram_internal *)dev->private_data;
 
   PrintDebug("nvram: init_device\n");
@@ -602,6 +610,8 @@ static int nvram_init_device(struct vm_device * dev) {
 
   // Would read state here
   set_nvram_defaults(dev);
+  
+
 
   nvram_reset_device(dev);
 

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 3bbac88..fd472dd 100644 (file)
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -44,6 +44,11 @@
 
 
 
+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 mem_test_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data) {
   int foo = 20;
@@ -70,12 +75,15 @@ 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 use_ramdisk = config_ptr->use_ramdisk;
-  int use_generic = USE_GENERIC;
-
-
+  // Initialize the subsystem data strutures
   v3_init_time(info);
+  v3_init_vmm_io_map(info);
+  v3_init_msr_map(info);
+  v3_init_interrupt_state(info);
+  v3_init_dev_mgr(info);
+  v3_init_emulator(info);
+  v3_init_host_events(info);
+
   init_shadow_map(info);
   
   if (v3_cpu_type == V3_SVM_REV3_CPU) {
@@ -85,21 +93,36 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
     info->shdw_pg_mode = SHADOW_PAGING;
   }
   
+  // Initial CPU operating mode
   info->cpu_mode = REAL;
   info->mem_mode = PHYSICAL_MEM;
-  
+
+  // Amount of ram the Guest will have
+  info->mem_size = config_ptr->mem_size;
+
+  // Configure the memory map for the guest
+  setup_memory_map(info, config_ptr);
+
+  // Configure the devices for the guest
+  setup_devices(info, config_ptr);
  
-  v3_init_vmm_io_map(info);
-  v3_init_msr_map(info);
-  v3_init_interrupt_state(info);
-  
-  v3_init_dev_mgr(info);
 
-  v3_init_emulator(info);
+  //v3_hook_io_port(info, 1234, &IO_Read, NULL, info);
+
+  // Setup initial cpu register state
+  info->rip = 0xfff0;
+  info->vm_regs.rsp = 0x0;
   
-  v3_init_host_events(info);
 
- 
+  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
+ */
+static int setup_memory_map(struct guest_info * info, struct v3_vm_config * config_ptr) {
 
   /* layout rombios */
   {
@@ -173,8 +196,13 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
   
   
   print_shadow_map(&(info->mem_map));
-  
-  {
+
+  return 0;
+}
+
+
+
+static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr) {
     struct vm_device * ramdisk = NULL;
     struct vm_device * cdrom = NULL;
     struct vm_device * nvram = v3_create_nvram();
@@ -187,7 +215,8 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
     //struct vm_device * serial = v3_create_serial();
     struct vm_device * generic = NULL;
 
-
+    int use_ramdisk = config_ptr->use_ramdisk;
+    int use_generic = USE_GENERIC;
 
 
     if (use_ramdisk) {
@@ -198,8 +227,60 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
     
     
     if (use_generic) {
+      generic = configure_generic(info, config_ptr);
+    }
+
+
+    v3_attach_device(info, nvram);
+    //v3_attach_device(info, timer);
+    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);
+
+    if (use_ramdisk) {
+      v3_attach_device(info, ramdisk);
+      v3_attach_device(info, cdrom);
+    }
+
+    if (use_generic) {
+      // Important that this be attached last!
+      v3_attach_device(info, generic);
+    }
+    
+    PrintDebugDevMgr(info);
+
+
+    // give keyboard interrupts to vm
+    // no longer needed since we have a keyboard device
+    //hook_irq(&vm_info, 1);
+    
+#if 0
+    // give floppy controller to vm
+    v3_hook_passthrough_irq(info, 6);
+#endif
+    
+    
+    if (!use_ramdisk) {
+      PrintDebug("Hooking IDE IRQs\n");
+      
+      //primary ide
+      v3_hook_passthrough_irq(info, 14);
+      
+      // secondary ide
+      v3_hook_passthrough_irq(info, 15);    
+    }  
+    
+
+  return 0;
+}
+
+
+
+static struct vm_device *  configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr) {
       PrintDebug("Creating Generic Device\n");
-      generic = v3_create_generic();
+      struct vm_device * generic = v3_create_generic();
       
       // 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)
@@ -303,60 +384,9 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
       
       v3_generic_add_port_range(generic, 0xc000, 0xc00f, GENERIC_PRINT_AND_IGNORE);
 #endif
-      
-    }
       //  v3_generic_add_port_range(generic, 0x378, 0x400, GENERIC_PRINT_AND_IGNORE);
       
 
+      return generic;
 
-    
-
-    v3_attach_device(info, nvram);
-    //v3_attach_device(info, timer);
-    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);
-
-    if (use_ramdisk) {
-      v3_attach_device(info, ramdisk);
-      v3_attach_device(info, cdrom);
-    }
-
-    if (use_generic) {
-      // Important that this be attached last!
-      v3_attach_device(info, generic);
-    }
-    
-    PrintDebugDevMgr(info);
-  }
-  
-  // give keyboard interrupts to vm
-  // no longer needed since we have a keyboard device
-  //hook_irq(&vm_info, 1);
-  
-#if 0
-  // give floppy controller to vm
-  v3_hook_passthrough_irq(info, 6);
-#endif
-  
-
-  if (!use_ramdisk) {
-    PrintDebug("Hooking IDE IRQs\n");
-
-    //primary ide
-    v3_hook_passthrough_irq(info, 14);
-  
-    // secondary ide
-    v3_hook_passthrough_irq(info, 15);    
-  }  
-
-  //v3_hook_io_port(info, 1234, &IO_Read, NULL, info);
-
-  info->rip = 0xfff0;
-  info->vm_regs.rsp = 0x0;
-  
-
-  return 0;
 }