ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-20 09:46:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

run: use usb/hid driver in VM tests

Browse Source 
Issue #4173
This commit is contained in:
Alexander Boettcher 2021-05-25 13:40:09 +02:00 committed by Christian Helmuth
parent 6b9fcc9449
commit 0aa99648d7
13 changed files with 154 additions and 436 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/ports/run/seoul-auto.run
View File

@ -33,8 +33,6 @@ set use_part_block 0
set use_nic_session 1
set use_usb 0
set use_framebuffer 1
set use_fancy_stuff 0
set use_top 0

2
repos/ports/run/seoul-disc.run
View File

@ -20,8 +20,6 @@ set use_part_block 0
set use_nic_session 1
set use_usb 0
set use_framebuffer 1
set use_fancy_stuff 0
set use_top 0

2
repos/ports/run/seoul-fancy.run
View File

@ -23,8 +23,6 @@ set use_part_block 0
set use_nic_session 1
set use_usb 0
set use_framebuffer 1
set use_fancy_stuff 1
set use_top 0

12
repos/ports/run/seoul-genode.run
View File

@ -21,8 +21,6 @@ set use_part_block 0
set use_nic_session 1
set use_usb 0
set use_framebuffer 1
set use_fancy_stuff 0
set use_top 1
@ -65,11 +63,21 @@ foreach line $vm {
}
set file_type [exec file $run_script_path$label_file]
if {[regexp "gzip" $file_type]} {
exec gunzip --keep $run_script_path$label_file -c >file.tmp
set file_type [exec file file.tmp]
exec rm file.tmp
}
if {[regexp "ELF 64-bit" $file_type]} {
puts "Seoul supports only 32bit guests - choose a 32bit Genode platform"
puts "Exit reason: $file_type"
exit 2
}
if {[regexp "No such" $file_type]} {
puts "$file_type"
exit 3
}
if {$binary_cmdline eq ""} {
append multiboot_files "<rom name=\"$binary_file\" label=\"$label_file\"/>\n"

2
repos/ports/run/seoul-kernelbuild.run
View File

@ -27,8 +27,6 @@ set use_part_block 0
set use_nic_session 0
set use_usb 0
set use_framebuffer 1
set use_fancy_stuff 0
set use_top 0

2
repos/ports/run/seoul-net.run
View File

@ -20,8 +20,6 @@ set use_part_block 0
set use_nic_session 1
set use_usb 0
set use_framebuffer 1
set use_fancy_stuff 0
set use_top 0

84
repos/ports/run/seoul.inc
View File

@ -12,9 +12,14 @@ set use_vfs_block [expr $use_block_ram || $use_genode_iso]
create_boot_directory
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/event_filter \
[depot_user]/src/init \
[depot_user]/src/nitpicker \
[depot_user]/src/vfs_import
[depot_user]/src/usb_host_drv \
[depot_user]/src/usb_hid_drv \
[depot_user]/src/vfs_import \
[depot_user]/src/ps2_drv \
[depot_user]/raw/drivers_interactive-pc
if {$use_fs_rump} {
import_from_depot [depot_user]/src/vfs \
@ -63,14 +68,12 @@ proc platform_drv_priority {} { return { priority="-1"} }
set build_components {
drivers/rtc
drivers/ps2
app/seoul
}
if {$use_fancy_stuff} { set use_framebuffer 1 }
lappend_if $use_block_vdi build_components server/vdi_block
lappend_if $use_usb build_components drivers/usb
lappend_if $use_vfs_block build_components server/vfs_block
lappend_if $use_drv_ahci build_components drivers/ahci
lappend_if $use_nic_session build_components drivers/nic
@ -208,14 +211,52 @@ append config {
<start name="rtc_drv" priority="-1">
<resource name="RAM" quantum="1M"/>
<provides><service name="Rtc"/></provides>
</start>}
</start>
append_if [expr !$use_usb] config {
<start name="ps2_drv" priority="-1">
<resource name="RAM" quantum="3M"/>
<config/>
<route> <any-service><parent/> <any-child/> </any-service> </route>
</start> }
<route>
<service name="Event"> <child name="event_filter" label="ps2"/> </service>
<any-service><parent/> <any-child/> </any-service> </route>
</start>
<start name="event_filter" caps="90" priority="-1">
<resource name="RAM" quantum="1280K"/>
<provides> <service name="Event"/> </provides>
<route>
<service name="ROM" label="config"> <parent label="event_filter.config"/> </service>
<service name="Event"> <child name="nitpicker"/> </service>
<any-service><parent/><any-child/></any-service>
</route>
</start>
<start name="usb_drv" priority="-1" caps="120">
<binary name="x86_pc_usb_host_drv"/>
<resource name="RAM" quantum="12M"/>
<provides> <service name="Usb"/> </provides>
<config uhci="yes" ohci="yes" ehci="yes" xhci="yes">
<report devices="yes"/>
<policy label_prefix="usb_hid_drv" class="0x3"/>
</config>
<route>
<service name="Report"> <child name="report_rom"/> </service>
<any-service><parent/><any-child/></any-service>
</route>
</start>
<start name="usb_hid_drv" priority="-1" caps="140">
<resource name="RAM" quantum="11M"/>
<config use_report="yes"/>
<route>
<service name="Report"> <child name="report_rom"/> </service>
<service name="Event"> <child name="event_filter" label="usb"/> </service>
<service name="ROM" label="report"> <child name="report_rom"/> </service>
<service name="Usb"> <child name="usb_drv"/> </service>
<any-service><parent/><any-child/></any-service>
</route>
</start>}
append_if $use_drv_ahci config {
<start name="ahci_drv" priority="-1">
@ -341,7 +382,7 @@ append_if $use_nic_session config {
</route>
</start>
<start name="nic_router" caps="200">
<start name="nic_router" caps="200" priority="-1">
<resource name="RAM" quantum="10M"/>
<provides>
<service name="Nic"/>
@ -387,15 +428,15 @@ append_if $use_framebuffer config {
<any-service> <parent/> </any-service>
</route>}
append_if [expr $use_framebuffer && [have_include "power_on/qemu"]] config {
<config width="1280" height="960" depth="32" buffered="yes"/>}
<config width="1280" height="960"/>}
append_if [expr $use_framebuffer && ![have_include "power_on/qemu"]] config {
<config buffered="yes"/>}
<config/>}
append_if $use_framebuffer config {
</start> }
if {!$use_fancy_stuff} {
append config {
<start name="seoul" priority="-3" caps="1200">
<start name="seoul" priority="-2" caps="1200">
<binary name="seoul"/>}
append config "
<resource name=\"RAM\" quantum=\"$memory_vmm_vm\"/>"
@ -422,14 +463,6 @@ append config {
</start> }
}
append_if $use_usb config {
<start name="usb_drv" priority="-1" caps="120">
<resource name="RAM" quantum="12M"/>
<config uhci="yes" ehci="yes" xhci="yes">
<hid/>
</config>
</start>}
append config {
<start name="nitpicker" priority="-1" caps="120">
<resource name="RAM" quantum="8M"/>
@ -475,6 +508,7 @@ append config {
<provides> <service name="Report"/> <service name="ROM"/> </provides>
<config>
<policy label="status_bar -> focus" report="nitpicker -> focus"/>
<policy label="usb_hid_drv -> report" report="usb_drv -> devices"/>
</config>
</start>}
@ -492,7 +526,7 @@ append_if $use_fancy_stuff config {
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>
<start name="launchpad" priority="-2" caps="1500">
<start name="launchpad" priority="-2" caps="2000">
<resource name="RAM" quantum="64000M"/>
<route>
<service name="Nic"> <child name="nic_router"/> </service>
@ -512,7 +546,7 @@ if {$use_fancy_stuff} {
set launchpad_cfg_fd [open "bin/launchpad-config" w]
puts $launchpad_cfg_fd "<config>
<launcher ram_quota=\"$memory_init\" name=\"init\" caps=\"400\" >"
<launcher ram_quota=\"$memory_init\" name=\"init\" caps=\"500\" >"
puts $launchpad_cfg_fd {
<config>
@ -533,7 +567,7 @@ if {$use_fancy_stuff} {
<service name="VM"/>
</parent-provides>
<start name="seoul" priority="-1" caps="200">
<start name="seoul" caps="400">
<binary name="seoul"/>
<resource name="RAM" quantum="256M"/>
<route>
@ -564,8 +598,6 @@ set boot_modules {
}
lappend_if $use_block_vdi boot_modules vdi_block
lappend_if [expr !$use_usb] boot_modules ps2_drv
lappend_if $use_usb boot_modules usb_drv
lappend_if $use_vfs_block boot_modules vfs_block
lappend_if $use_vfs_block boot_modules vfs.lib.so
lappend_if $use_drv_ahci boot_modules ahci_drv
@ -615,10 +647,6 @@ if {$use_multiboot} {
append boot_modules $guest_os_binaries
}
if {$use_usb} {
append qemu_args " -usb -usbdevice mouse -usbdevice keyboard "
}
append_platform_drv_boot_modules
build_boot_image $boot_modules

320
repos/ports/run/vbox5_genode_usb_hid.run
View File

@ -1,320 +0,0 @@
#
# This run script tests the VirtualBox USB device pass-through feature
# by running the 'usb_hid' test in a VM.
#
# See 'usb_hid.run' for more information about the setup of the 'Pro Micro' USB
# device for automated testing.
#
# Note: the USB device(s) to be passed through must be included in the whitelist.
#
if { [have_include "power_on/qemu"] || ![have_spec nova] || ![have_spec x86_64]} {
puts "Run script is only supported on 64-bit NOVA on real hardware"
exit 0
}
set build_components {
drivers/framebuffer
drivers/ps2
drivers/usb
server/log_terminal
server/fs_rom
server/vfs lib/vfs/import
server/report_rom
app/usb_report_filter
virtualbox5
}
source ${genode_dir}/repos/base/run/platform_drv.inc
# override defaults of platform_drv.inc
proc platform_drv_priority {} { return { priority="-1"} }
append_platform_drv_build_components
build $build_components
create_boot_directory
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/init \
[depot_user]/src/nitpicker \
[depot_user]/src/vfs_pipe \
[depot_user]/src/jpeg
set config {
<config prio_levels="4">
<parent-provides>
<service name="ROM"/>
<service name="IRQ"/>
<service name="IO_MEM"/>
<service name="IO_PORT"/>
<service name="PD"/>
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
</parent-provides>
<default-route>
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<default caps="150"/>}
append_platform_drv_config
append config {
<start name="timer">
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
</start>
<start name="ps2_drv" priority="-1">
<resource name="RAM" quantum="1M"/>
<config/>
</start>
<start name="usb_config_fs" priority="-1">
<binary name="vfs"/>
<resource name="RAM" quantum="1M"/>
<provides><service name="File_system"/></provides>
<config verbose="yes">
<vfs>
<ram/>
<import>
<inline name="usb_drv.config">
<config uhci="yes" ehci="yes" xhci="yes">
<raw>
<report devices="yes"/>
</raw>
</config>
</inline>
<inline name="usb_report_filter.config">
<config>
<!-- USB device whitelist -->
<client label="virtualbox"/>
<device vendor_id="0x03eb" product_id="0x204d"/> <!-- 'Pro Micro' test device -->
</config>
</inline>
</import>
</vfs>
<policy label_prefix="usb_report_filter" root="/" writeable="yes" />
<policy label_prefix="usb_config_rom" root="/"/>
</config>
</start>
<start name="usb_config_rom" priority="-1">
<binary name="fs_rom"/>
<resource name="RAM" quantum="1200K"/>
<provides><service name="ROM"/></provides>
<route>
<service name="File_system"><child name="usb_config_fs"/></service>
<any-service><parent/><any-child/></any-service>
</route>
</start>
<start name="usb_report_filter" priority="-1">
<resource name="RAM" quantum="1200K"/>
<route>
<service name="Report"><child name="report_rom" /></service>
<service name="ROM" label="config">
<child name="usb_config_rom" label="usb_report_filter.config"/>
</service>
<service name="ROM" label="devices">
<child name="report_rom"/>
</service>
<service name="ROM" label="usb_drv_config">
<child name="report_rom"/>
</service>
<service name="File_system" label="usb_drv.config">
<child name="usb_config_fs"/>
</service>
<any-service><parent/><any-child /></any-service>
</route>
</start>
<start name="usb_drv" priority="-1">
<resource name="RAM" quantum="16M"/>
<provides> <service name="Usb"/> </provides>
<route>
<service name="IRQ"><child name="acpi_drv" /></service>
<service name="Report"> <child name="report_rom" /> </service>
<service name="ROM" label="config">
<child name="usb_config_rom" label="usb_drv.config"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>
<start name="fb_drv" priority="-1">
<binary name="vesa_fb_drv"/>
<resource name="RAM" quantum="16M"/>
<config/>
</start>
<start name="nitpicker" priority="-1">
<resource name="RAM" quantum="12M"/>
<provides>
<service name="Gui"/> <service name="Capture"/> <service name="Event"/>
</provides>
<route>
<service name="Report"> <child name="report_rom" /> </service>
<any-service> <parent/> <any-child /> </any-service>
</route>
<config>
<capture/> <event/>
<report focus="yes" hover="yes" />
<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
<domain name="cpu_load" layer="2" content="client" label="no" />
<domain name="" layer="3" content="client" label="no" focus="click" hover="always" />
<policy label_prefix="pointer" domain="pointer"/>
<policy label_prefix="cpu_load_display" domain="cpu_load"/>
<default-policy domain=""/>
</config>
</start>
<start name="pointer" priority="-1">
<resource name="RAM" quantum="2M"/>
<provides> <service name="Report"/> </provides>
<config shapes="yes"/>
<route>
<service name="Gui"> <child name="nitpicker"/> </service>
<service name="ROM" label="hover"> <child name="report_rom"/> </service>
<service name="ROM" label="xray"> <child name="report_rom"/> </service>
<any-service> <parent/> </any-service>
</route>
</start>
<start name="log_terminal" priority="-1">
<resource name="RAM" quantum="2M"/>
<provides>
<service name="Terminal"/>
</provides>
</start>
<start name="report_rom" priority="-1">
<resource name="RAM" quantum="1M"/>
<provides> <service name="Report"/> <service name="ROM"/> </provides>
<config>
<policy label="pointer -> hover" report="nitpicker -> hover"/>
<policy label="pointer -> xray" report="nitpicker -> xray"/>
<policy label="usb_report_filter -> devices" report="usb_drv -> devices"/>
<policy label="usb_report_filter -> usb_drv_config" report="usb_drv -> config"/>
<policy label="virtualbox -> usb_devices" report="usb_report_filter -> usb_devices"/>
</config>
</start>
<start name="virtualbox" caps="800" priority="-2">
<binary name="virtualbox5-nova"/>
<resource name="RAM" quantum="448M"/>
<config vbox_file="vm_genode_usb_hid.vbox" vm_name="TestVM" xhci="yes">
<vfs>
<dir name="dev"> <log/> <terminal/> </dir>
<dir name="pipe"> <pipe/> </dir>
<rom name="vm_genode_usb_hid.vbox" />
<rom name="usb_hid.iso" />
</vfs>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe"/>
</config>
<route>
<service name="Report"><child name="report_rom" /></service>
<service name="ROM" label="usb_devices"> <child name="report_rom"/> </service>
<any-service> <parent/> <any-child /> </any-service>
</route>
</start>
</config>
}
install_config $config
puts "--- executing the 'usb_hid' run script to generate the 'usb_hid.iso' image ---"
global specs
global repositories
exec -ignorestderr \
$::argv0 \
--genode-dir [genode_dir] \
--name usb_hid \
--specs "$specs" \
--board "$board_var" \
--repositories "$repositories" \
--cross-dev-prefix "[cross_dev_prefix]" \
--include boot_dir/nova \
--include image/iso \
--include [repository_contains /run/usb_hid.run]/run/usb_hid.run
exec ln -sf ${genode_dir}/repos/ports/run/vm_genode_usb_hid.vbox bin/
exec ln -sf ../../usb_hid.iso bin/
set boot_modules {
core
init
timer
vesa_fb_drv
ps2_drv
log_terminal
usb_drv
usb_report_filter
fs_rom
vfs vfs.lib.so vfs_import.lib.so
report_rom
virtualbox5-nova
usb_hid.iso
vm_genode_usb_hid.vbox
ld.lib.so libc.lib.so libm.lib.so
libiconv.lib.so stdcxx.lib.so
qemu-usb.lib.so
}
append_platform_drv_boot_modules
build_boot_image $boot_modules
if { ![get_cmd_switch --autopilot] } { run_genode_until forever }
# autopilot test
run_genode_until {\[init -\> log_terminal\] \[init -\> event_dump\] Input event #0\t} 90
# remove everything before the first interesting line
regexp {(\[init -\> log_terminal\] \[init -\> event_dump\] Input event #0\t.*)} $output all output
run_genode_until {.*\[init -\> event_dump\] Input event #11.*\n} 60 [output_spawn_id]
unify_output { number [0-9]+} ""
unify_output {(?n)on usb-dummy.*$} ""
unify_output {(?n)using .*$} ""
unify_output {(?n)^.*__wait_event.*$} ""
unify_output {(?n)^.*Failed to submit URB.*$} ""
unify_output {(?n)^.*dev_warn.*$} ""
unify_output {(?n)^.*dangling allocation.*$} ""
unify_output {(?n)^.*Warning:.*$} ""
unify_output { [0-9][0-9][0-9][0-9]:[0-9][0-9][0-9][0-9] } " "
filter_out_color_escape_sequences
trim_lines
compare_output_to {
[init -> log_terminal] [init -> event_dump] Input event #0 PRESS KEY_X 65534 key count: 1
[init -> log_terminal] [init -> event_dump] Input event #1 RELEASE KEY_X key count: 0
[init -> log_terminal] [init -> event_dump] Input event #2 PRESS BTN_LEFT 65534 key count: 1
[init -> log_terminal] [init -> event_dump] Input event #3 REL_MOTION -1+0 key count: 1
[init -> log_terminal] [init -> event_dump] Input event #4 REL_MOTION +0+1 key count: 1
[init -> log_terminal] [init -> event_dump] Input event #5 RELEASE BTN_LEFT key count: 0
[init -> usb_drv] dev_info: USB disconnect, device
[init -> log_terminal] [init -> usb_drv] dev_info: USB disconnect, device
[init -> usb_drv] dev_info: new full-speed USB device
[init -> virtualbox] Attach USB device (vendor=3eb, product=204d)
[init -> log_terminal] [init -> usb_drv] dev_info: new full-speed USB device
[init -> log_terminal] [init -> usb_drv] dev_info: D L
[init -> log_terminal] [init -> usb_drv] dev_info: input: USB HID v1.11 Keyboard [D L]
[init -> log_terminal] [init -> usb_drv] dev_info: D L
[init -> log_terminal] [init -> usb_drv] dev_info: input: USB HID v1.11 Mouse [D L]
[init -> log_terminal] [init -> event_dump] Input event #6 PRESS KEY_X 65534 key count: 1
[init -> log_terminal] [init -> event_dump] Input event #7 RELEASE KEY_X key count: 0
[init -> log_terminal] [init -> event_dump] Input event #8 PRESS BTN_LEFT 65534 key count: 1
[init -> log_terminal] [init -> event_dump] Input event #9 REL_MOTION -1+0 key count: 1
[init -> log_terminal] [init -> event_dump] Input event #10 REL_MOTION +0+1 key count: 1
[init -> log_terminal] [init -> event_dump] Input event #11 RELEASE BTN_LEFT key count: 0
}

1
repos/ports/run/vbox_share.inc
View File

@ -284,6 +284,7 @@ set config_of_app {
<config>
<policy label="pointer -> hover" report="nitpicker -> hover"/>
<policy label="pointer -> xray" report="nitpicker -> xray"/>
<policy label="usb_hid_drv -> report" report="usb_drv -> devices"/>
<policy label="usb_report_filter -> devices" report="usb_drv -> devices"/>
<policy label="usb_report_filter -> usb_drv_config" report="usb_drv -> config"/>
<policy label="vbox1 -> usb_devices" report="usb_report_filter -> usb_devices"/>

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

@ -152,6 +152,7 @@ set config_of_app {
<policy label="pointer -> hover" report="nitpicker -> hover"/>
<policy label="pointer -> xray" report="nitpicker -> xray"/>}
append config_of_app {
<policy label="usb_hid_drv -> report" report="usb_drv -> devices"/>
<policy label="usb_report_filter -> devices" report="usb_drv -> devices"/>
<policy label="usb_report_filter -> usb_drv_config" report="usb_drv -> config"/>
<policy label="vbox1 -> usb_devices" report="usb_report_filter -> usb_devices"/>}

108
repos/ports/run/virtualbox.run
View File

@ -1,6 +1,5 @@
set use_net 0
set use_ps2 1
set use_usb 0
set use_usb_qemu 0
set use_serial 1
set use_top 1
@ -26,25 +25,22 @@ create_boot_directory
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/init \
[depot_user]/src/jpeg \
[depot_user]/src/libc \
[depot_user]/src/nitpicker \
[depot_user]/src/stdcxx \
[depot_user]/src/vfs \
[depot_user]/src/vfs_pipe \
[depot_user]/src/jpeg
source ${genode_dir}/repos/base/run/platform_drv.inc
# override defaults of platform_drv.inc
proc platform_drv_priority {} { return { priority="-1"} }
[depot_user]/pkg/[drivers_interactive_pkg] \
[depot_user]/pkg/themed_wm
lappend_if [expr $use_top] build_components app/top
lappend_if [expr $use_ps2] build_components drivers/ps2
lappend_if [expr $use_usb] build_components drivers/usb
lappend_if [expr $use_serial] build_components server/log_terminal
lappend_if [have_spec x86] build_components drivers/rtc
lappend_if [expr $use_net] build_components drivers/nic
lappend_if [expr $use_net] build_components server/nic_router
append_platform_drv_build_components
build $build_components
set config {
@ -80,39 +76,19 @@ append_if [expr $use_top] config {
<config period_ms="15000"/>
</start>}
append_platform_drv_config
append config {
<start name="drivers" caps="1500" managing_system="yes" priority="-1">
<binary name="init"/>
<resource name="RAM" quantum="64M"/>
<route>
<service name="ROM" label="config"> <parent label="drivers.config"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Capture"> <child name="nitpicker"/> </service>
<service name="Event"> <child name="nitpicker"/> </service>
<any-service> <parent/> </any-service>
</route>
</start>
append_if [expr $use_ps2] config {
<start name="ps2_drv" priority="-1">
<resource name="RAM" quantum="2M"/>
<config/>
</start>}
append_if [expr $use_usb] config {
<start name="usb_drv" priority="-1" caps="120">
<resource name="RAM" quantum="12M"/>}
append_if [expr $use_usb] config {
<config uhci="yes" ehci="yes" xhci="yes">
<hid/>
</config>
</start>}
append_if [have_board pc] config {
<start name="fb_drv" priority="-1" caps="150">
<binary name="vesa_fb_drv"/>
<resource name="RAM" quantum="12M"/>}
append_if [expr [have_board pc] && [have_include power_on/qemu]] config {
<config width="1280" height="1024" buffered="yes"/>}
append_if [have_board pc] config {
</start>}
append_if [have_board linux] config {
<start name="fb_sdl" priority="-1" ld="no">
<resource name="RAM" quantum="4M"/>
</start>}
append_if [have_spec x86] config {
<start name="rtc_drv" priority="-1">
<resource name="RAM" quantum="1M"/>
<provides>
@ -220,6 +196,22 @@ append config {
<service name="ROM" label="xray"> <child name="report_rom"/> </service>
<any-service> <parent/> </any-service>
</route>
</start>
<start name="wm" caps="1000" priority="-1">
<resource name="RAM" quantum="32M"/>
<binary name="init"/>
<provides>
<service name="Gui"/> <service name="Report"/> <service name="ROM"/>
</provides>
<route>
<service name="ROM" label="config"> <parent label="wm.config"/> </service>
<service name="ROM" label_last="clipboard"> <child name="clipboard"/> </service>
<service name="Report" label_last="clipboard"> <child name="clipboard"/> </service>
<service name="Gui"> <child name="nitpicker"/> </service>
<service name="Report"> <child name="report_rom"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>}
append_if [expr $use_gui] config {
@ -230,7 +222,12 @@ append_if [expr $use_gui] config {
<libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe" rtc="/dev/rtc"/>
<vfs>
<dir name="dev">
<log/> <rtc/>
<log/> <rtc/>}
append_if [expr $use_gui && $use_serial] config {
<terminal/>}
append_if [expr $use_gui] config {
</dir>
<dir name="pipe"> <pipe/> </dir>
<rom name="test.vbox" />
@ -239,7 +236,11 @@ append_if [expr $use_gui] config {
</config>
<route>
<service name="Nic"> <child name="nic_router"/> </service>
<service name="Report" label="shape"> <child name="pointer" label="gui_fb2 -> shape"/> </service>
<service name="Gui"> <child name="wm"/> </service>
<service name="VM"> <parent diag="yes"/> </service>
<service name="Report" label="shape"> <child name="wm"/> </service>
<service name="ROM" label="clipboard"> <child name="wm"/> </service>
<service name="Report" label="clipboard"> <child name="wm"/> </service>
<service name="Report"> <child name="report_rom"/> </service>
<any-service> <parent /> <any-child /> </any-service>
</route>
@ -267,7 +268,11 @@ append config {
</config>
<route>
<service name="Nic"> <child name="nic_router"/> </service>
<service name="Report" label="shape"> <child name="pointer" label="gui_fb1 -> shape"/> </service>
<service name="Gui"> <child name="wm"/> </service>
<service name="VM"> <parent diag="yes"/> </service>
<service name="Report" label="shape"> <child name="wm"/> </service>
<service name="ROM" label="clipboard"> <child name="wm"/> </service>
<service name="Report" label="clipboard"> <child name="wm"/> </service>
<service name="Report"> <child name="report_rom"/> </service>
<any-service> <parent /> <any-child /> </any-service>
</route>
@ -284,17 +289,12 @@ set boot_modules { test.iso test.vbox }
append boot_modules $virtualbox_binary
# platform-specific modules
lappend_if [expr $use_usb] boot_modules usb_drv
lappend_if [expr $use_ps2] boot_modules ps2_drv
lappend_if [have_board pc] boot_modules vesa_fb_drv
lappend_if [have_board linux] boot_modules fb_sdl
lappend_if [have_spec x86] boot_modules rtc_drv
lappend_if [expr $use_top] boot_modules top
lappend_if [expr $use_gui] boot_modules report_rom
append boot_modules {
libc.lib.so vfs.lib.so libm.lib.so
libiconv.lib.so stdcxx.lib.so
libiconv.lib.so
qemu-usb.lib.so
}
@ -302,8 +302,6 @@ append_if [expr $use_net] boot_modules { ipxe_nic_drv }
append_if [expr $use_net] boot_modules { nic_router }
append_if [expr $use_serial] boot_modules { log_terminal }
append_platform_drv_boot_modules
build_boot_image $boot_modules
if {[have_include "power_on/qemu"]} {
@ -314,7 +312,7 @@ if {[have_include "power_on/qemu"]} {
}
append qemu_args " -cpu phenom "
if {[expr $use_usb]} {
if {[expr $use_usb_qemu]} {
append qemu_args " -usbdevice mouse -usbdevice keyboard"
}
}

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

@ -22,28 +22,39 @@ if {[have_spec nova]} {
create_boot_directory
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/fs_rom \
[depot_user]/src/init \
[depot_user]/src/libc \
[depot_user]/src/libiconv \
[depot_user]/src/nitpicker \
[depot_user]/src/part_block \
[depot_user]/src/stdcxx \
[depot_user]/src/vfs \
[depot_user]/src/vfs_pipe \
[depot_user]/src/vfs_import \
[depot_user]/src/jpeg
if {$use_vms > 1} {
import_from_depot [depot_user]/pkg/themed_wm
}
if {$use_usb} {
import_from_depot [depot_user]/src/usb_host_drv \
[depot_user]/src/usb_hid_drv
}
if {$use_rumpfs} {
import_from_depot [depot_user]/src/rump
}
append build_components {
server/part_block
server/fs_rom
drivers/ahci
drivers/framebuffer
}
lappend_if [expr $use_serial] build_components server/log_terminal
lappend_if [expr $use_rumpfs] build_components lib/vfs/rump
lappend_if [expr $use_rumpfs] build_components server/vfs
lappend_if [expr $use_vbox5] build_components virtualbox5
lappend_if [expr $use_ps2] build_components drivers/ps2
lappend_if [expr $use_usb] build_components drivers/usb
lappend_if [expr $use_usb] build_components app/usb_report_filter
lappend_if [have_spec x86] build_components drivers/rtc
lappend_if [expr $use_ram_fs || $use_usb] build_components lib/vfs/import
@ -270,10 +281,8 @@ append_if [expr $use_usb] config {
<import>
<inline name="usb_drv.config">
<config uhci="yes" ohci="yes" ehci="yes" xhci="yes">
<hid/>
<raw>
<report devices="yes"/>
</raw>
<report devices="yes"/>
<policy label_prefix="usb_hid_drv" class="0x3"/>
</config>
</inline>
<inline name="usb_report_filter.config">
@ -338,18 +347,29 @@ append_if [expr $use_usb] config {
</route>
</start>
<start name="usb_drv" priority="-1" caps="120">
<start name="usb_drv" caps="200">
<binary name="x86_pc_usb_host_drv"/>
<resource name="RAM" quantum="20M"/>
<provides> <service name="Usb"/> </provides>
<route>
<service name="Report"> <child name="report_rom"/> </service>
<service name="Event"> <child name="event_filter" label="usb_hid"/> </service>
<service name="ROM" label="config">
<child name="usb_config_rom" label="usb_drv.config"/> </service>
<any-service><parent/><any-child/></any-service>
</route>
</start>
}
<start name="usb_hid_drv" priority="-1" caps="140">
<resource name="RAM" quantum="11M"/>
<config use_report="yes"/>
<route>
<service name="Report"> <child name="report_rom"/> </service>
<service name="Event"> <child name="event_filter" label="usb_hid"/> </service>
<service name="ROM" label="report"> <child name="report_rom"/> </service>
<service name="Usb"> <child name="usb_drv"/> </service>
<any-service><parent/><any-child/></any-service>
</route>
</start>}
append_if [have_board pc] config {
<start name="fb_drv" priority="-1" caps="150">
@ -383,18 +403,12 @@ append config {
install_config $config
append boot_modules {
part_block ahci_drv fs_rom vfs
libc.lib.so vfs.lib.so libm.lib.so
libiconv.lib.so stdcxx.lib.so
ahci_drv
qemu-usb.lib.so
}
lappend_if [expr $use_rumpfs] boot_modules rump.lib.so
lappend_if [expr $use_rumpfs] boot_modules rump_fs.lib.so
lappend_if [expr $use_rumpfs] boot_modules vfs_rump.lib.so
lappend_if [expr $use_serial] boot_modules log_terminal
lappend_if [expr $use_vbox5] boot_modules $virtualbox5_binary
lappend_if [expr $use_ram_fs || $use_usb] boot_modules vfs_import.lib.so
lappend_if [expr $use_ram_fs && !$use_overlay_from_disk] boot_modules $overlay_image
lappend_if [expr $use_cpu_load] boot_modules trace_subject_reporter
lappend_if [expr $use_cpu_load] boot_modules cpu_load_display
@ -403,7 +417,6 @@ lappend_if [have_spec nova] boot_modules log_core
# platform-specific modules
lappend_if [expr $use_ps2] boot_modules ps2_drv
lappend_if [expr $use_usb] boot_modules usb_drv
lappend_if [expr $use_usb] boot_modules usb_report_filter
lappend_if [have_board pc] boot_modules vesa_fb_drv
lappend_if [have_spec x86] boot_modules rtc_drv

1
tool/autopilot.list
View File

@ -70,7 +70,6 @@ timer_accuracy
tz_vmm
usb_hid
usb_hid_raw
vbox5_genode_usb_hid
vbox5_genode_usb_hid_raw
vbox5_ubuntu_16_04_32
vbox5_ubuntu_16_04_64