mirror of
https://github.com/genodelabs/genode.git
synced 2025-01-18 02:40:08 +00:00
vbox*.run: fix scripts
- cap quota shortage - ram quota shortage - limit VM memory to 1 GB (before 9 GB) in multiple run test case
This commit is contained in:
parent
ee352abc56
commit
d424f6e066
@ -15,6 +15,7 @@
|
||||
assert_spec 64bit
|
||||
|
||||
set flavor "win7_64"
|
||||
set flavor_extension "_multiple"
|
||||
set vm_ram "1280M"
|
||||
|
||||
set use_vbox4 1
|
||||
@ -31,6 +32,6 @@ set use_ps2 [have_spec ps2]
|
||||
|
||||
set use_vms 6
|
||||
set affinity_space_width 8
|
||||
set use_cpu_load 1
|
||||
set use_cpu_load 0
|
||||
|
||||
source ${genode_dir}/repos/ports/run/vbox_win.inc
|
||||
|
@ -15,6 +15,7 @@
|
||||
assert_spec 64bit
|
||||
|
||||
set flavor "win7_64"
|
||||
set flavor_extension "_multiple"
|
||||
set vm_ram "1280M"
|
||||
|
||||
set use_vbox4 0
|
||||
@ -31,6 +32,6 @@ set use_ps2 [have_spec ps2]
|
||||
|
||||
set use_vms 6
|
||||
set affinity_space_width 8
|
||||
set use_cpu_load 1
|
||||
set use_cpu_load 0
|
||||
|
||||
source ${genode_dir}/repos/ports/run/vbox_win.inc
|
||||
|
@ -19,6 +19,10 @@ set raw_image "${flavor}.vmdk"
|
||||
set vbox_file "vm_${flavor}.vbox"
|
||||
set overlay_image "overlay_${flavor}.vdi"
|
||||
|
||||
if {[info exists flavor_extension]} {
|
||||
set vbox_file "vm_${flavor}${flavor_extension}.vbox"
|
||||
}
|
||||
|
||||
set build_components {
|
||||
server/input_merger
|
||||
drivers/nic
|
||||
@ -247,7 +251,7 @@ append config_of_app {
|
||||
|
||||
for { set i 1} { $i <= $use_vms } { incr i} {
|
||||
append config_of_app "
|
||||
<start name=\"vbox${i}\" priority=\"-2\" caps=\"600\">"
|
||||
<start name=\"vbox${i}\" priority=\"-2\" caps=\"800\">"
|
||||
append_if [expr $use_vbox4] config_of_app "
|
||||
<binary name=\"$virtualbox_binary\" />"
|
||||
append_if [expr $use_vbox5] config_of_app "
|
||||
@ -328,7 +332,7 @@ run_genode_until {\[init -\> vbox.*].*Guest Additions capability report:.*seamle
|
||||
if {$use_rumpfs} {
|
||||
set wait_timeout 170
|
||||
for { set i 1 } { $i <= $use_vms } { incr i } {
|
||||
if { [string match "ubuntu*" $flavor] } {
|
||||
if { [string match "ubuntu*" $flavor] || [string match "win81*" $flavor] } {
|
||||
run_genode_until {\[init -\> vbox.*].*Guest Additions capability report:.*seamless: yes, hostWindowMapping: no, graphics: no} $wait_timeout [output_spawn_id]
|
||||
} else {
|
||||
run_genode_until {\[init -\> vbox.*].*Guest Additions capability report:.*seamless: yes, hostWindowMapping: no, graphics: yes} $wait_timeout [output_spawn_id]
|
||||
|
@ -127,7 +127,7 @@ append_if [expr $use_rumpfs] config {
|
||||
</start>}
|
||||
|
||||
append_if [expr $use_ram_fs] config {
|
||||
<start name="ram_fs" priority="-1" caps="400">}
|
||||
<start name="ram_fs" priority="-1" caps="1800">}
|
||||
append_if [expr $use_ram_fs] config "
|
||||
<resource name=\"RAM\" quantum=\"[expr $use_vms * 8 * 128]M\"/>"
|
||||
append_if [expr $use_ram_fs] config {
|
||||
@ -304,7 +304,7 @@ append_if [expr $use_usb] config {
|
||||
</start>
|
||||
|
||||
<start name="usb_drv" priority="-1">
|
||||
<resource name="RAM" quantum="16M"/>
|
||||
<resource name="RAM" quantum="20M"/>
|
||||
<provides>
|
||||
<service name="Input"/>
|
||||
<service name="Usb"/>
|
||||
|
102
repos/ports/run/vm_win7_64_multiple.vbox
Normal file
102
repos/ports/run/vm_win7_64_multiple.vbox
Normal file
@ -0,0 +1,102 @@
|
||||
<?xml version="1.0"?>
|
||||
<!--
|
||||
** DO NOT EDIT THIS FILE.
|
||||
** If you make changes to this file while any VirtualBox related application
|
||||
** is running, your changes will be overwritten later, without taking effect.
|
||||
** Use VBoxManage or the VirtualBox Manager GUI to make changes.
|
||||
-->
|
||||
<VirtualBox xmlns="http://www.innotek.de/VirtualBox-settings" version="1.14-linux">
|
||||
<Machine uuid="{37ab43a5-38d8-4491-93f5-5b0b077f5c32}" name="Win7" OSType="Windows7" snapshotFolder="Snapshots" lastStateChange="2014-11-14T11:58:35Z">
|
||||
<MediaRegistry>
|
||||
<HardDisks>
|
||||
<HardDisk uuid="{fee5d584-f5ad-4eea-a761-3c215cdf9eb1}" location="/win7_64.vdi" format="VDI" type="Immutable">
|
||||
<HardDisk uuid="{3d9a9193-0fe7-4f8c-8e1b-065dbf514c82}" location="/ram/overlay_win7_64.vdi" format="VDI" autoReset="true"/>
|
||||
</HardDisk>
|
||||
</HardDisks>
|
||||
<DVDImages/>
|
||||
<FloppyImages/>
|
||||
</MediaRegistry>
|
||||
<ExtraData>
|
||||
<ExtraDataItem name="GUI/LastGuestSizeHint" value="1024,768"/>
|
||||
<ExtraDataItem name="GUI/LastNormalWindowPosition" value="513,100,1024,790"/>
|
||||
</ExtraData>
|
||||
<Hardware version="2">
|
||||
<CPU count="2" hotplug="false">
|
||||
<HardwareVirtEx enabled="true"/>
|
||||
<HardwareVirtExNestedPaging enabled="true"/>
|
||||
<HardwareVirtExVPID enabled="true"/>
|
||||
<HardwareVirtExUX enabled="true"/>
|
||||
<PAE enabled="true"/>
|
||||
<LongMode enabled="true"/>
|
||||
<HardwareVirtExLargePages enabled="false"/>
|
||||
<HardwareVirtForce enabled="false"/>
|
||||
</CPU>
|
||||
<Memory RAMSize="1024" PageFusion="false"/>
|
||||
<HID Pointing="PS2Mouse" Keyboard="PS2Keyboard"/>
|
||||
<HPET enabled="false"/>
|
||||
<Chipset type="PIIX3"/>
|
||||
<Boot>
|
||||
<Order position="1" device="Floppy"/>
|
||||
<Order position="2" device="DVD"/>
|
||||
<Order position="3" device="HardDisk"/>
|
||||
<Order position="4" device="None"/>
|
||||
</Boot>
|
||||
<Display VRAMSize="20" monitorCount="1" accelerate3D="false" accelerate2DVideo="false"/>
|
||||
<VideoCapture enabled="false" screens="18446744073709551615" horzRes="1024" vertRes="768" rate="512" fps="25"/>
|
||||
<RemoteDisplay enabled="false" authType="Null"/>
|
||||
<BIOS>
|
||||
<ACPI enabled="true"/>
|
||||
<IOAPIC enabled="true"/>
|
||||
<Logo fadeIn="true" fadeOut="true" displayTime="0"/>
|
||||
<BootMenu mode="MessageAndMenu"/>
|
||||
<TimeOffset value="0"/>
|
||||
<PXEDebug enabled="false"/>
|
||||
</BIOS>
|
||||
<USB>
|
||||
<Controllers>
|
||||
<Controller name="OHCI" type="OHCI"/>
|
||||
</Controllers>
|
||||
<DeviceFilters/>
|
||||
</USB>
|
||||
<Network>
|
||||
<Adapter slot="0" enabled="false" MACAddress="0800271D7901" cable="true" speed="0" type="82540EM">
|
||||
<HostInterface/>
|
||||
<DisabledModes/>
|
||||
</Adapter>
|
||||
</Network>
|
||||
<UART>
|
||||
<Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/>
|
||||
<Port slot="1" enabled="false" IOBase="0x2f8" IRQ="3" hostMode="Disconnected"/>
|
||||
</UART>
|
||||
<LPT>
|
||||
<Port slot="0" enabled="false" IOBase="0x378" IRQ="7"/>
|
||||
<Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/>
|
||||
</LPT>
|
||||
<AudioAdapter controller="HDA" driver="Pulse" enabled="false"/>
|
||||
<RTC localOrUTC="UTC"/>
|
||||
<SharedFolders/>
|
||||
<Clipboard mode="Disabled"/>
|
||||
<DragAndDrop mode="Disabled"/>
|
||||
<IO>
|
||||
<IoCache enabled="true" size="5"/>
|
||||
<BandwidthGroups/>
|
||||
</IO>
|
||||
<HostPci>
|
||||
<Devices/>
|
||||
</HostPci>
|
||||
<EmulatedUSB>
|
||||
<CardReader enabled="false"/>
|
||||
</EmulatedUSB>
|
||||
<Guest memoryBalloonSize="0"/>
|
||||
<GuestProperties/>
|
||||
</Hardware>
|
||||
<StorageControllers>
|
||||
<StorageController name="SATA" type="AHCI" PortCount="2" useHostIOCache="true" Bootable="true">
|
||||
<AttachedDevice type="HardDisk" port="0" device="0">
|
||||
<Image uuid="{3d9a9193-0fe7-4f8c-8e1b-065dbf514c82}"/>
|
||||
</AttachedDevice>
|
||||
<AttachedDevice passthrough="false" type="DVD" port="1" device="0"/>
|
||||
</StorageController>
|
||||
</StorageControllers>
|
||||
</Machine>
|
||||
</VirtualBox>
|
Loading…
Reference in New Issue
Block a user