From 25eec75ad8ab82e0e2732d0c3ef284b503952e46 Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Wed, 14 Jan 2015 13:01:19 +0100 Subject: [PATCH] vbox: be less verbose in vmx_invalid exit cases 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 --- repos/ports/run/virtualbox_auto_disk.run | 5 +++-- repos/ports/src/virtualbox/nova/vcpu_vmx.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/repos/ports/run/virtualbox_auto_disk.run b/repos/ports/run/virtualbox_auto_disk.run index f4642e0b95..d35d5f58e0 100644 --- a/repos/ports/run/virtualbox_auto_disk.run +++ b/repos/ports/run/virtualbox_auto_disk.run @@ -53,8 +53,9 @@ exec cp ${genode_dir}/repos/ports/run/vm_auto_disk.vbox bin/. build_boot_image $boot_modules -run_genode_until "fb resize : 1024x768@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 "fb resize : 720x400@16 -> 640x480@32" 40 +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 exec rm bin/vm_auto_disk.vbox diff --git a/repos/ports/src/virtualbox/nova/vcpu_vmx.h b/repos/ports/src/virtualbox/nova/vcpu_vmx.h index 24a0fdd08e..a31c62d6b4 100644 --- a/repos/ports/src/virtualbox/nova/vcpu_vmx.h +++ b/repos/ports/src/virtualbox/nova/vcpu_vmx.h @@ -102,7 +102,7 @@ class Vcpu_handler_vmx : public Vcpu_handler Genode::Thread_base *myself = Genode::Thread_base::myself(); Nova::Utcb *utcb = reinterpret_cast(myself->utcb()); - unsigned const dubious = utcb->inj_info | utcb->inj_error | + unsigned const dubious = utcb->inj_info | utcb->intr_state | utcb->actv_state; if (dubious) Vmm::printf("%s - dubious - inj_info=0x%x inj_error=%x"