os_machine_param.diff

patch for MACHINE parameter support for open nebula 4.4 - Vladislav Gorbunov, 12/05/2013 10:27 PM

Download (992 Bytes)

View differences:

/var/lib/one/tmp/opennebula-4.4.0/src/vmm/LibVirtDriverKVM.cc 2013-12-05 22:14:22.768999936 +1200
46 46 
    string  kernel_cmd = "";
47 47 
    string  bootloader = "";
48 48 
    string  arch       = "";
49 
    string  machine    = "";
49 50 

  		




  50
  51
  
    
    vector<string> boots;

  		




  51
  52
  
    

  		




  ......




  188
  189
  
    
            kernel_cmd = os->vector_value("KERNEL_CMD");

  		




  189
  190
  
    
            bootloader = os->vector_value("BOOTLOADER");

  		




  190
  191
  
    
            arch       = os->vector_value("ARCH");

  		




  
  192
  
    
            machine    = os->vector_value("MACHINE");

  		




  191
  193
  
    
        }

  		




  192
  194
  
    
    }

  		




  193
  195
  
    

  		




  ......




  201
  203
  
    
        }

  		




  202
  204
  
    
    }

  		




  203
  205
  
    

  		




  204
  
  
    
    file << "\t\t<type arch='" << arch << "'>hvm</type>" << endl;

  		




  
  206
  
    
 

  		




  
  207
  
    
    if ( machine.empty() )

  		




  
  208
  
    
    {

  		




  
  209
  
    
        file << "\t\t<type arch='" << arch << "'>hvm</type>" << endl;

  		




  
  210
  
    
    } else {

  		




  
  211
  
    
        file << "\t\t<type arch='" << arch << "' machine='" << machine << "'>hvm</type>" << endl;

  		




  
  212
  
    
    }

  		




  205
  213
  
    

  		




  206
  214
  
    
    if ( kernel.empty() )

  		




  207
  215
  
    
    {