ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-19 13:47:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vbox: be less verbose in vmx_invalid exit cases

Browse Source 
Be less verbose regards warnings caused by vmx_invalid exits - which triggers
on T400 more often because it has no Unrestricted Guest support. This leads
to lot of log messages so that the test does not succeed in time. Additionally,
the virtualbox_auto_disk.run script is adjusted to check for some output to
exit earlier if something went wrong.

Fixes #1367
This commit is contained in:
Alexander Boettcher 2015-01-14 13:01:19 +01:00 committed by Christian Helmuth
parent 988a7962a8
commit 25eec75ad8
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,8 +53,9 @@ exec cp ${genode_dir}/repos/ports/run/vm_auto_disk.vbox bin/.
build_boot_image $boot_modules build_boot_image $boot_modules
run_genode_until "fb resize : 1024x768@16 -> 640x480@32" 40 run_genode_until "fb resize : 720x400@16 -> 640x480@32" 40
run_genode_until {\[init -\> vbox\].*Guest Additions capability report:.*seamless: yes, hostWindowMapping: no, graphics: yes} 240 $spawn_id run_genode_until {\[init -\> vbox\].*Guest Additions capability report:.*seamless: no, hostWindowMapping: no, graphics: no} 30 $spawn_id
run_genode_until {\[init -\> vbox\].*Guest Additions capability report:.*seamless: yes, hostWindowMapping: no, graphics: yes} 170 $spawn_id
# cleanup bin directory - remove vbox file # cleanup bin directory - remove vbox file
exec rm bin/vm_auto_disk.vbox exec rm bin/vm_auto_disk.vbox

2
repos/ports/src/virtualbox/nova/vcpu_vmx.h
View File

@ -102,7 +102,7 @@ class Vcpu_handler_vmx : public Vcpu_handler
Genode::Thread_base *myself = Genode::Thread_base::myself(); Genode::Thread_base *myself = Genode::Thread_base::myself();
Nova::Utcb *utcb = reinterpret_cast<Nova::Utcb *>(myself->utcb()); Nova::Utcb *utcb = reinterpret_cast<Nova::Utcb *>(myself->utcb());
unsigned const dubious = utcb->inj_info | utcb->inj_error | unsigned const dubious = utcb->inj_info |
utcb->intr_state | utcb->actv_state; utcb->intr_state | utcb->actv_state;
if (dubious) if (dubious)
Vmm::printf("%s - dubious - inj_info=0x%x inj_error=%x" Vmm::printf("%s - dubious - inj_info=0x%x inj_error=%x"