Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://boinc.berkeley.edu/boinc-v2

This commit is contained in:
David Anderson 2014-08-13 21:27:57 -07:00
parent e2e08e313d 86b2b9a270
commit 6ab3a999c7
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -14,7 +14,7 @@ AC_SUBST([LIBBOINC_VERSION])
WRAPPER_RELEASE=26011
AC_SUBST([WRAPPER_RELEASE])
VBOXWRAPPER_RELEASE=26098
VBOXWRAPPER_RELEASE=26099
AC_SUBST([VBOXWRAPPER_RELEASE])
AC_CANONICAL_TARGET

14
samples/vboxwrapper/vbox.cpp
View File

@ -436,7 +436,7 @@ int VBOX_VM::create_vm() {
vboxwrapper_msg_prefix(buf, sizeof(buf))
);
vm_disk_controller_type = "sata";
vm_disk_controller_model = "ICH6";
vm_disk_controller_model = "AHCI";
}
}
@ -509,7 +509,7 @@ int VBOX_VM::create_vm() {
);
command = "modifyvm \"" + vm_name + "\" ";
command += "--boot1 disk ";
command += "--boot2 none ";
command += "--boot2 dvd ";
command += "--boot3 none ";
command += "--boot4 none ";
@ -691,7 +691,11 @@ int VBOX_VM::create_vm() {
command += "--controller \"" + vm_disk_controller_model + "\" ";
command += "--hostiocache off ";
if ((vm_disk_controller_type == "sata") || (vm_disk_controller_type == "SATA")) {
command += "--sataportcount 3";
if (is_virtualbox_version_newer(4, 3, 0)) {
command += "--portcount 3";
} else {
command += "--sataportcount 3";
}
}
retval = vbm_popen(command, output, "add storage controller (fixed disk)");
@ -720,7 +724,7 @@ int VBOX_VM::create_vm() {
);
command = "storageattach \"" + vm_name + "\" ";
command += "--storagectl \"Hard Disk Controller\" ";
command += "--port 1 ";
command += "--port 0 ";
command += "--device 0 ";
command += "--type dvddrive ";
command += "--medium \"" + virtual_machine_slot_directory + "/" + iso_image_filename + "\" ";
@ -756,7 +760,7 @@ int VBOX_VM::create_vm() {
);
command = "storageattach \"" + vm_name + "\" ";
command += "--storagectl \"Hard Disk Controller\" ";
command += "--port 0 ";
command += "--port 1 ";
command += "--device 0 ";
command += "--type hdd ";
command += "--setuuid \"\" ";

2
version.h
View File

@ -16,7 +16,7 @@
#define WRAPPER_RELEASE 26011
/* Release part of vboxwrapper version number */
#define VBOXWRAPPER_RELEASE 26098
#define VBOXWRAPPER_RELEASE 26099
/* String representation of BOINC version number */
#define BOINC_VERSION_STRING "7.5.0"

8
win_build/vboxwrapper.vcxproj
View File

@ -129,12 +129,12 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>libcmt.lib;libcpmt.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;wsock32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26098_windows_intelx86.exe</OutputFile>
<OutputFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26099_windows_intelx86.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26098_windows_intelx86.pdb</ProgramDatabaseFile>
<ProgramDatabaseFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26099_windows_intelx86.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
</Link>
@ -179,12 +179,12 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>libcmt.lib;libcpmt.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;wsock32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26098_windows_x86_64.exe</OutputFile>
<OutputFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26099_windows_x86_64.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26098_windows_x86_64.pdb</ProgramDatabaseFile>
<ProgramDatabaseFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26099_windows_x86_64.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
</Link>