run: use ram attribute in start nodes

Issue genodelabs/genode#5448
genodelabs · Feb 11, 2025 · f9b283d · f9b283d
1 parent 614d28d
commit f9b283d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 25 deletions.
diff --git a/recipes/raw/drivers_interactive-virt_qemu_riscv/drivers.config b/recipes/raw/drivers_interactive-virt_qemu_riscv/drivers.config
@@ -13,14 +13,12 @@
 
 	<default caps="100"/>
 
-	<start name="virtdev_rom">
-		<resource name="RAM" quantum="640K"/>
+	<start name="virtdev_rom" ram="640K">
 		<provides> <service name="ROM"/> </provides>
 		<route> <any-service> <parent/> </any-service> </route>
 	</start>
 
-	<start name="platform" managing_system="yes">
-		<resource name="RAM" quantum="2M"/>
+	<start name="platform" ram="2M" managing_system="yes">
 		<provides> <service name="Platform"/> </provides>
 		<route>
 			<service name="ROM" label="devices">
@@ -41,8 +39,7 @@
 		</config>
 	</start>
 
-	<start name="event_filter" caps="90">
-		<resource name="RAM" quantum="1280K"/>
+	<start name="event_filter" caps="90" ram="1280K">
 		<provides> <service name="Event"/> </provides>
 		<route>
 			<service name="ROM" label="config">
@@ -57,9 +54,8 @@
 		</route>
 	</start>
 
-	<start name="virtio_keyboard" caps="70">
+	<start name="virtio_keyboard" caps="70" ram="1M">
 		<binary name="virtio_mmio_input"/>
-		<resource name="RAM" quantum="1M"/>
 		<config match_product="keyboard"/>
 		<route>
 			<service name="Platform"> <child name="platform"/> </service>
@@ -71,9 +67,8 @@
 		</route>
 	</start>
 
-	<start name="virtio_mouse" caps="80">
+	<start name="virtio_mouse" caps="80" ram="1M">
 		<binary name="virtio_mmio_input"/>
-		<resource name="RAM" quantum="1M"/>
 		<config match_product="mouse"/>
 		<route>
 			<service name="Platform"> <child name="platform"/> </service>
@@ -85,9 +80,8 @@
 		</route>
 	</start>
 
-	<start name="virtio_fb" caps="120">
+	<start name="virtio_fb" caps="120" ram="50M">
 		<binary name="virtio_mmio_fb"/>
-		<resource name="RAM" quantum="50M"/>
 		<route>
 			<service name="Platform"> <child name="platform"/> </service>
 			<any-service> <parent/> </any-service>

diff --git a/recipes/raw/drivers_nic-migv/drivers.config b/recipes/raw/drivers_nic-migv/drivers.config
@@ -13,8 +13,7 @@
 
 	<default caps="100"/>
 
-	<start name="platform" managing_system="yes">
-		<resource name="RAM" quantum="4M"/>
+	<start name="platform" ram="4M" managing_system="yes">
 		<provides> <service name="Platform"/> </provides>
 		<config>
 			<device name="ethernet" type="opencores,ethoc">
@@ -30,9 +29,8 @@
 		<route> <any-service> <parent/> </any-service> </route>
 	</start>
 
-	<start name="nic">
+	<start name="nic" ram="6M">
 		<binary name="opencores_nic"/>
-		<resource name="RAM" quantum="6M"/>
 		<config phy_port="0" mac="02:00:00:00:00:03"/>
 		<route>
 			<service name="Platform"> <child name="platform"/> </service>

diff --git a/recipes/raw/drivers_nic-virt_qemu_riscv/drivers.config b/recipes/raw/drivers_nic-virt_qemu_riscv/drivers.config
@@ -13,14 +13,12 @@
 
 	<default caps="100"/>
 
-	<start name="virtdev_rom">
-		<resource name="RAM" quantum="640K"/>
+	<start name="virtdev_rom" ram="640K">
 		<provides> <service name="ROM"/> </provides>
 		<route> <any-service> <parent/> </any-service> </route>
 	</start>
 
-	<start name="platform" managing_system="yes">
-		<resource name="RAM" quantum="2M"/>
+	<start name="platform" ram="2M" managing_system="yes">
 		<provides> <service name="Platform"/> </provides>
 		<route>
 			<service name="ROM" label="devices">
@@ -35,8 +33,7 @@
 		</config>
 	</start>
 
-	<start name="virtio_mmio_nic">
-		<resource name="RAM" quantum="5M"/>
+	<start name="virtio_mmio_nic" ram="5M">
 		<route>
 			<service name="Platform">
 				<child name="platform"/>

diff --git a/run/plic-migv.run b/run/plic-migv.run
@@ -17,9 +17,7 @@ install_config {
 			<any-service> <parent/> <any-child/> </any-service>
 		</default-route>
 		<default caps="100"/>
-		<start name="test-plic-migv">
-			<resource name="RAM" quantum="10M"/>
-		</start>
+		<start name="test-plic-migv" ram="10M"/>
 	</config>
 }