From 4f1e9fd2569def559b19238e65229960d6713518 Mon Sep 17 00:00:00 2001
From: Piotr Tworek <tworaz@tworaz.net>
Date: Mon, 4 Oct 2021 21:17:30 +0200
Subject: [PATCH] os: Use VirtIO input drivers for virt_qemu.

This makes Genode's interactive test scenarios run on virt_qemu board
actually interactive.

Issue #4282
---
 .../drivers_interactive-virt_qemu/archives    |  2 +
 .../drivers.config                            | 51 +++++++++++++++++--
 .../event_filter.config                       | 20 +++++---
 .../src/drivers/input/virtio/mmio_device.cc   |  3 +-
 4 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/repos/os/recipes/pkg/drivers_interactive-virt_qemu/archives b/repos/os/recipes/pkg/drivers_interactive-virt_qemu/archives
index 455264e522..adda6741bc 100644
--- a/repos/os/recipes/pkg/drivers_interactive-virt_qemu/archives
+++ b/repos/os/recipes/pkg/drivers_interactive-virt_qemu/archives
@@ -1,4 +1,6 @@
 _/src/virt_qemu_drivers
+_/src/virtio_input_drv
 _/src/platform_drv
 _/src/event_filter
+_/src/virtdev_rom
 _/raw/drivers_interactive-virt_qemu
diff --git a/repos/os/recipes/raw/drivers_interactive-virt_qemu/drivers.config b/repos/os/recipes/raw/drivers_interactive-virt_qemu/drivers.config
index 8464a17e5b..3bb745891e 100644
--- a/repos/os/recipes/raw/drivers_interactive-virt_qemu/drivers.config
+++ b/repos/os/recipes/raw/drivers_interactive-virt_qemu/drivers.config
@@ -13,9 +13,9 @@
 
 	<default caps="100"/>
 
-	<start name="platform_drv">
-		<resource name="RAM" quantum="2M"/>
-		<provides> <service name="Platform"/> </provides>
+	<start name="virtdev_rom">
+		<resource name="RAM" quantum="640K"/>
+		<provides> <service name="ROM"/> </provides>
 		<route> <any-service> <parent/> </any-service> </route>
 		<config>
 
@@ -28,9 +28,26 @@
 			<policy label="fb_drv -> " info="yes">
 				<device name="fw-cfg"/>
 			</policy>
+			<policy label_prefix="virtio_keyboard_drv" info="yes">
+				<device name="input0"/>
+			</policy>
+			<policy label_prefix="virtio_mouse_drv" info="yes">
+				<device name="input1"/>
+			</policy>
 		</config>
 	</start>
 
+	<start name="platform_drv">
+		<resource name="RAM" quantum="2M"/>
+		<provides> <service name="Platform"/> </provides>
+		<route>
+			<service name="ROM" label="config">
+			        <child name="virtdev_rom"/>
+			</service>
+			<any-service> <parent/> </any-service>
+		</route>
+	</start>
+
 	<start name="fb_drv">
 		<binary name="ram_fb_drv"/>
 		<resource name="RAM" quantum="8M"/>
@@ -63,4 +80,32 @@
 		</route>
 	</start>
 
+	<start name="virtio_keyboard_drv" caps="70">
+		<binary name="virtio_mmio_input_drv"/>
+		<resource name="RAM" quantum="1M"/>
+		<config match_product="keyboard"/>
+		<route>
+			<service name="Platform"> <child name="platform_drv"/> </service>
+			<service name="Event">    <child name="event_filter" label="keyboard"/> </service>
+			<service name="CPU">    <parent/> </service>
+			<service name="PD">     <parent/> </service>
+			<service name="LOG">    <parent/> </service>
+			<service name="ROM">    <parent/> </service>
+		</route>
+	</start>
+
+	<start name="virtio_mouse_drv" caps="80">
+		<binary name="virtio_mmio_input_drv"/>
+		<resource name="RAM" quantum="1M"/>
+		<config match_product="mouse"/>
+		<route>
+			<service name="Platform"> <child name="platform_drv"/> </service>
+			<service name="Event">    <child name="event_filter" label="mouse"/> </service>
+			<service name="CPU">    <parent/> </service>
+			<service name="PD">     <parent/> </service>
+			<service name="LOG">    <parent/> </service>
+			<service name="ROM">    <parent/> </service>
+		</route>
+	</start>
+
 </config>
diff --git a/repos/os/recipes/raw/drivers_interactive-virt_qemu/event_filter.config b/repos/os/recipes/raw/drivers_interactive-virt_qemu/event_filter.config
index 55cdbc6167..6de8ea6387 100644
--- a/repos/os/recipes/raw/drivers_interactive-virt_qemu/event_filter.config
+++ b/repos/os/recipes/raw/drivers_interactive-virt_qemu/event_filter.config
@@ -1,13 +1,16 @@
 <config>
 	<output>
 		<chargen>
-			<accelerate max="50" sensitivity_percent="1000" curve="127">
-				<button-scroll>
-					<input name="ps2"/>
-					<vertical   button="BTN_MIDDLE" speed_percent="-10"/>
-					<horizontal button="BTN_MIDDLE" speed_percent="-10"/>
-				</button-scroll>
-			</accelerate>
+			<merge>
+				<accelerate max="50" sensitivity_percent="1000" curve="127">
+					<button-scroll>
+						<input name="mouse"/>
+						<vertical   button="BTN_MIDDLE" speed_percent="-10"/>
+						<horizontal button="BTN_MIDDLE" speed_percent="-10"/>
+					</button-scroll>
+				</accelerate>
+				<input name="keyboard"/>
+			</merge>
 			<mod1>
 				<key name="KEY_LEFTSHIFT"/> <key name="KEY_RIGHTSHIFT"/>
 			</mod1>
@@ -22,5 +25,6 @@
 			<include rom="special.chargen"/>
 		</chargen>
 	</output>
-	<policy label="ps2" input="ps2"/>
+	<policy label="keyboard" input="keyboard"/>
+	<policy label="mouse" input="mouse"/>
 </config>
diff --git a/repos/os/src/drivers/input/virtio/mmio_device.cc b/repos/os/src/drivers/input/virtio/mmio_device.cc
index 641d98aef8..0b64e83022 100644
--- a/repos/os/src/drivers/input/virtio/mmio_device.cc
+++ b/repos/os/src/drivers/input/virtio/mmio_device.cc
@@ -27,7 +27,8 @@ struct Virtio_mmio_input::Main
 {
 	Env                    &env;
 	Platform::Connection    platform        { env };
-	Platform::Device        platform_device { platform, { "input" } };
+	Platform::Device        platform_device { platform,
+	                                          Platform::Device::Type { "input" } };
 	Virtio::Device          virtio_device   { platform_device };
 	Attached_rom_dataspace  config          { env, "config" };
 	Virtio_input::Driver    driver          { env, virtio_device, config.xml() };