From 21bf74bbc894bdc418b63bb596b7a27e933ab083 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Thu, 24 Nov 2016 17:10:16 +0100
Subject: [PATCH] Adaptation to stricter label prefixing

This patch is related to the following issue:

https://github.com/genodelabs/genode/issues/2171
---
 run/abuse.run             |  8 ++++----
 run/audio_player.run      |  2 +-
 run/chocolate-doom.run    |  2 +-
 run/eigentor.run          |  8 ++++----
 run/framebuffer_app.inc   |  8 ++++----
 run/synergy_nitpicker.run | 14 +++++++-------
 run/tor_lx.run            |  4 ++--
 run/tyrian.run            |  8 ++++----
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/run/abuse.run b/run/abuse.run
index f3fbc76..198b38d 100644
--- a/run/abuse.run
+++ b/run/abuse.run
@@ -15,10 +15,10 @@ source ${genode_dir}/repos/base/run/platform_drv.inc
 # override default platform driver policy
 proc platform_drv_policy {} {
 	return {
-			<policy label="ps2_drv"> <device name="PS2"/> </policy>
-			<policy label="usb_drv"> <pci class="USB"/> </policy>
-			<policy label="fb_drv">  <pci class="VGA"/> </policy>
-			<policy label="audio_drv"> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>}
+			<policy label_prefix="ps2_drv"> <device name="PS2"/> </policy>
+			<policy label_prefix="usb_drv"> <pci class="USB"/> </policy>
+			<policy label_prefix="fb_drv">  <pci class="VGA"/> </policy>
+			<policy label_prefix="audio_drv"> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>}
 }
 
 append_platform_drv_build_components
diff --git a/run/audio_player.run b/run/audio_player.run
index effdf66..8685930 100644
--- a/run/audio_player.run
+++ b/run/audio_player.run
@@ -53,7 +53,7 @@ append config {
 		<provides> <service name="Report"/> <service name="ROM"/> </provides>
 		<config verbose="yes">
 			<rom>
-				<policy label="" report="audio_player -> current_track"/>
+				<policy label_prefix="" report="audio_player -> current_track"/>
 			</rom>
 		</config>
 	</start>
diff --git a/run/chocolate-doom.run b/run/chocolate-doom.run
index cc200be..169a22e 100644
--- a/run/chocolate-doom.run
+++ b/run/chocolate-doom.run
@@ -139,7 +139,7 @@ append config {
 		<provides> <service name="File_system"/> </provides>
 		<config>
 			<archive name="data.tar" />
-			<policy label="chocolate-doom -> wads" root="/wads" />
+			<policy label_prefix="chocolate-doom -> wads" root="/wads" />
 		</config>
 	</start>
 	<start name="chocolate-doom">
diff --git a/run/eigentor.run b/run/eigentor.run
index 41e916b..90dc1bc 100644
--- a/run/eigentor.run
+++ b/run/eigentor.run
@@ -72,11 +72,11 @@ append config {
 		<config rtt_sec="3">
 			<policy label="uplink" src="10.1.1.2"/>
 
-			<policy label="tor" src="10.1.2.1" nat="yes" nat-tcp-ports="100">
+			<policy label_prefix="tor" src="10.1.2.1" nat="yes" nat-tcp-ports="100">
 				<ip dst="0.0.0.0/0" label="uplink" via="10.1.1.1"/>
 			</policy>
 
-			<policy label="web-client -> fetchurl" src="10.1.3.1" nat="yes" nat-tcp-ports="100">
+			<policy label_prefix="web-client -> fetchurl" src="10.1.3.1" nat="yes" nat-tcp-ports="100">
 				<ip dst="10.1.3.1/32">
 					<tcp dst="9050" label="tor" to="10.1.2.2"/>
 				</ip>
@@ -101,8 +101,8 @@ SOCKSPort 10.1.2.2:9050
 DataDirectory /tor
 			</inline></dir>
 			</content>
-		<policy label="tor -> data" root="/data" writeable="yes"/>
-		<policy label="tor -> conf" root="/conf" writeable="no"/>
+		<policy label_prefix="tor -> data" root="/data" writeable="yes"/>
+		<policy label_prefix="tor -> conf" root="/conf" writeable="no"/>
 		</config>
 	</start>
 
diff --git a/run/framebuffer_app.inc b/run/framebuffer_app.inc
index 37f2e8b..6f0c1d2 100644
--- a/run/framebuffer_app.inc
+++ b/run/framebuffer_app.inc
@@ -30,10 +30,10 @@ source ${genode_dir}/repos/base/run/platform_drv.inc
 # override default platform driver policy
 proc platform_drv_policy {} {
 	return {
-			<policy label="ps2_drv"> <device name="PS2"/> </policy>
-			<policy label="usb_drv"> <pci class="USB"/> </policy>
-			<policy label="fb_drv">  <pci class="VGA"/> </policy>
-			<policy label="audio_drv"> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>}
+			<policy label_prefix="ps2_drv"> <device name="PS2"/> </policy>
+			<policy label_prefix="usb_drv"> <pci class="USB"/> </policy>
+			<policy label_prefix="fb_drv">  <pci class="VGA"/> </policy>
+			<policy label_prefix="audio_drv"> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>}
 }
 
 append_platform_drv_build_components
diff --git a/run/synergy_nitpicker.run b/run/synergy_nitpicker.run
index 9edf214..86dca0d 100644
--- a/run/synergy_nitpicker.run
+++ b/run/synergy_nitpicker.run
@@ -116,9 +116,9 @@ append config {
 			<domain name="right"   layer="2" origin="top_right" xpos="-340"/>
 			<domain name="" layer="1"/>
 
-			<policy label="left"    domain="left"/>
-			<policy label="right"   domain="right"/>
-			<policy label="" domain=""/>
+			<policy label_prefix="left"  domain="left"/>
+			<policy label_prefix="right" domain="right"/>
+			<default-policy              domain=""/>
 		</config>
 	</start>
 
@@ -170,8 +170,8 @@ append config {
 					<background color="#808080"/>
 					<domain name="pointer" layer="1" xray="no" origin="pointer" />
 					<domain name="" layer="2"/>
-					<policy label="pointer" domain="pointer"/>
-					<policy label="" domain=""/>
+					<policy label_prefix="pointer" domain="pointer"/>
+					<default-policy domain=""/>
 				</config>
 			</start>
 			<start name="pointer">
@@ -229,8 +229,8 @@ append config {
 					<background color="#800000"/>
 					<domain name="pointer" layer="1" xray="no" origin="pointer" />
 					<domain name="" layer="2"/>
-					<policy label="pointer" domain="pointer"/>
-					<policy label="" domain=""/>
+					<policy label_prefix="pointer" domain="pointer"/>
+					<default-policy domain=""/>
 				</config>
 			</start>
 			<start name="pointer">
diff --git a/run/tor_lx.run b/run/tor_lx.run
index 70ab911..b67cde2 100644
--- a/run/tor_lx.run
+++ b/run/tor_lx.run
@@ -87,8 +87,8 @@ append config {
 DataDirectory /tor
 			</inline></dir>
 			</content>
-		<policy label="tor -> data" root="/data" writeable="yes"/>
-		<policy label="tor -> conf" root="/conf" writeable="no"/>
+		<policy label_prefix="tor -> data" root="/data" writeable="yes"/>
+		<policy label_prefix="tor -> conf" root="/conf" writeable="no"/>
 		</config>
 	</start>
 
diff --git a/run/tyrian.run b/run/tyrian.run
index 301508d..412fee3 100644
--- a/run/tyrian.run
+++ b/run/tyrian.run
@@ -23,10 +23,10 @@ source ${genode_dir}/repos/base/run/platform_drv.inc
 # override default platform driver policy
 proc platform_drv_policy {} {
 	return {
-			<policy label="ps2_drv"> <device name="PS2"/> </policy>
-			<policy label="usb_drv"> <pci class="USB"/> </policy>
-			<policy label="fb_drv">  <pci class="VGA"/> </policy>
-			<policy label="audio_drv"> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>}
+			<policy label_prefix="ps2_drv"> <device name="PS2"/> </policy>
+			<policy label_prefix="usb_drv"> <pci class="USB"/> </policy>
+			<policy label_prefix="fb_drv">  <pci class="VGA"/> </policy>
+			<policy label_prefix="audio_drv"> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>}
 }
 
 append_platform_drv_build_components