From 6dd695f788be09516e1fe8a5333404793c091aba Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Wed, 2 Nov 2016 11:38:20 +0100
Subject: [PATCH] update report_rom configs to fix warning

Several run scripts still used the outdated '<rom>' sub node in the
report_rom configuration.
---
 repos/gems/run/decorator.run                 |  4 +---
 repos/gems/run/decorator_stress.run          | 10 ++++-----
 repos/gems/run/mixer_gui_qt_test.run         | 22 +++++++++-----------
 repos/gems/run/wm.run                        | 18 +++++++---------
 repos/gems/src/app/launcher/main.cc          |  4 ++--
 repos/libports/run/qt5_common.inc            | 20 ++++++++----------
 repos/os/run/clipboard.run                   |  4 +---
 repos/os/run/demo.run                        |  8 +++----
 repos/os/run/mixer.run                       |  4 +---
 repos/os/src/drivers/acpi/README             |  4 +---
 repos/ports/run/seoul.inc                    |  4 +---
 repos/ports/run/vbox_auto_genode_usb_hid.run |  8 +++----
 repos/ports/run/vbox_pointer.run             | 18 +++++++---------
 13 files changed, 51 insertions(+), 77 deletions(-)

diff --git a/repos/gems/run/decorator.run b/repos/gems/run/decorator.run
index c11b8b1b6c..0bea63adca 100644
--- a/repos/gems/run/decorator.run
+++ b/repos/gems/run/decorator.run
@@ -49,9 +49,7 @@ append config {
 		<provides> <service name="ROM" />
 		           <service name="Report" /> </provides>
 		<config>
-			<rom>
-				<policy label="decorator -> pointer" report="nitpicker -> pointer"/>
-			</rom>
+			<policy label="decorator -> pointer" report="nitpicker -> pointer"/>
 		</config>
 	</start>
 	<start name="nitpicker">
diff --git a/repos/gems/run/decorator_stress.run b/repos/gems/run/decorator_stress.run
index 2deb3aac65..f6bc5abcc4 100644
--- a/repos/gems/run/decorator_stress.run
+++ b/repos/gems/run/decorator_stress.run
@@ -114,12 +114,10 @@ append config {
 		<provides> <service name="ROM" />
 		           <service name="Report" /> </provides>
 		<config>
-			<rom>
-				<policy label="decorator -> pointer"
-				       report="nitpicker -> pointer"/>
-				<policy label="decorator -> window_layout"
-				       report="test-decorator_stress -> window_layout"/>
-			</rom>
+			<policy label="decorator -> pointer"
+			       report="nitpicker -> pointer"/>
+			<policy label="decorator -> window_layout"
+			       report="test-decorator_stress -> window_layout"/>
 		</config>
 	</start>
 	<start name="test-decorator_stress">
diff --git a/repos/gems/run/mixer_gui_qt_test.run b/repos/gems/run/mixer_gui_qt_test.run
index cf4adcbf00..8f3b173edd 100644
--- a/repos/gems/run/mixer_gui_qt_test.run
+++ b/repos/gems/run/mixer_gui_qt_test.run
@@ -74,18 +74,16 @@ append config {
 			<service name="Report"/>
 		</provides>
 		<config>
-			<rom>
-				<policy label="layouter -> window_list"       report="wm -> window_list"/>
-				<policy label="layouter -> focus_request"     report="wm -> focus_request"/>
-				<policy label="decorator -> window_layout"    report="layouter -> window_layout"/>
-				<policy label="wm -> resize_request"          report="layouter -> resize_request"/>
-				<policy label="decorator -> pointer"          report="wm -> pointer"/>
-				<policy label="layouter -> hover"             report="decorator -> hover"/>
-				<policy label="wm -> focus"                   report="layouter -> focus"/>
-				<policy label="layouter -> decorator_margins" report="decorator -> decorator_margins"/>
-				<policy label="mixer_gui_qt -> channel_list"  report="mixer -> channel_list"/>
-				<policy label="mixer -> channel_list"         report="mixer_gui_qt -> channel_list"/>
-			</rom>
+			<policy label="layouter -> window_list"       report="wm -> window_list"/>
+			<policy label="layouter -> focus_request"     report="wm -> focus_request"/>
+			<policy label="decorator -> window_layout"    report="layouter -> window_layout"/>
+			<policy label="wm -> resize_request"          report="layouter -> resize_request"/>
+			<policy label="decorator -> pointer"          report="wm -> pointer"/>
+			<policy label="layouter -> hover"             report="decorator -> hover"/>
+			<policy label="wm -> focus"                   report="layouter -> focus"/>
+			<policy label="layouter -> decorator_margins" report="decorator -> decorator_margins"/>
+			<policy label="mixer_gui_qt -> channel_list"  report="mixer -> channel_list"/>
+			<policy label="mixer -> channel_list"         report="mixer_gui_qt -> channel_list"/>
 		</config>
 	</start>
 	<start name="nitpicker">
diff --git a/repos/gems/run/wm.run b/repos/gems/run/wm.run
index 0b68c1de00..518023f5f7 100644
--- a/repos/gems/run/wm.run
+++ b/repos/gems/run/wm.run
@@ -122,16 +122,14 @@ append config {
 			<service name="ROM"/>
 		</provides>
 		<config>
-			<rom>
-				<policy label="layouter -> window_list"       report="wm -> window_list"/>
-				<policy label="layouter -> focus_request"     report="wm -> focus_request"/>
-				<policy label="decorator -> window_layout"    report="layouter -> window_layout"/>
-				<policy label="wm -> resize_request"          report="layouter -> resize_request"/>
-				<policy label="decorator -> pointer"          report="wm -> pointer"/>
-				<policy label="layouter -> hover"             report="decorator -> hover"/>
-				<policy label="layouter -> decorator_margins" report="decorator -> decorator_margins"/>
-				<policy label="wm -> focus"                   report="layouter -> focus"/>
-			</rom>
+			<policy label="layouter -> window_list"       report="wm -> window_list"/>
+			<policy label="layouter -> focus_request"     report="wm -> focus_request"/>
+			<policy label="decorator -> window_layout"    report="layouter -> window_layout"/>
+			<policy label="wm -> resize_request"          report="layouter -> resize_request"/>
+			<policy label="decorator -> pointer"          report="wm -> pointer"/>
+			<policy label="layouter -> hover"             report="decorator -> hover"/>
+			<policy label="layouter -> decorator_margins" report="decorator -> decorator_margins"/>
+			<policy label="wm -> focus"                   report="layouter -> focus"/>
 		</config>
 	</start>
 	<start name="wm" priority="-1">
diff --git a/repos/gems/src/app/launcher/main.cc b/repos/gems/src/app/launcher/main.cc
index e07267e874..a92b745448 100644
--- a/repos/gems/src/app/launcher/main.cc
+++ b/repos/gems/src/app/launcher/main.cc
@@ -44,14 +44,14 @@ struct Launcher::Main
 	Genode::Cap_connection _cap;
 
 	char const *_report_rom_config =
-		"<config> <rom>"
+		"<config>"
 		"  <policy label=\"menu_dialog\"    report=\"menu_dialog\"/>"
 		"  <policy label=\"menu_hover\"     report=\"menu_hover\"/>"
 		"  <policy label=\"panel_dialog\"   report=\"panel_dialog\"/>"
 		"  <policy label=\"panel_hover\"    report=\"panel_hover\"/>"
 		"  <policy label=\"context_dialog\" report=\"context_dialog\"/>"
 		"  <policy label=\"context_hover\"  report=\"context_hover\"/>"
-		"</rom> </config>";
+		"</config>";
 
 	Report_rom_slave _report_rom_slave = { _cap, *env()->ram_session(), _report_rom_config };
 
diff --git a/repos/libports/run/qt5_common.inc b/repos/libports/run/qt5_common.inc
index 47c3f32182..ff4ec27297 100644
--- a/repos/libports/run/qt5_common.inc
+++ b/repos/libports/run/qt5_common.inc
@@ -93,17 +93,15 @@ proc qt5_start_nodes { feature_arg } {
 				<service name="ROM"/>
 			</provides>
 			<config>
-				<rom>
-					<policy label="layouter -> window_list"       report="wm -> window_list"/>
-					<policy label="layouter -> focus_request"     report="wm -> focus_request"/>
-					<policy label="decorator -> window_layout"    report="layouter -> window_layout"/>
-					<policy label="wm -> resize_request"          report="layouter -> resize_request"/>
-					<policy label="decorator -> pointer"          report="wm -> pointer"/>
-					<policy label="layouter -> hover"             report="decorator -> hover"/>
-					<policy label="wm -> focus"                   report="layouter -> focus"/>
-					<policy label="clipboard -> focus"            report="nitpicker -> focus"/>
-					<policy label="layouter -> decorator_margins" report="decorator -> decorator_margins"/>
-				</rom>
+				<policy label="layouter -> window_list"       report="wm -> window_list"/>
+				<policy label="layouter -> focus_request"     report="wm -> focus_request"/>
+				<policy label="decorator -> window_layout"    report="layouter -> window_layout"/>
+				<policy label="wm -> resize_request"          report="layouter -> resize_request"/>
+				<policy label="decorator -> pointer"          report="wm -> pointer"/>
+				<policy label="layouter -> hover"             report="decorator -> hover"/>
+				<policy label="wm -> focus"                   report="layouter -> focus"/>
+				<policy label="clipboard -> focus"            report="nitpicker -> focus"/>
+				<policy label="layouter -> decorator_margins" report="decorator -> decorator_margins"/>
 			</config>
 		</start>
 
diff --git a/repos/os/run/clipboard.run b/repos/os/run/clipboard.run
index 01789292b5..27286bf987 100644
--- a/repos/os/run/clipboard.run
+++ b/repos/os/run/clipboard.run
@@ -40,9 +40,7 @@ append config {
 		<resource name="RAM" quantum="1M"/>
 		<provides> <service name="Report"/> <service name="ROM"/> </provides>
 		<config verbose="yes">
-			<rom>
-				<policy label="clipboard -> focus" report="test-clipboard -> focus"/>
-			</rom>
+			<policy label="clipboard -> focus" report="test-clipboard -> focus"/>
 		</config>
 	</start>
 
diff --git a/repos/os/run/demo.run b/repos/os/run/demo.run
index c00c96d6a2..aa89d9d9c5 100644
--- a/repos/os/run/demo.run
+++ b/repos/os/run/demo.run
@@ -102,11 +102,9 @@ append config {
 		<resource name="RAM" quantum="1M"/>
 		<provides> <service name="Report"/> <service name="ROM"/> </provides>
 		<config>
-			<rom>
-				<policy label="status_bar -> focus"      report="nitpicker -> focus"/>
-				<policy label="nitpicker_config -> xray" report="xray_trigger -> xray"/>
-				<policy label="xray_trigger -> hover"    report="nitpicker -> hover"/>
-			</rom>
+			<policy label="status_bar -> focus"      report="nitpicker -> focus"/>
+			<policy label="nitpicker_config -> xray" report="xray_trigger -> xray"/>
+			<policy label="xray_trigger -> hover"    report="nitpicker -> hover"/>
 		</config>
 	</start>
 
diff --git a/repos/os/run/mixer.run b/repos/os/run/mixer.run
index dca174228e..dd72858525 100644
--- a/repos/os/run/mixer.run
+++ b/repos/os/run/mixer.run
@@ -63,9 +63,7 @@ append config {
 				<service name="Report"/>
 			</provides>
 			<config verbose="yes">
-				<rom>
-					<policy label="to_whom_it_may_concern" report="mixer -> channel_list"/>
-				</rom>
+				<policy label="to_whom_it_may_concern" report="mixer -> channel_list"/>
 			</config>
 		</start>
 
diff --git a/repos/os/src/drivers/acpi/README b/repos/os/src/drivers/acpi/README
index c90e84a58e..e6e7b4dfe4 100644
--- a/repos/os/src/drivers/acpi/README
+++ b/repos/os/src/drivers/acpi/README
@@ -27,9 +27,7 @@ Usage
 !    <service name="Report" />
 !  </provides>
 !  <config>
-!    <rom>
-!      <policy label="platform_drv -> acpi" report="acpi_drv -> acpi"/>
-!    </rom>
+!    <policy label="platform_drv -> acpi" report="acpi_drv -> acpi"/>
 !  </config>
 !</start>
 !
diff --git a/repos/ports/run/seoul.inc b/repos/ports/run/seoul.inc
index 26b7c7e3f3..928e0dc762 100644
--- a/repos/ports/run/seoul.inc
+++ b/repos/ports/run/seoul.inc
@@ -315,9 +315,7 @@ append_if $use_fancy_stuff config {
 		<resource name="RAM" quantum="1M"/>
 		<provides> <service name="Report"/> <service name="ROM"/> </provides>
 		<config>
-			<rom>
-				<policy label="status_bar -> focus" report="nitpicker -> focus"/>
-			</rom>
+			<policy label="status_bar -> focus" report="nitpicker -> focus"/>
 		</config>
 	</start>
 	<start name="launchpad" priority="-2">
diff --git a/repos/ports/run/vbox_auto_genode_usb_hid.run b/repos/ports/run/vbox_auto_genode_usb_hid.run
index 4f9ce74eec..c7e36ef461 100644
--- a/repos/ports/run/vbox_auto_genode_usb_hid.run
+++ b/repos/ports/run/vbox_auto_genode_usb_hid.run
@@ -155,11 +155,9 @@ append config {
 		<resource name="RAM" quantum="1M"/>
 		<provides> <service name="Report"/> <service name="ROM"/> </provides>
 		<config>
-			<rom>
-				<policy label="usb_report_filter -> devices"        report="usb_drv -> devices"/>
-				<policy label="usb_report_filter -> usb_drv_config" report="usb_drv -> config"/>
-				<policy label="virtualbox -> usb_devices"           report="usb_report_filter -> usb_devices"/>
-			</rom>
+			<policy label="usb_report_filter -> devices"        report="usb_drv -> devices"/>
+			<policy label="usb_report_filter -> usb_drv_config" report="usb_drv -> config"/>
+			<policy label="virtualbox -> usb_devices"           report="usb_report_filter -> usb_devices"/>
 		</config>
 	</start>
 
diff --git a/repos/ports/run/vbox_pointer.run b/repos/ports/run/vbox_pointer.run
index eceaaa464f..25c2d66db0 100644
--- a/repos/ports/run/vbox_pointer.run
+++ b/repos/ports/run/vbox_pointer.run
@@ -71,11 +71,9 @@ set config {
 		<resource name="RAM" quantum="1M"/>
 		<provides> <service name="Report"/> <service name="ROM"/> </provides>
 		<config>
-			<rom>
-				<policy label="pointer -> hover" report="nitpicker -> hover"/>
-				<policy label="pointer -> xray"  report="nitpicker -> xray"/>
-				<policy label="pointer -> focus" report="nitpicker -> focus"/>
-			</rom>
+			<policy label="pointer -> hover" report="nitpicker -> hover"/>
+			<policy label="pointer -> xray"  report="nitpicker -> xray"/>
+			<policy label="pointer -> focus" report="nitpicker -> focus"/>
 		</config>
 		<route>
 			<service name="RM">     <parent/> </service>
@@ -112,12 +110,10 @@ set config {
 		<resource name="RAM" quantum="1M"/>
 		<provides> <service name="Report"/> <service name="ROM"/> </provides>
 		<config>
-			<rom>
-				<policy label="pointer -> arrow"  report="shape-arrow -> shape"/>
-				<policy label="pointer -> blade"  report="shape-blade -> shape"/>
-				<policy label="pointer -> bladex" report="shape-bladex -> shape"/>
-				<policy label="pointer -> smiley" report="shape-smiley -> shape"/>
-			</rom>
+			<policy label="pointer -> arrow"  report="shape-arrow -> shape"/>
+			<policy label="pointer -> blade"  report="shape-blade -> shape"/>
+			<policy label="pointer -> bladex" report="shape-bladex -> shape"/>
+			<policy label="pointer -> smiley" report="shape-smiley -> shape"/>
 		</config>
 		<route>
 			<service name="RM">     <parent/> </service>