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 localhost:boinc-v2

This commit is contained in:
David Anderson 2013-10-11 07:00:42 +00:00
parent 86fa07938d 47deac1c3d
commit 711e02887a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/gpu_detect.cpp
View File

@ -18,7 +18,9 @@
// client-specific GPU code. Mostly GPU detection
//#define USE_CHILD_PROCESS_TO_DETECT_GPUS 1
#ifndef _DEBUG
#define USE_CHILD_PROCESS_TO_DETECT_GPUS 1
#endif
#include "cpp.h"

6
samples/vboxwrapper/vbox.cpp
View File

@ -973,6 +973,8 @@ int VBOX_VM::register_vm() {
}
// Add storage controller to VM
// See: http://www.virtualbox.org/manual/ch08.html#vboxmanage-storagectl
// See: http://www.virtualbox.org/manual/ch05.html#iocaching
//
fprintf(
stderr,
@ -983,6 +985,10 @@ int VBOX_VM::register_vm() {
command += "--name \"Hard Disk Controller\" ";
command += "--add \"" + vm_disk_controller_type + "\" ";
command += "--controller \"" + vm_disk_controller_model + "\" ";
command += "--hostiocache off ";
if ((vm_disk_controller_type == "sata") || (vm_disk_controller_type == "SATA") {
command += "--sataportcount 1 ";
}
retval = vbm_popen(command, output, "add storage controller (fixed disk)");
if (retval) return retval;