From c7c60d2c07f573e0431d8b81cb169cc751b4ea99 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 14 Mar 2020 00:53:46 +0000
Subject: features

---
 devices/src/virtio/controller.rs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'devices/src/virtio/controller.rs')

diff --git a/devices/src/virtio/controller.rs b/devices/src/virtio/controller.rs
index c5d2ef4..857bbe8 100644
--- a/devices/src/virtio/controller.rs
+++ b/devices/src/virtio/controller.rs
@@ -83,6 +83,8 @@ pub enum MsgOnSocketRequest {
         memory_params: MemoryParams,
     },
 
+    Features,
+
     AckFeatures(u64),
 
     Activate {
@@ -125,6 +127,7 @@ impl From<BincodeRequest> for Request {
 
 #[derive(Debug, MsgOnSocket)]
 pub enum MsgOnSocketResponse {
+    Features(u64),
     Reset(bool),
     Kill,
 }
@@ -321,7 +324,16 @@ impl VirtioDevice for Controller {
     }
 
     fn features(&self) -> u64 {
-        1 << VIRTIO_WL_F_TRANS_FLAGS | 1 << VIRTIO_F_VERSION_1
+        if let Err(e) = self.socket.send(MsgOnSocketRequest::Features) {
+            panic!("failed to send Features: {}", e);
+        }
+
+        match self.socket.recv_msg_on_socket() {
+            Ok(MsgOnSocketResponse::Features(features)) => features,
+            response => {
+                panic!("bad response to Reset: {:?}", response);
+            }
+        }
     }
 
     fn ack_features(&mut self, value: u64) {
-- 
cgit 1.4.1