From a9eb25f07f0ac1e578a105b82efa962101555218 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Fri, 4 Aug 2017 11:24:15 +0200
Subject: [PATCH] gems: fix cap quotas of launcher.run scenario
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The launcher.run scenario was last updated mid-may of the recently
developed cap-quota accounting (before all cap types were covered).
Hence, the quotas used in the scenario are too low. This patch adjusts
the values such that the scenario can be started on NOVA on Qemu. It
also fixes a warning about a deprecated way of configuring the
report_rom component.

Thanks to Jörg-Christian Böhme for reporting!
---
 repos/gems/include/gems/report_rom_slave.h    |  2 +-
 repos/gems/run/launcher.run                   | 32 +++++++++----------
 repos/gems/src/app/launcher/menu_view_slave.h |  2 +-
 repos/gems/src/app/launcher/nit_fader_slave.h |  2 +-
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/repos/gems/include/gems/report_rom_slave.h b/repos/gems/include/gems/report_rom_slave.h
index acdbec9c28..b364085345 100644
--- a/repos/gems/include/gems/report_rom_slave.h
+++ b/repos/gems/include/gems/report_rom_slave.h
@@ -45,7 +45,7 @@ class Report_rom_slave : public Genode::Noncopyable
 
 				static Name              _name()  { return "report_rom"; }
 				static Genode::Ram_quota _quota() { return { 1024*1024 }; }
-				static Genode::Cap_quota _caps()  { return { 25 }; }
+				static Genode::Cap_quota _caps()  { return { 75 }; }
 
 			public:
 
diff --git a/repos/gems/run/launcher.run b/repos/gems/run/launcher.run
index 628d4a6089..b80a6cf71a 100644
--- a/repos/gems/run/launcher.run
+++ b/repos/gems/run/launcher.run
@@ -30,14 +30,14 @@ install_config {
 		<any-service> <parent/> <any-child/> </any-service>
 	</default-route>
 
-	<default caps="50"/>
+	<default caps="100"/>
 
 	<start name="timer">
 		<resource name="RAM" quantum="1M"/>
 		<provides><service name="Timer"/></provides>
 	</start>
 
-	<start name="drivers" caps="300">
+	<start name="drivers" caps="1000">
 		<resource name="RAM" quantum="32M"/>
 		<binary name="init"/>
 		<route>
@@ -115,24 +115,22 @@ install_config {
 		<resource name="RAM" quantum="1M"/>
 		<provides> <service name="Report"/> <service name="ROM"/> </provides>
 		<config verbose="no">
-			<rom>
-				<policy label="decorator_config -> xray"      report="xray_trigger -> xray"/>
-				<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="status_bar -> focus"           report="nitpicker -> focus"/>
-				<policy label="launcher -> focus"             report="nitpicker -> focus"/>
-				<policy label="xray_trigger -> hover"         report="nitpicker -> hover"/>
-				<policy label="layouter -> decorator_margins" report="decorator -> decorator_margins"/>
-			</rom>
+			<policy label="decorator_config -> xray"      report="xray_trigger -> xray"/>
+			<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="status_bar -> focus"           report="nitpicker -> focus"/>
+			<policy label="launcher -> focus"             report="nitpicker -> focus"/>
+			<policy label="xray_trigger -> hover"         report="nitpicker -> hover"/>
+			<policy label="layouter -> decorator_margins" report="decorator -> decorator_margins"/>
 		</config>
 	</start>
 
-	<start name="wm">
+	<start name="wm" caps="200">
 		<resource name="RAM" quantum="6M"/>
 		<provides>
 			<service name="Nitpicker"/>
diff --git a/repos/gems/src/app/launcher/menu_view_slave.h b/repos/gems/src/app/launcher/menu_view_slave.h
index d8fbbb27e5..8580983cc8 100644
--- a/repos/gems/src/app/launcher/menu_view_slave.h
+++ b/repos/gems/src/app/launcher/menu_view_slave.h
@@ -75,7 +75,7 @@ class Launcher::Menu_view_slave
 
 				static Name              _name()  { return "menu_view"; }
 				static Genode::Ram_quota _quota() { return { 6*1024*1024 }; }
-				static Genode::Cap_quota _caps()  { return { 25 }; }
+				static Genode::Cap_quota _caps()  { return { 100 }; }
 
 			public:
 
diff --git a/repos/gems/src/app/launcher/nit_fader_slave.h b/repos/gems/src/app/launcher/nit_fader_slave.h
index 43600b6e78..51d5b94803 100644
--- a/repos/gems/src/app/launcher/nit_fader_slave.h
+++ b/repos/gems/src/app/launcher/nit_fader_slave.h
@@ -47,7 +47,7 @@ class Launcher::Nit_fader_slave
 
 				static Name              _name()  { return "nit_fader"; }
 				static Genode::Ram_quota _quota() { return { 2*1024*1024 }; }
-				static Genode::Cap_quota _caps()  { return { 25 }; }
+				static Genode::Cap_quota _caps()  { return { 50 }; }
 
 			public: