i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a define for max cpu count.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31644 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2009-07-19 20:14:38 +00:00
parent 4cf03112fa
commit b12110c5db
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
3rdparty/mmu_man/onlinedemo/haiku.php
Vendored
+8 -6
View File
@@ -77,6 +77,10 @@ define("QEMU_ARGS", ""
define("QEMU_IMAGE_PATH", "/home/revol/haiku.image"); define("QEMU_IMAGE_PATH", "/home/revol/haiku.image");
// BAD: let's one download the image // BAD: let's one download the image
//define("QEMU_IMAGE_PATH", dirname($_SERVER['SCRIPT_FILENAME']) . "/haiku.image"); //define("QEMU_IMAGE_PATH", dirname($_SERVER['SCRIPT_FILENAME']) . "/haiku.image");
// max number of cpus for the VM, not more than 8
define("QEMU_MAX_CPUS", 1);
// qemu 0.8.2 needs "", qemu 0.9.1 needs ":" // qemu 0.8.2 needs "", qemu 0.9.1 needs ":"
define("QEMU_VNC_PREFIX", ":"); define("QEMU_VNC_PREFIX", ":");
@@ -291,9 +295,8 @@ function probe_options_form()
$cpucount = 1; $cpucount = 1;
if (isset($_GET['cpucount'])) if (isset($_GET['cpucount']))
$cpucount = (int)$_GET['cpucount']; $cpucount = (int)$_GET['cpucount'];
$cpucount = max(min($cpucount, 8), 1); $cpucount = max(min($cpucount, QEMU_MAX_CPUS), 1);
//dbg("cpucount $cpucount"); //dbg("cpucount $cpucount");
$cpucount = 1; // force for now
} }
@@ -344,19 +347,18 @@ function output_options_form()
echo "</td>\n</tr>\n"; echo "</td>\n</tr>\n";
$maxcpus = 8;
echo "<tr "; echo "<tr ";
if (!$enable_cpus) if (QEMU_MAX_CPUS < 2)
echo "class=\"haiku_online_disabled\""; echo "class=\"haiku_online_disabled\"";
echo ">\n"; echo ">\n";
echo "<td align=\"right\">\n"; echo "<td align=\"right\">\n";
echo "Select cpu count:"; echo "Select cpu count:";
echo "</td>\n<td>\n"; echo "</td>\n<td>\n";
echo "<select name=\"cpucount\" "; echo "<select name=\"cpucount\" ";
if (!$enable_cpus) if (QEMU_MAX_CPUS < 2)
echo "disabled=\"disabled\""; echo "disabled=\"disabled\"";
echo ">"; echo ">";
for ($ncpu = 1; $ncpu <= $maxcpus; $ncpu++) { for ($ncpu = 1; $ncpu <= QEMU_MAX_CPUS; $ncpu++) {
echo "<option value=\"$ncpu\" "; echo "<option value=\"$ncpu\" ";
if ($ncpu == 1) if ($ncpu == 1)
echo "selected=\"selected\" "; echo "selected=\"selected\" ";