ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vbox5*.run: enable VM tests for Fiasco.OC 

Issue #3111
This commit is contained in:
Alexander Boettcher 2019-05-22 10:32:44 +02:00 committed by Christian Helmuth
parent 7ec37b2d8d
commit c055986e38
21 changed files with 361 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
repos/ports/run/vbox5_ubuntu_14_04_32.run
View File

@ -2,6 +2,9 @@
# Ubuntu 14.04 32bit in VBox 5
#
assert_spec x86
assert_spec nova
set flavor "ubuntu_14_04_32"
set vm_ram "1280M"

3
repos/ports/run/vbox5_ubuntu_14_04_64.run
View File

@ -2,7 +2,8 @@
# Ubuntu 14.04 64bit in VBox 5
#
assert_spec 64bit
assert_spec x86_64
assert_spec nova
set flavor "ubuntu_14_04_64"
set vm_ram "1280M"

3
repos/ports/run/vbox5_ubuntu_16_04_32.run
View File

@ -2,6 +2,9 @@
# Ubuntu 16.04 32bit in VBox 5
#
assert_spec x86
assert_spec nova
set flavor "ubuntu_16_04_32"
set vm_ram "1280M"

3
repos/ports/run/vbox5_ubuntu_16_04_64.run
View File

@ -2,7 +2,8 @@
# Ubuntu 16.04 64bit in VBox 5
#
assert_spec 64bit
assert_spec x86_64
assert_spec nova
set flavor "ubuntu_16_04_64"
set vm_ram "9460M"

15
repos/ports/run/vbox5_vm_ubuntu_16_04_32.run
View File

@ -2,7 +2,18 @@
# Ubuntu 16.04 32bit in VBox 5
#
set flavor "ubuntu_16_04_32"
assert_spec x86
if {(![have_spec nova] && ![have_spec foc])} {
puts "Platform is unsupported."
}
if {[have_spec nova]} {
set flavor "ubuntu_16_04_32"
} else {
set flavor "ubuntu_16_04_32_1vcpu"
}
set vm_ram "1280M"
set use_vbox5 1
@ -17,7 +28,7 @@ set use_usb 1
set use_ps2 [have_spec ps2]
set use_vms 1
set use_cpu_load 1
set use_cpu_load 0
# use generic vbox5 VMM version
set use_vbox5_nova 0

3
repos/ports/run/vbox5_vm_ubuntu_16_04_64.run
View File

@ -2,7 +2,8 @@
# Ubuntu 16.04 64bit in VBox 5
#
assert_spec 64bit
assert_spec x86_64
assert_spec nova
set flavor "ubuntu_16_04_64"
set vm_ram "9460M"

6
repos/ports/run/vbox5_vm_win10_64.run
View File

@ -3,10 +3,10 @@
#
assert_spec nova
assert_spec 64bit
assert_spec x86_64
set flavor "win10"
set vm_ram "1280M"
set flavor "win10_64_1vcpu"
set vm_ram "8280M"
set use_vbox5 1

1
repos/ports/run/vbox5_vm_win7_32.run
View File

@ -2,6 +2,7 @@
# Windows 7 in VirtualBox 5
#
assert_spec x86
assert_spec nova
set flavor "win7"

5
repos/ports/run/vbox5_vm_win7_64.run
View File

@ -2,9 +2,10 @@
# Windows 7 64bit in VirtualBox
#
assert_spec 64bit
assert_spec x86_64
assert_spec nova
set flavor "win7_64"
set flavor "win7_64_1vcpu"
set vm_ram "9480M"
set use_vbox5 1

6
repos/ports/run/vbox5_win10_64.run
View File

@ -3,10 +3,10 @@
#
assert_spec nova
assert_spec 64bit
assert_spec x86_64
set flavor "win10"
set vm_ram "1280M"
set flavor "win10_64"
set vm_ram "8280M"
set use_vbox5 1

1
repos/ports/run/vbox5_win7_32.run
View File

@ -3,6 +3,7 @@
#
assert_spec nova
assert_spec x86
set flavor "win7"
set vm_ram "1280M"

3
repos/ports/run/vbox5_win7_64.run
View File

@ -2,7 +2,8 @@
# Windows 7 64bit in VirtualBox
#
assert_spec 64bit
assert_spec x86_64
assert_spec nova
set flavor "win7_64"
set vm_ram "9480M"

3
repos/ports/run/vbox5_win7_64_multiple.run
View File

@ -12,7 +12,8 @@
# ...
# lCPU 6-7: VM6 2 vCPUs
assert_spec 64bit
assert_spec x86_64
assert_spec nova
set flavor "win7_64"
set flavor_extension "_multiple"

3
repos/ports/run/vbox5_win7_64_raw.run
View File

@ -2,7 +2,8 @@
# Windows 7 64bit in VirtualBox
#
assert_spec 64bit
assert_spec x86_64
assert_spec nova
set flavor "win7_64_raw"
set vm_ram "1280M"

3
repos/ports/run/vbox5_win7_64_share.run
View File

@ -1,4 +1,5 @@
assert_spec 64bit
assert_spec x86_64
assert_spec nova
set flavor "win7_64"
set vm_ram "1280M"

11
repos/ports/run/vbox_win.inc
View File

@ -1,5 +1,6 @@
# Tested for nova and muen.
if {(![have_spec nova] && ![have_spec muen])} {
assert_spec x86
if {(![have_spec nova] && ![have_spec foc])} {
puts "Platform is unsupported."
exit 0
}
@ -286,7 +287,11 @@ append_if [expr !$use_rumpfs] boot_modules " ${raw_image} "
build_boot_image $boot_modules
run_genode_until {\[init -\> vbox.*].*Guest Additions capability report:.*seamless: no, hostWindowMapping: no, graphics: no} 70
set wait_timeout 70
if {[have_spec foc]} { set wait_timeout 120 }
run_genode_until {\[init -\> vbox.*].*Guest Additions capability report:.*seamless: no, hostWindowMapping: no, graphics: no} $wait_timeout
# run_genode_until forever 0 [output_spawn_id]
if {$use_rumpfs} {

25
repos/ports/run/virtualbox_auto.inc
View File

@ -1,4 +1,6 @@
if {(![have_spec nova] && ![have_spec muen])} {
assert_spec x86
if {(![have_spec nova] && ![have_spec foc])} {
puts "Platform is unsupported."
exit 0
}
@ -8,16 +10,6 @@ if {[have_include "power_on/qemu"]} {
exit
}
if {([have_spec muen] && [expr $use_vbox5])} {
puts "Run script does not support vbox5 on Muen."
exit 0
}
if {([have_spec muen] && $flavor != "win7")} {
puts "Run script does not support $flavor on Muen."
exit 0
}
if { [get_cmd_switch --autopilot] && [have_spec x86_32] } {
puts "Run script does not support autopilot mode on 32 bit"
exit 0
@ -252,15 +244,8 @@ append_if [expr $use_usb] config {
<provides><service name="File_system"/></provides>
<config verbose="yes">
<content>
<inline name="usb_drv.config">}
append_if [expr $use_usb && ![have_spec muen]] config {
<config uhci="yes" ohci="yes" ehci="yes" xhci="yes">}
append_if [expr $use_usb && [have_spec muen]] config {
<config uhci="no" ehci="no" xhci="yes">}
append_if [expr $use_usb] config {
<inline name="usb_drv.config">
<config uhci="yes" ohci="yes" ehci="yes" xhci="yes">
<hid/>
<raw>
<report devices="yes"/>

99
repos/ports/run/vm_ubuntu_16_04_32_1vcpu.vbox Normal file
View File

@ -0,0 +1,99 @@
<?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="ubuntu_16_04_32" OSType="Ubuntu" snapshotFolder="Snapshots" lastStateChange="2014-11-14T11:58:35Z">
<MediaRegistry>
<HardDisks>
<HardDisk uuid="{c68dc6fc-0e5a-45fc-9692-8e363ee63b3a}" location="/ubuntu_16_04_32.vdi" format="VDI" type="Immutable">
<HardDisk uuid="{78a3a6a1-ade6-41bf-8b29-ec7cf16de4bb}" location="/ram/overlay_ubuntu_16_04_32.vdi" format="VDI" autoReset="true"/>
</HardDisk>
</HardDisks>
<DVDImages/>
<FloppyImages/>
</MediaRegistry>
<ExtraData/>
<Hardware version="2">
<CPU count="1" hotplug="false">
<HardwareVirtEx enabled="true"/>
<HardwareVirtExNestedPaging enabled="true"/>
<HardwareVirtExVPID enabled="true"/>
<HardwareVirtExUX enabled="true"/>
<PAE enabled="true"/>
<LongMode enabled="false"/>
<HardwareVirtExLargePages enabled="false"/>
<HardwareVirtForce enabled="false"/>
</CPU>
<Memory RAMSize="1024" PageFusion="false"/>
<HID Pointing="USBTablet" 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="{78a3a6a1-ade6-41bf-8b29-ec7cf16de4bb}"/>
</AttachedDevice>
<AttachedDevice passthrough="false" type="DVD" port="1" device="0"/>
</StorageController>
</StorageControllers>
</Machine>
</VirtualBox>

2
repos/ports/run/vm_win10.vbox → repos/ports/run/vm_win10_64.vbox
View File

@ -31,7 +31,7 @@
<HardwareVirtExLargePages enabled="true"/>
<HardwareVirtForce enabled="false"/>
</CPU>
<Memory RAMSize="1024" PageFusion="false"/>
<Memory RAMSize="8024" PageFusion="false"/>
<HID Pointing="PS2Mouse" Keyboard="PS2Keyboard"/>
<HPET enabled="false"/>
<Chipset type="PIIX3"/>

102
repos/ports/run/vm_win10_64_1vcpu.vbox Normal file
View 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="{5b89d0de-111b-47b7-90b4-d1d55702ca59}" name="Win10" OSType="Windows10_64">
<MediaRegistry>
<HardDisks>
<HardDisk uuid="{dcb43a24-125e-4b58-af54-c50845a0cdab}" location="/win10.vdi" format="VDI" type="Immutable">
<HardDisk uuid="{e8fec0da-c29c-411a-8a51-2c2b3208d326}" location="/ram/overlay_win10.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="1" hotplug="false">
<HardwareVirtEx enabled="true"/>
<HardwareVirtExNestedPaging enabled="true"/>
<HardwareVirtExVPID enabled="true"/>
<HardwareVirtExUX enabled="true"/>
<PAE enabled="true"/>
<LongMode enabled="true"/>
<HardwareVirtExLargePages enabled="true"/>
<HardwareVirtForce enabled="false"/>
</CPU>
<Memory RAMSize="8024" PageFusion="false"/>
<HID Pointing="PS2Mouse" Keyboard="PS2Keyboard"/>
<HPET enabled="false"/>
<Chipset type="PIIX3"/>
<Boot>
<Order position="1" device="HardDisk"/>
<Order position="2" device="DVD"/>
<Order position="3" device="None"/>
<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="AC97" 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="IDE Controller" type="PIIX4" PortCount="2" useHostIOCache="true" Bootable="true">
<AttachedDevice type="HardDisk" port="0" device="0">
<Image uuid="{e8fec0da-c29c-411a-8a51-2c2b3208d326}"/>
</AttachedDevice>
<AttachedDevice passthrough="false" type="DVD" port="1" device="0"/>
</StorageController>
</StorageControllers>
</Machine>
</VirtualBox>

102
repos/ports/run/vm_win7_64_1vcpu.vbox Normal file
View 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="1" 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="9216" 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>