mirror of
https://github.com/OpenNebula/one.git
synced 2025-01-05 09:17:41 +03:00
M #-: Merge fixes
This commit is contained in:
parent
e433ccb85b
commit
1e0f29ee42
@ -45,6 +45,7 @@ define(function(require) {
|
||||
data : {},
|
||||
timeout: true,
|
||||
success: function (request, pciDevices){
|
||||
console.log(opts)
|
||||
var tr = opts.tr;
|
||||
|
||||
var html = "<select>";
|
||||
|
@ -351,12 +351,6 @@ int VirtualMachine::check_pci_attributes(VectorAttribute * pci, string& error_st
|
||||
return -1;
|
||||
}
|
||||
|
||||
if ( HostSharePCI::set_pci_address(pci, default_bus, true) != 0 )
|
||||
{
|
||||
error_str = "Wrong BUS in PCI attribute";
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -16,6 +16,9 @@
|
||||
require_relative '../lib/xmlparser'
|
||||
require_relative '../lib/opennebula_vm'
|
||||
|
||||
# rubocop:disable Style/ClassAndModuleChildren
|
||||
# rubocop:disable Style/ClassVars
|
||||
|
||||
# This module includes related KVM/Libvirt functions
|
||||
module VirtualMachineManagerKVM
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user