From 4c5694184ceca6d3d8b5ed1507db04fbc4b6f336 Mon Sep 17 00:00:00 2001
From: Adrian-Ken Rueegsegger <ken@codelabs.ch>
Date: Tue, 9 Jun 2015 00:45:34 +0200
Subject: [PATCH] Enable 32-bit Virtualbox scenarios for hw_x86_64_muen

 * Announce VM service
 * Disable USB uhci and ehci as only xhci is supported on hw_x86_64_muen

Issue #2016
---
 repos/ports/run/vbox_auto_win7_share.run |  7 +++++--
 repos/ports/run/vbox_win.inc             |  9 ++++++---
 repos/ports/run/virtualbox.run           | 18 ++++++++++++++---
 repos/ports/run/virtualbox_auto.inc      | 25 +++++++++++++++++++-----
 4 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/repos/ports/run/vbox_auto_win7_share.run b/repos/ports/run/vbox_auto_win7_share.run
index 79e2ec218..3ed9a2e48 100644
--- a/repos/ports/run/vbox_auto_win7_share.run
+++ b/repos/ports/run/vbox_auto_win7_share.run
@@ -62,8 +62,11 @@ if {[have_include "power_on/qemu"]} {
 	exit 0
 }
 
-# Tested for nova. 
-assert_spec nova
+# Tested for nova and hw_x86_64_muen.
+if {(![have_spec nova] && ![have_spec hw_x86_64_muen])} {
+	puts "Platform is unsupported."
+	exit 0
+}
 
 set flavor   "win7"
 set vdi_image "${flavor}.vdi"
diff --git a/repos/ports/run/vbox_win.inc b/repos/ports/run/vbox_win.inc
index b235b6bc0..e0d527ae4 100644
--- a/repos/ports/run/vbox_win.inc
+++ b/repos/ports/run/vbox_win.inc
@@ -1,6 +1,9 @@
-# Tested for nova. 
-assert_spec nova
- 
+# Tested for nova and hw_x86_64_muen.
+if {(![have_spec nova] && ![have_spec hw_x86_64_muen])} {
+	puts "Platform is unsupported."
+	exit 0
+}
+
 if {[have_include "power_on/qemu"]} {
 	puts "\nRun script does not support Qemu.\n"
 	exit 0
diff --git a/repos/ports/run/virtualbox.run b/repos/ports/run/virtualbox.run
index 82efb64f7..896009ee9 100644
--- a/repos/ports/run/virtualbox.run
+++ b/repos/ports/run/virtualbox.run
@@ -37,7 +37,12 @@ set config {
 		<service name="PD"/>
 		<service name="RM"/>
 		<service name="CPU"/>
-		<service name="LOG"/>
+		<service name="LOG"/>}
+
+append_if [have_spec muen] config {
+		<service name="VM"/>}
+
+append config {
 	</parent-provides>
 	<default-route>
 		<any-service> <parent/> <any-child/> </any-service>
@@ -58,8 +63,15 @@ append_if [expr $use_ps2] config {
 append_if [expr $use_usb] config {
 	<start name="usb_drv" priority="-1">
 		<resource name="RAM" quantum="7M"/>
-		<provides><service name="Input"/></provides>
-		<config uhci="yes" ehci="yes" xhci="yes">
+		<provides><service name="Input"/></provides>}
+
+append_if [expr $use_usb && ![have_spec hw_x86_64_muen]] config {
+		<config uhci="yes" ehci="yes" xhci="yes">}
+
+append_if [expr $use_usb && [have_spec hw_x86_64_muen]] config {
+		<config uhci="no" ehci="no" xhci="yes">}
+
+append_if [expr $use_usb] config {
 			<hid/>
 		</config>
 	</start>}
diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc
index aafa2b0d2..4007c6c40 100644
--- a/repos/ports/run/virtualbox_auto.inc
+++ b/repos/ports/run/virtualbox_auto.inc
@@ -1,4 +1,7 @@
-assert_spec nova
+if {(![have_spec nova] && ![have_spec hw_x86_64_muen])} {
+	puts "Platform is unsupported."
+	exit 0
+}
 
 if {[have_include "power_on/qemu"]} {
 	puts "\nRun script does not support Qemu.\n"
@@ -6,7 +9,7 @@ if {[have_include "power_on/qemu"]} {
 }
 
 append build_components {
-	core init virtualbox 
+	core init virtualbox
 	server/part_blk
 	server/rump_fs
 	server/fs_rom
@@ -42,7 +45,12 @@ set config {
 		<service name="PD"/>
 		<service name="RM"/>
 		<service name="CPU"/>
-		<service name="LOG"/>
+		<service name="LOG"/>}
+
+append_if [have_spec muen] config {
+		<service name="VM"/>}
+
+append config {
 	</parent-provides>
 	<default-route>
 		<any-service> <parent/> <any-child/> </any-service>
@@ -116,8 +124,15 @@ append_if [expr $use_usb] config {
 		<provides><service name="File_system"/></provides>
 		<config verbose="yes">
 			<content>
-				<inline name="usb_drv.config">
-<config uhci="yes" ehci="yes" xhci="yes">
+				<inline name="usb_drv.config">}
+
+append_if [expr $use_usb && ![have_spec hw_x86_64_muen]] config {
+<config uhci="yes" ehci="yes" xhci="yes">}
+
+append_if [expr $use_usb && [have_spec hw_x86_64_muen]] config {
+<config uhci="no" ehci="no" xhci="yes">}
+
+append_if [expr $use_usb] config {
 	<hid/>
 	<raw>
 		<report devices="yes"/>