Changeset 245

Timestamp:

11/18/08 15:21:21 (7 weeks ago)

Author:

tinova

Message:

Improving kernel_cmd support. Now works for XEN as well.

Location:

one/trunk

Files:

• share/examples/vm.schema (modified) (1 diff)
• src/vmm/LibVirtDriver.cc (modified) (5 diffs)
• src/vmm/XenDriver.cc (modified) (4 diffs)
• src/vmm_mad/kvm/vmm_kvm.conf (modified) (1 diff)
• src/vmm_mad/xen/vmm_xen.conf (modified) (1 diff)

one/trunk/share/examples/vm.schema

@@ -26 +26 @@
   kernel     = "path_to_os_kernel",           # XEN: Mandatory,default. KVM: Optional
   initrd     = "path_to_initrd_image",        # XEN: Mandatory,default. KVM: Optional
-  kernel_cmd = "kernel_command_line",         # Optional, default, KVM
+  kernel_cmd = "kernel_command_line",         # Optional, default, KVM, XEN
   root       = "device to be mounted as root" # XEN: Mandatory,default. KVM: Optional
   boot       = "device to boot from" ]        # KVM: Mandatory,default  XEN: Optional

one/trunk/src/vmm/LibVirtDriver.cc

@@ -38 +38 @@
      int     memory_in_kb = 0;
 
-     string  kernel  = "";
-     string  initrd  = "";
-     string  boot    = "";
-     string  root    = "";
-
-     const VectorAttribute *    disk;
-
-     string  type    = "";
-     string  target  = "";
-     string  bus     = "";
-     string  ro      = "";
+     string  kernel     = "";
+     string  initrd     = "";
+     string  boot       = "";
+     string  root       = "";
+     string  kernel_cmd = "";
+
+     const VectorAttribute * disk;
+
+     string  type       = "";
+     string  target     = "";
+     string  bus        = "";
+     string  ro         = "";
      bool    readonly;
 
      const VectorAttribute * nic;
 
-     string  mac     = "";
-     string  bridge  = "";
-     string  script  = "";
+     string  mac        = "";
+     string  bridge     = "";
+     string  script     = "";
 
      const VectorAttribute * graphics;
      
-     string  listen  = "";
-     string  port    = "";
-     string  passwd  = "";
+     string  listen     = "";
+     string  port       = "";
+     string  passwd     = "";
      
      const VectorAttribute * input;
@@ -67 +68 @@
      const VectorAttribute * features;
      
-     string     pae  = "";
-     string     acpi = "";
+     string     pae     = "";
+     string     acpi    = "";
 
      const VectorAttribute * raw;
@@ -165 +166 @@
                 boot       = os->vector_value("BOOT");
                 root       = os->vector_value("ROOT");
+                kernel_cmd = os->vector_value("KERNEL_CMD");
             }
      }
@@ -190 +192 @@
      if ( root.empty() )
      {
-        get_default("OS","ROOT",root);
+         get_default("OS","ROOT",root);
+     }
+     
+     if ( kernel_cmd.empty() )
+     {
+         get_default("OS","KERNEL_CMD",kernel_cmd);
      }
      
@@ -209 +216 @@
      if ( !root.empty() )
      {
-        file << "\t\t<cmdline>root=/dev/" << root << " ro</cmdline>" << endl;   
+         file << "\t\t<cmdline>root=/dev/" << root;
+         
+         if (kernel_cmd.empty())
+         {
+             file << " " << kernel_cmd;
+         }
+         
+         file << "</cmdline>" << endl;  
      }            
     

one/trunk/src/vmm/XenDriver.cc

@@ -38 +38 @@
     float   cpu_units   = 1.0;
 
-    string kernel = "";
-    string initrd = "";
-    string root   = "";
-
-    const VectorAttribute *     disk;
-    
-    string target = "";
-    string ro     = "";
+    string kernel     = "";
+    string initrd     = "";
+    string root       = "";
+    string kernel_cmd = "";
+
+    const VectorAttribute * disk;
+    
+    string target     = "";
+    string ro         = "";
     string mode;
 
     const VectorAttribute * nic;
     
-    string mac    = "";
-    string bridge = "";
+    string mac        = "";
+    string bridge     = "";
 
     const VectorAttribute * graphics;
         
-        string type   = "";
-        string listen = "";
-        string port   = "";
-        string passwd = "";
+        string type       = "";
+        string listen     = "";
+        string port       = "";
+        string passwd     = "";
 
         const VectorAttribute * raw;
@@ -130 +131 @@
         if ( os != 0 )
         {
-                kernel     = os->vector_value("KERNEL");
-                initrd     = os->vector_value("INITRD");
-                root       = os->vector_value("ROOT");
+            kernel     = os->vector_value("KERNEL");
+            initrd     = os->vector_value("INITRD");
+            root       = os->vector_value("ROOT");
+            kernel_cmd = os->vector_value("KERNEL_CMD");
         }
     }
@@ -150 +152 @@
         get_default("OS","ROOT",root);
     }
+    
+    if ( kernel_cmd.empty() )
+    {
+        get_default("OS","KERNEL_CMD",kernel_cmd);
+    }
 
     if ( kernel.empty() )
@@ -166 +173 @@
     else
     {
-        file << "root = '/dev/" << root << " ro'" << endl;      
+        file << "root = '/dev/" << root << "'" << endl; 
     }
     
     if ( !initrd.empty() )
     {
-        file << "ramdisk = '" << initrd << "'" << endl;
-    }
+        file << "ramdisk = '" << initrd << "'" << endl;
+    }
+    
+    if ( !kernel_cmd.empty() )
+    {
+        file << "extra = '" << kernel_cmd << "'" << endl;
+    }    
+    
         
     attrs.clear();

one/trunk/src/vmm_mad/kvm/vmm_kvm.conf

@@ -2 +2 @@
 # (all domains will use these values as defaults)
 # Valid atributes are:
-#  - os [kernel,initrd,boot,root]
+#  - os [kernel,initrd,boot,root,kernel_cmd]
 #  - memory
 
 #MEMORY =  128
-#OS = [ kernel="/vmlinuz", initrd="/initrd.img", root="sda1", boot=hd]
+#OS = [ kernel="/vmlinuz", initrd="/initrd.img", root="sda1", boot=hd,kernel_cmd="ro"]

one/trunk/src/vmm_mad/xen/vmm_xen.conf

@@ -3 +3 @@
 # Valid atributes:
 #  - credit
-#  - os [kernel,initrd,root]
+#  - os [kernel,initrd,root,kernel_cmd]
 #  - memory
 
 #MEMORY =  128
-#OS     = [ kernel="/vmlinuz", initrd="/initrd.img", root="sda1" ]
+#OS     = [ kernel="/vmlinuz", initrd="/initrd.img", root="sda1", kernel_cmd="ro" ]
 CREDIT = 256
+