From 51e8f05fb6dc5d8fab6bac493843fc0a3d8097dc Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Wed, 9 Mar 2016 15:32:23 +0100
Subject: [PATCH] Ajdust run scenarios for strict policy matching

Issue #1901
---
 repos/dde_rump/run/rump_cgd_ext2.run     |  2 +-
 repos/dde_rump/run/rump_fat.run          |  2 +-
 repos/gems/run/cpu_load_display.run      |  9 ++--
 repos/gems/run/decorator.run             |  2 +-
 repos/gems/run/decorator_stress.run      |  2 +-
 repos/gems/run/launcher.run              |  4 +-
 repos/gems/run/menu_view.run             |  2 +-
 repos/gems/run/mixer_gui_qt_test.run     |  2 +-
 repos/gems/run/nano3d.run                |  2 +-
 repos/gems/run/nit_fader.run             |  2 +-
 repos/gems/run/terminal_log.run          |  2 +-
 repos/gems/run/wm.run                    |  4 +-
 repos/libports/run/eglgears.run          |  2 +-
 repos/libports/run/libc_ffat_fs.run      |  2 +-
 repos/libports/run/libc_fs_tar_fs.run    |  4 +-
 repos/libports/run/libc_vfs.run          |  2 +-
 repos/libports/run/libc_vfs_fs.run       |  2 +-
 repos/libports/run/qt5_common.inc        |  2 +-
 repos/os/run/demo.run                    |  4 +-
 repos/os/run/loader.run                  |  2 +-
 repos/os/run/usb_block.run               | 18 ++++----
 repos/os/run/vfs_stress_fs.run           |  4 +-
 repos/ports/run/debug_nitpicker.run      |  2 +-
 repos/ports/run/noux_terminal_fs.run     |  2 +-
 repos/ports/run/noux_two_terminal_fs.run |  2 +-
 repos/ports/run/seoul.inc                |  2 +-
 repos/ports/run/vbox_auto_win7_share.run | 52 ++++++++++++------------
 repos/ports/run/vbox_pointer.run         |  4 +-
 repos/ports/run/vbox_win.inc             |  2 +-
 repos/ports/run/virtualbox_auto.inc      | 42 +++++++++----------
 30 files changed, 93 insertions(+), 92 deletions(-)

diff --git a/repos/dde_rump/run/rump_cgd_ext2.run b/repos/dde_rump/run/rump_cgd_ext2.run
index 47b54b2c18..c953b8ce19 100644
--- a/repos/dde_rump/run/rump_cgd_ext2.run
+++ b/repos/dde_rump/run/rump_cgd_ext2.run
@@ -91,7 +91,7 @@ append config {
 		<resource name="RAM" quantum="16M"/>
 		<provides><service name="File_system"/></provides>
 		<config fs="ext2fs">
-			<policy root="/" writeable="yes"/>
+			<default-policy root="/" writeable="yes"/>
 		</config>
 		<route>
 			<service name="Block"> <child name="rump_cgd"/> </service>
diff --git a/repos/dde_rump/run/rump_fat.run b/repos/dde_rump/run/rump_fat.run
index 076082e7c9..331d7ba360 100644
--- a/repos/dde_rump/run/rump_fat.run
+++ b/repos/dde_rump/run/rump_fat.run
@@ -60,7 +60,7 @@ append config {
 	<start name="rump_fs">
 		<resource name="RAM" quantum="8M" />
 		<provides><service name="File_system"/></provides>
-		<config fs="msdos"><policy root="/" writeable="yes"/></config>
+		<config fs="msdos"><default-policy root="/" writeable="yes"/></config>
 	</start>
 	<start name="test-libc_vfs">
 		<resource name="RAM" quantum="4M"/>
diff --git a/repos/gems/run/cpu_load_display.run b/repos/gems/run/cpu_load_display.run
index cbfb7eff7d..5ea55f5137 100644
--- a/repos/gems/run/cpu_load_display.run
+++ b/repos/gems/run/cpu_load_display.run
@@ -10,6 +10,7 @@ set build_components {
 	drivers/timer
 	server/nitpicker
 	server/dynamic_rom
+	server/report_rom
 	drivers/framebuffer drivers/input
 	app/trace_subject_reporter
 	app/cpu_load_display
@@ -108,7 +109,7 @@ append config {
 			<domain name="default" layer="2" label="no" content="client" hover="always" />
 
 			<policy label="pointer" domain="pointer"/>
-			<policy domain="default"/>
+			<default-policy domain="default"/>
 		</config>
 	</start>
 
@@ -127,10 +128,8 @@ append config {
 			<service name="ROM"/>
 		</provides>
 		<config>
-			<rom>
-				<policy label="cpu_load_display -> trace_subjects"
-				        report="trace_subject_reporter -> trace_subjects"/>
-			</rom>
+			<policy label="cpu_load_display -> trace_subjects"
+			        report="trace_subject_reporter -> trace_subjects"/>
 		</config>
 	</start>
 
diff --git a/repos/gems/run/decorator.run b/repos/gems/run/decorator.run
index 7a60f3aa3f..c11b8b1b6c 100644
--- a/repos/gems/run/decorator.run
+++ b/repos/gems/run/decorator.run
@@ -60,7 +60,7 @@ append config {
 		<config>
 			<report pointer="yes" />
 			<domain name="default" layer="2" content="client" label="no"/>
-			<policy domain="default"/>
+			<default-policy domain="default"/>
 		</config>
 	</start>
 	<start name="dynamic_rom">
diff --git a/repos/gems/run/decorator_stress.run b/repos/gems/run/decorator_stress.run
index a2bf1437dd..2deb3aac65 100644
--- a/repos/gems/run/decorator_stress.run
+++ b/repos/gems/run/decorator_stress.run
@@ -101,7 +101,7 @@ append config {
 		<provides><service name="Nitpicker"/></provides>
 		<config>
 			<domain name="" layer="2" content="client" label="no" />
-			<policy domain=""/>
+			<default-policy domain=""/>
 			<report pointer="yes" />
 		</config>
 		<route>
diff --git a/repos/gems/run/launcher.run b/repos/gems/run/launcher.run
index 483f6ad93e..f271f15c42 100644
--- a/repos/gems/run/launcher.run
+++ b/repos/gems/run/launcher.run
@@ -84,7 +84,7 @@ append config {
 			<policy label_prefix="wm -> launcher -> menu" domain="panel"/>
 			<policy label="wm -> decorator"               domain="decorator"/>
 			<policy label="status_bar"                    domain="panel"/>
-			<policy                                       domain="default"/>
+			<default-policy                               domain="default"/>
 
 			<global-key name="KEY_SCROLLLOCK" label="xray_trigger" />
 			<global-key name="KEY_F1"         label="xray_trigger" />
@@ -212,7 +212,7 @@ append config {
 					<has_value input="xray_enabled" value="yes" />
 					<then>
 						<inline>
-							<policy color="#ff0000" gradient="75" />
+							<default-policy color="#ff0000" gradient="75" />
 						</inline>
 					</then>
 				</if>
diff --git a/repos/gems/run/menu_view.run b/repos/gems/run/menu_view.run
index ad8ae94143..4d794b3c43 100644
--- a/repos/gems/run/menu_view.run
+++ b/repos/gems/run/menu_view.run
@@ -54,7 +54,7 @@ append config {
 			<domain name="default" layer="3" content="client" label="no" hover="always" />
 
 			<policy label="pointer" domain="pointer"/>
-			<policy domain="default"/>
+			<default-policy domain="default"/>
 		</config>
 	</start>
 	<start name="pointer">
diff --git a/repos/gems/run/mixer_gui_qt_test.run b/repos/gems/run/mixer_gui_qt_test.run
index 26959244a2..cf4adcbf00 100644
--- a/repos/gems/run/mixer_gui_qt_test.run
+++ b/repos/gems/run/mixer_gui_qt_test.run
@@ -97,7 +97,7 @@ append config {
 			<domain name="default" layer="2" content="client" label="no" hover="always" focus="click"/>
 
 			<policy label="pointer" domain="pointer"/>
-			<policy                 domain="default"/>
+			<default-policy         domain="default"/>
 
 			<background color="#000000" />
 		</config>
diff --git a/repos/gems/run/nano3d.run b/repos/gems/run/nano3d.run
index 55b23f1f98..b9f86a7d8f 100644
--- a/repos/gems/run/nano3d.run
+++ b/repos/gems/run/nano3d.run
@@ -62,7 +62,7 @@ append config {
 			<domain name="nano3d"  layer="1" content="client" label="no" origin="pointer"/>
 
 			<policy label="nano3d" domain="nano3d"/>
-			<policy domain="default"/>
+			<default-policy domain="default"/>
 		</config>
 	</start>
 
diff --git a/repos/gems/run/nit_fader.run b/repos/gems/run/nit_fader.run
index ed1b922d95..a363cca374 100644
--- a/repos/gems/run/nit_fader.run
+++ b/repos/gems/run/nit_fader.run
@@ -53,7 +53,7 @@ append config {
 			<domain name="default" layer="3" content="client" label="no" focus="click" hover="always" />
 
 			<policy label="pointer" domain="pointer"/>
-			<policy domain="default"/>
+			<default-policy domain="default"/>
 		</config>
 	</start>
 	<start name="pointer">
diff --git a/repos/gems/run/terminal_log.run b/repos/gems/run/terminal_log.run
index 113c0d9a8c..db1d33d273 100644
--- a/repos/gems/run/terminal_log.run
+++ b/repos/gems/run/terminal_log.run
@@ -86,7 +86,7 @@ append config {
 			<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
 			<domain name="default" layer="2" content="client" label="no" focus="click" hover="always" />
 			<policy label="pointer" domain="pointer"/>
-			<policy domain="default"/>
+			<default-policy domain="default"/>
 		</config>
 		<route>
 			<service name="Input">       <child name="input_drv"/> </service>
diff --git a/repos/gems/run/wm.run b/repos/gems/run/wm.run
index 864615a825..0b68c1de00 100644
--- a/repos/gems/run/wm.run
+++ b/repos/gems/run/wm.run
@@ -105,7 +105,7 @@ append config {
 			<domain name="default" layer="2" content="client" label="no" hover="always" focus="click" />
 
 			<policy label="pointer" domain="pointer"/>
-			<policy domain="default"/>
+			<default-policy domain="default"/>
 		</config>
 	</start>
 	<start name="pointer">
@@ -179,7 +179,7 @@ append config {
 			<launcher name="nitpicker" ram_quota="1M" >
 				<config>
 					<domain name="default" layer="2" />
-					<policy domain="default"/>
+					<default-policy domain="default"/>
 				</config>
 			</launcher>
 			<launcher name="testnit" ram_quota="768K" />
diff --git a/repos/libports/run/eglgears.run b/repos/libports/run/eglgears.run
index 8107430879..e1a3a9679e 100644
--- a/repos/libports/run/eglgears.run
+++ b/repos/libports/run/eglgears.run
@@ -68,7 +68,7 @@ append config {
 			<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
 			<domain name="default" layer="2" content="client" focus="click" hover="always" />
 			<policy label="pointer" domain="pointer"/>
-			<policy domain="default"/>
+			<default-policy domain="default"/>
 		</config>
 		<route><any-service><parent/><any-child/></any-service></route>
 	</start>
diff --git a/repos/libports/run/libc_ffat_fs.run b/repos/libports/run/libc_ffat_fs.run
index 909a2a9b58..de1d756f1c 100644
--- a/repos/libports/run/libc_ffat_fs.run
+++ b/repos/libports/run/libc_ffat_fs.run
@@ -58,7 +58,7 @@ set config {
 	<start name="ffat_fs">
 		<resource name="RAM" quantum="4M"/>
 		<provides> <service name="File_system"/> </provides>
-		<config> <policy root="/" writeable="yes" /> </config>
+		<config> <default-policy root="/" writeable="yes" /> </config>
 	</start>
 	<start name="test-libc_vfs">
 		<resource name="RAM" quantum="2M"/>
diff --git a/repos/libports/run/libc_fs_tar_fs.run b/repos/libports/run/libc_fs_tar_fs.run
index 872779749e..1d8e11b02a 100644
--- a/repos/libports/run/libc_fs_tar_fs.run
+++ b/repos/libports/run/libc_fs_tar_fs.run
@@ -45,8 +45,8 @@ set config {
 		<resource name="RAM" quantum="4M"/>
 		<provides> <service name="File_system"/> </provides>
 		<config>
-			<archive name="libc_fs_tar_fs.tar" />
-			<policy root="/testdir" />
+			<archive name="libc_fs_tar_fs.tar"/>
+			<default-policy root="/testdir"/>
 		</config>
 	</start>
 	<start name="test-libc_fs_tar_fs">
diff --git a/repos/libports/run/libc_vfs.run b/repos/libports/run/libc_vfs.run
index 689d922972..70056d71ce 100644
--- a/repos/libports/run/libc_vfs.run
+++ b/repos/libports/run/libc_vfs.run
@@ -32,7 +32,7 @@ set config {
 	<start name="ram_fs">
 		<resource name="RAM" quantum="12M"/>
 		<provides> <service name="File_system"/> </provides>
-		<config> <policy root="/" writeable="yes" /> </config>
+		<config> <default-policy root="/" writeable="yes"/> </config>
 	</start>
 	<start name="test-libc_vfs">
 		<resource name="RAM" quantum="2M"/>
diff --git a/repos/libports/run/libc_vfs_fs.run b/repos/libports/run/libc_vfs_fs.run
index f3adb228b3..37a43fa65c 100644
--- a/repos/libports/run/libc_vfs_fs.run
+++ b/repos/libports/run/libc_vfs_fs.run
@@ -34,7 +34,7 @@ set config {
 		<provides> <service name="File_system"/> </provides>
 		<config>
 			<vfs> <ram/> </vfs>
-			<policy root="/" writeable="yes" />
+			<default-policy root="/" writeable="yes"/>
 		</config>
 	</start>
 	<start name="test-libc_vfs">
diff --git a/repos/libports/run/qt5_common.inc b/repos/libports/run/qt5_common.inc
index 55e2760a0e..73fc0c9fcd 100644
--- a/repos/libports/run/qt5_common.inc
+++ b/repos/libports/run/qt5_common.inc
@@ -77,7 +77,7 @@ proc qt5_start_nodes { feature_arg } {
 				<domain name="default" layer="2" label="no" content="client" focus="click" hover="always" />
 
 				<policy label="pointer" domain="pointer"/>
-				<policy domain="default"/>
+				<default-policy domain="default"/>
 			</config>
 		</start>
 
diff --git a/repos/os/run/demo.run b/repos/os/run/demo.run
index b795255f97..c00c96d6a2 100644
--- a/repos/os/run/demo.run
+++ b/repos/os/run/demo.run
@@ -153,7 +153,7 @@ append config {
 					<policy label="pointer"                   domain="pointer"/>
 					<policy label="status_bar"                domain="panel"/>
 					<policy label_prefix="scout -> launchpad" domain="launchpad"/>
-					<policy                                   domain=""/>
+					<default-policy                           domain=""/>
 
 					<global-key name="KEY_SCROLLLOCK" label="xray_trigger" />
 					<global-key name="KEY_F1"         label="xray_trigger" />
@@ -231,7 +231,7 @@ puts $launchpad_config_fd {<config>
 	<launcher name="nitpicker" ram_quota="1M">
 		<config>
 			<domain name="" layer="3" conten="client" label="no" focus="click"/>
-			<policy domain="" />
+			<default-policy domain="" />
 		</config>
 	</launcher>
 </config>}
diff --git a/repos/os/run/loader.run b/repos/os/run/loader.run
index 5945c91aae..c45c70a9be 100644
--- a/repos/os/run/loader.run
+++ b/repos/os/run/loader.run
@@ -70,7 +70,7 @@ append config {
 		<resource name="RAM" quantum="1M"/>
 		<provides><service name="Nitpicker"/></provides>
 		<config>
-			<domain name="" layer="2" /> <policy domain=""/>
+			<domain name="" layer="2" /> <default-policy domain=""/>
 		</config>
 	</start>
 	<start name="loader">
diff --git a/repos/os/run/usb_block.run b/repos/os/run/usb_block.run
index 06d3b49a65..52d1443426 100644
--- a/repos/os/run/usb_block.run
+++ b/repos/os/run/usb_block.run
@@ -62,7 +62,7 @@ append config {
 		<resource name="RAM" quantum="1M"/>
 		<provides> <service name="Report"/> <service name="ROM"/> </provides>
 		<config verbose="yes">
-			<policy report="usb_drv -> devices"/>
+			<default-policy report="usb_drv -> devices"/>
 		</config>
 	</start>
 	<start name="usb_drv">
@@ -73,21 +73,23 @@ append config {
 				<report devices="no"/>}
 append_if [expr !$use_qemu] config  {
 				<!--
-					The order is important because the first policy always matches.
+					The order is important because only the first policy is
+					picked up - an entry may be moved to the front to test the
+					corresponding device.
 				 -->
 				<!-- zte open c needs interface="3" -->
-				<policy vendor="0x19d2" product="0x1350"/>
+				<default-policy vendor="0x19d2" product="0x1350"/>
 				<!-- kingston -->
-				<policy vendor="0x0951" product="0x1666"/>
+				<default-policy vendor="0x0951" product="0x1666"/>
 				<!-- voyager gt stick -->
-				<policy vendor="0x1b1c" product="0x1a09"/>
+				<default-policy vendor="0x1b1c" product="0x1a09"/>
 				<!-- usb3 hdd adapter -->
-				<policy vendor="0x174c" product="0x5106"/>
+				<default-policy vendor="0x174c" product="0x5106"/>
 				<!-- lenovo disc -->
-				<policy vendor="0x0984" product="0x0066"/>
+				<default-policy vendor="0x0984" product="0x0066"/>
 }
 append_if $use_qemu config {
-				<policy bus="0x001" dev="0x002"/> }
+				<default-policy bus="0x001" dev="0x002"/> }
 append config {
 			</raw>
 		</config>
diff --git a/repos/os/run/vfs_stress_fs.run b/repos/os/run/vfs_stress_fs.run
index 0acb611453..78c8a7bdf2 100644
--- a/repos/os/run/vfs_stress_fs.run
+++ b/repos/os/run/vfs_stress_fs.run
@@ -10,7 +10,7 @@ create_boot_directory
 
 install_config {
 <config>
-	<affinity-space width="3" height="2" />
+	<affinity-space width="3" height="2"/>
 	<parent-provides>
 		<service name="CPU"/>
 		<service name="IO_PORT"/>
@@ -36,7 +36,7 @@ install_config {
 		<resource name="RAM" quantum="1G"/>
 		<provides><service name="File_system"/></provides>
 		<config>
-			<policy root="/" writeable="yes"/>
+			<default-policy root="/" writeable="yes"/>
 		</config>
 	</start>
 </config>
diff --git a/repos/ports/run/debug_nitpicker.run b/repos/ports/run/debug_nitpicker.run
index 65535c152f..942f0f03a6 100644
--- a/repos/ports/run/debug_nitpicker.run
+++ b/repos/ports/run/debug_nitpicker.run
@@ -72,7 +72,7 @@ set config {
 					<domain name="pointer" layer="1" xray="no" origin="pointer" />
 					<domain name="default" layer="3" />
 					<policy label="pointer" domain="pointer"/>
-					<policy domain="default"/>
+					<default-policy domain="default"/>
 				</config>
 			</target>
 			<preserve name="RAM" quantum="2M"/>
diff --git a/repos/ports/run/noux_terminal_fs.run b/repos/ports/run/noux_terminal_fs.run
index 93b55c0f1c..4a4c23be38 100644
--- a/repos/ports/run/noux_terminal_fs.run
+++ b/repos/ports/run/noux_terminal_fs.run
@@ -91,7 +91,7 @@ append config {
 			<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
 			<domain name="default" layer="2" content="client" focus="click" />
 			<policy label="pointer" domain="pointer"/>
-			<policy domain="default"/>
+			<default-policy domain="default"/>
 		</config>
 		<route> }
 append_if [have_spec ps2] config {
diff --git a/repos/ports/run/noux_two_terminal_fs.run b/repos/ports/run/noux_two_terminal_fs.run
index b0a3d3de24..8f88c22bbc 100644
--- a/repos/ports/run/noux_two_terminal_fs.run
+++ b/repos/ports/run/noux_two_terminal_fs.run
@@ -91,7 +91,7 @@ append config {
 			<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
 			<domain name="default" layer="2" content="client" focus="click" />
 			<policy label="pointer" domain="pointer"/>
-			<policy domain="default"/>
+			<default-policy domain="default"/>
 		</config>
 		<route> }
 append_if [have_spec ps2] config {
diff --git a/repos/ports/run/seoul.inc b/repos/ports/run/seoul.inc
index 071bb14e71..fd53a19b1b 100644
--- a/repos/ports/run/seoul.inc
+++ b/repos/ports/run/seoul.inc
@@ -294,7 +294,7 @@ append_if $use_fancy_stuff config {
 			                       hover="always" ypos="18" height="-18" />
 			<policy label="pointer"    domain="pointer"/>
 			<policy label="status_bar" domain="panel"/>
-			<policy domain=""/>
+			<default-policy domain=""/>
 		</config>
 		<route>
 			<service name="Timer">      <child name="timer"/></service>
diff --git a/repos/ports/run/vbox_auto_win7_share.run b/repos/ports/run/vbox_auto_win7_share.run
index c6874eda12..79e2ec218b 100644
--- a/repos/ports/run/vbox_auto_win7_share.run
+++ b/repos/ports/run/vbox_auto_win7_share.run
@@ -127,8 +127,8 @@ set config_of_app {
 		<resource name="RAM" quantum="4M"/>
 		<provides> <service name="Nic"/> </provides>
 		<route>
-			<service name="IRQ"><child name="acpi" /></service>
-			<any-service> <parent /> <any-child /></any-service>
+			<service name="IRQ"><child name="acpi"/></service>
+			<any-service> <parent/> <any-child/></any-service>
 		</route>
 	</start>
 
@@ -141,68 +141,68 @@ set config_of_app {
 	</start>
 
 	<start name="noux" priority="-1">
-		<resource name="RAM" quantum="32M" />
+		<resource name="RAM" quantum="32M"/>
 		<config>
 			<fstab>
-				<tar name="coreutils.tar" />
-				<tar name="bash.tar" />
+				<tar name="coreutils.tar"/>
+				<tar name="bash.tar"/>
 
-				<dir name="from"> <fs label="share_from" /> </dir>
-				<dir name="to">   <fs label="share_to" /> </dir>
+				<dir name="from"> <fs label="share_from"/> </dir>
+				<dir name="to">   <fs label="share_to"/> </dir>
 			</fstab>
 			<start name="/bin/bash">
-				<env name="TERM" value="linux" />
+				<env name="TERM" value="linux"/>
 			</start>
 		</config>
 		<route>
 			<service name="File_system">
-				<if-arg key="label" value="share_from" />
+				<if-arg key="label" value="share_from"/>
 				<child name="ram_fs_from"/>
 			</service>
 			<service name="File_system">
-				<if-arg key="label" value="share_to" />
+				<if-arg key="label" value="share_to"/>
 				<child name="ram_fs_to"/>
 			</service>
-			<any-service> <parent/> <any-child /> </any-service>
+			<any-service> <parent/> <any-child/> </any-service>
 		</route>
 	</start>
 
 	<start name="ram_fs_from" priority="-1">
-		<binary name="ram_fs" />
+		<binary name="ram_fs"/>
 		<resource name="RAM" quantum="64M"/>
 		<provides><service name="File_system"/></provides>
 		<config>
 			<content>
-				<rom name="test.bin" />
-				<rom name="template.bat" />
+				<rom name="test.bin"/>
+				<rom name="template.bat"/>
 			</content>
-			<policy root="/" writeable="no" />
+			<default-policy root="/" writeable="no"/>
 		</config>
 	</start>
 
 	<start name="ram_fs_to" priority="-1">
-		<binary name="ram_fs" />
+		<binary name="ram_fs"/>
 		<resource name="RAM" quantum="64M"/>
 		<provides><service name="File_system"/></provides>
 		<config>
-			<policy root="/" writeable="yes" />
+			<default-policy root="/" writeable="yes"/>
 		</config>
 	</start>
 
 	<start name="report_rom">
 		<resource name="RAM" quantum="1M"/>
 		<provides> <service name="Report"/> <service name="ROM"/> </provides>
-		<config> <rom /> </config>
+		<config> <rom/> </config>
 	</start>
 
 	<start name="vbox" priority="-2">
-		<binary name="virtualbox" />
+		<binary name="virtualbox"/>
 		<resource name="RAM" quantum="1280M"/>
 		<config vbox_file="vm_auto_share.vbox" vm_name="AutoDisk">
 			<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc">
 				<vfs>
 					<dir name="dev"> <log/> <rtc/> </dir>
-					<rom name="vm_auto_share.vbox" />}
+					<rom name="vm_auto_share.vbox"/>}
 
 append_if [expr $use_ram_fs] config_of_app {
 					<dir name="ram">  <fs label="from_ram_fs"/> </dir>}
@@ -210,30 +210,30 @@ append_if [expr $use_ram_fs] config_of_app {
 append config_of_app {
 					<dir name="from"> <fs label="share_ram_fs_from"/> </dir>
 					<dir name="to">   <fs label="share_ram_fs_to"/> </dir>
-					<fs />
+					<fs/>
 				</vfs>
 			</libc>
 		</config>
 		<route>
-			<service name="Report"> <child name="report_rom" /> </service>}
+			<service name="Report"> <child name="report_rom"/> </service>}
 
 append_if [expr $use_ram_fs] config_of_app {
 			<service name="File_system">
-				<if-arg key="label" value="from_ram_fs" />
+				<if-arg key="label" value="from_ram_fs"/>
 				<child name="ram_fs"/>
 			</service>}
 
 append config_of_app {
 			<service name="File_system">
-				<if-arg key="label" value="share_ram_fs_from" />
+				<if-arg key="label" value="share_ram_fs_from"/>
 				<child name="ram_fs_from"/>
 			</service>
 			<service name="File_system">
-				<if-arg key="label" value="share_ram_fs_to" />
+				<if-arg key="label" value="share_ram_fs_to"/>
 				<child name="ram_fs_to"/>
 			</service>
 			<service name="File_system"> <child name="rump_fs"/> </service>
-			<any-service> <parent/> <any-child /> </any-service>
+			<any-service> <parent/> <any-child/> </any-service>
 		</route>
 	</start>
 }
diff --git a/repos/ports/run/vbox_pointer.run b/repos/ports/run/vbox_pointer.run
index 1ddae5208c..eceaaa464f 100644
--- a/repos/ports/run/vbox_pointer.run
+++ b/repos/ports/run/vbox_pointer.run
@@ -93,7 +93,7 @@ set config {
 
 			<policy label="pointer"            domain="pointer"/>
 			<policy label="test-domain-smiley" domain="smiley"/>
-			<policy                            domain="default"/>
+			<default-policy                    domain="default"/>
 
 			<background color="#00426f"/> <!-- indigo -->
 		</config>
@@ -189,7 +189,7 @@ set config {
 		<binary name="vbox_pointer"/>
 		<resource name="RAM" quantum="1M"/>
 		<config>
-			<policy domain="smiley"           rom="smiley"/>
+			<default-policy domain="smiley"   rom="smiley"/>
 			<policy label="test-label-arrow"  rom="arrow"/>
 			<policy label="test-label-blade"  rom="blade"/>
 			<policy label="test-label-bladex" rom="bladex"/>
diff --git a/repos/ports/run/vbox_win.inc b/repos/ports/run/vbox_win.inc
index 7149dcf7b2..bb08b6c1c7 100644
--- a/repos/ports/run/vbox_win.inc
+++ b/repos/ports/run/vbox_win.inc
@@ -120,7 +120,7 @@ append config_of_app {
 
 			<policy label="vbox_pointer" domain="pointer"/>
 			<policy label="nit_fb"       domain="vbox"/>
-			<policy domain=""/>
+			<default-policy domain=""/>
 		</config>
 	</start>
 
diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc
index 8789d5ba1f..aafa2b0d28 100644
--- a/repos/ports/run/virtualbox_auto.inc
+++ b/repos/ports/run/virtualbox_auto.inc
@@ -52,19 +52,19 @@ set config {
 		<provides><service name="Timer"/></provides>
 	</start>
 	<start name="ahci_drv" priority="-1">
-		<resource name="RAM" quantum="10M" />
-		<provides><service name="Block" /></provides>
+		<resource name="RAM" quantum="10M"/>
+		<provides><service name="Block"/></provides>
 		<config>
-			<policy label="part_blk" device="0" />
+			<policy label="part_blk" device="0"/>
 		</config>
 		<route>
-			<service name="IRQ"><child name="acpi_drv" /></service>
-			<any-service> <parent /> <any-child /></any-service>
+			<service name="IRQ"><child name="acpi_drv"/></service>
+			<any-service> <parent/> <any-child/></any-service>
 		</route>
 	</start>
 	<start name="part_blk" priority="-1">
-		<resource name="RAM" quantum="10M" />
-		<provides><service name="Block" /></provides>
+		<resource name="RAM" quantum="10M"/>
+		<provides><service name="Block"/></provides>
 		<route>
 			<any-service><child name="ahci_drv"/> <parent/><any-child/></any-service>
 		</route>
@@ -73,9 +73,9 @@ set config {
 		</config>
 	</start>
 	<start name="rump_fs" priority="-1">
-		<resource name="RAM" quantum="32M" />
+		<resource name="RAM" quantum="32M"/>
 		<provides><service name="File_system"/></provides>
-		<config fs="ext2fs"><policy root="/" writeable="yes"/></config>
+		<config fs="ext2fs"> <default-policy root="/" writeable="yes"/> </config>
 		<route>
 			<any-service><child name="part_blk"/> <parent/><any-child/></any-service>
 		</route>
@@ -83,7 +83,7 @@ set config {
 
 append_if [expr $use_ram_fs] config {
 	<start name="ram_fs" priority="-1">
-		<resource name="RAM" quantum="512M" />
+		<resource name="RAM" quantum="512M"/>
 		<provides><service name="File_system"/></provides>
 		<config>
 			<content>
@@ -93,7 +93,7 @@ append_if [expr $use_ram_fs] config {
 				</dir>
 			</content>
 			<!-- constrain sessions according to their labels -->
-			<policy label="vbox -> from_ram_fs" root="/ram" writeable="yes" />
+			<policy label="vbox -> from_ram_fs" root="/ram" writeable="yes"/>
 		</config>
 	</start>}
 
@@ -104,8 +104,8 @@ append_if [expr $use_ps2] config {
 		<resource name="RAM" quantum="1M"/>
 		<provides><service name="Input"/></provides>
 		<route>
-			<service name="IRQ"><child name="acpi_drv" /></service>
-			<any-service> <parent /> <any-child /></any-service>
+			<service name="IRQ"><child name="acpi_drv"/></service>
+			<any-service> <parent/> <any-child/></any-service>
 		</route>
 	</start>}
 
@@ -150,7 +150,7 @@ append_if [expr $use_usb] config {
 </config>
 				</inline>
 			</content>
-			<policy label_prefix="usb_report_filter" root="/" writeable="yes" />
+			<policy label_prefix="usb_report_filter" root="/" writeable="yes"/>
 			<policy label_prefix="usb_config_rom" root="/"/>
 		</config>
 	</start>
@@ -169,7 +169,7 @@ append_if [expr $use_usb] config {
 		<resource name="RAM" quantum="1200K"/>
 		<configfile name="usb_report_filter.config"/>
 		<route>
-			<service name="Report"><child name="report_rom" /></service>
+			<service name="Report"><child name="report_rom"/></service>
 			<service name="ROM" label="usb_report_filter.config">
 				<child name="usb_config_rom"/>
 			</service>
@@ -182,7 +182,7 @@ append_if [expr $use_usb] config {
 			<service name="File_system" label="usb_drv.config">
 				<child name="usb_config_fs"/>
 			</service>
-			<any-service><parent/><any-child /></any-service>
+			<any-service><parent/><any-child/></any-service>
 		</route>
 	</start>
 
@@ -190,14 +190,14 @@ append_if [expr $use_usb] config {
 		<resource name="RAM" quantum="16M"/>
 		<provides>
 			<service name="Input"/>
-			<service name="Usb" />
+			<service name="Usb"/>
 		</provides>
 		<configfile name="usb_drv.config"/>
 		<route>
-			<service name="IRQ"><child name="acpi_drv" /></service>
-			<service name="Report"><child name="report_rom" /></service>
+			<service name="IRQ"><child name="acpi_drv"/></service>
+			<service name="Report"><child name="report_rom"/></service>
 			<service name="ROM" label="usb_drv.config"><child name="usb_config_rom"/></service>
-			<any-service><parent /><any-child /></any-service>
+			<any-service><parent/><any-child/></any-service>
 		</route>
 	</start>
 }
@@ -206,7 +206,7 @@ append_if [have_spec framebuffer] config {
 	<start name="fb_drv" priority="-1">
 		<resource name="RAM" quantum="6M"/>
 		<provides><service name="Framebuffer"/></provides>
-		<config buffered="yes" />
+		<config buffered="yes"/>
 	</start>}
 
 append_if [have_spec x86] config {