read_config

2 files changed, 28 insertions, 1 deletions

diff --git a/devices/src/virtio/controller.rs b/devices/src/virtio/controller.rs
index 374d11c..4a770cc 100644
--- a/devices/src/virtio/controller.rs
+++ b/devices/src/virtio/controller.rs
@@ -70,6 +70,7 @@ pub enum MsgOnSocketRequest {
 
 #[derive(Debug, Serialize, Deserialize)]
 pub enum BincodeRequest {
+    ReadConfig { offset: u64, len: usize },
     WriteConfig { offset: u64, data: Vec<u8> },
 }
 
@@ -93,7 +94,9 @@ pub enum MsgOnSocketResponse {
 }
 
 #[derive(Debug, Deserialize, Serialize)]
-pub struct BincodeResponse;
+pub enum BincodeResponse {
+    ReadConfig(Vec<u8>),
+}
 
 pub type Response = poly_msg_socket::Value<MsgOnSocketResponse, BincodeResponse>;
 
@@ -291,6 +294,22 @@ impl VirtioDevice for Controller {
         }
     }
 
+    fn read_config(&self, offset: u64, data: &mut [u8]) {
+        let len = data.len();
+
+        if let Err(e) = self.socket.send(BincodeRequest::ReadConfig { offset, len }) {
+            error!("failed to send ReadConfig: {}", e);
+            return;
+        }
+
+        match self.socket.recv_bincode() {
+            Ok(BincodeResponse::ReadConfig(response)) => {
+                data.copy_from_slice(&response[..len]); // TODO: test no panic
+            }
+            response => error!("bad response to ReadConfig: {:?}", response),
+        }
+    }
+
     fn write_config(&mut self, offset: u64, data: &[u8]) {
         if let Err(e) = self.socket.send(BincodeRequest::WriteConfig {
             offset,
diff --git a/src/wl.rs b/src/wl.rs
index 08d69f8..0a8bd0a 100644
--- a/src/wl.rs
+++ b/src/wl.rs
@@ -68,6 +68,14 @@ fn main() {
 
             Ok(MsgOnSocket(MsgOnSocketRequest::AckFeatures(value))) => wl.ack_features(value),
 
+            Ok(Bincode(BincodeRequest::ReadConfig { offset, len })) => {
+                let mut data = vec![0; len];
+                wl.read_config(offset, &mut data);
+                if let Err(e) = msg_socket.send(BincodeResponse::ReadConfig(data)) {
+                    panic!("replying to ReadConfig failed: {}", e);
+                }
+            }
+
             Ok(Bincode(BincodeRequest::WriteConfig { offset, ref data })) => {
                 wl.write_config(offset, data)
             }