Merge pull request #1204 from cagatay-y/too-virtq-too-refactor

fuse: provide header and payloads separately

src/drivers/fs/virtio_fs.rs

@@ -1,3 +1,4 @@
+use alloc::boxed::Box;
 use alloc::rc::Rc;
 use alloc::string::{String, ToString};
 use alloc::vec::Vec;
@@ -15,7 +16,7 @@ use crate::drivers::virtio::transport::mmio::{ComCfg, IsrStatus, NotifCfg};
 use crate::drivers::virtio::transport::pci::{ComCfg, IsrStatus, NotifCfg};
 use crate::drivers::virtio::virtqueue::error::VirtqError;
 use crate::drivers::virtio::virtqueue::split::SplitVq;
-use crate::drivers::virtio::virtqueue::{AsSliceU8, BuffSpec, Bytes, Virtq, VqIndex, VqSize};
+use crate::drivers::virtio::virtqueue::{AsSliceU8, BufferType, Virtq, VqIndex, VqSize};
 use crate::fs::fuse::{self, FuseInterface};
 
 /// A wrapper struct for the raw configuration structure.
@@ -143,21 +144,19 @@ impl VirtioFsDriver {
 impl FuseInterface for VirtioFsDriver {
 	fn send_command<O: fuse::ops::Op>(
 		&mut self,
-		cmd: &fuse::Cmd<O>,
+		cmd: (Box<fuse::CmdHeader<O>>, Option<Box<[u8]>>),
 		rsp: &mut fuse::Rsp<O>,
 	) -> Result<(), VirtqError> {
-		let send = (
-			cmd.as_slice_u8(),
-			BuffSpec::Single(Bytes::new(cmd.len()).ok_or(VirtqError::BufferToLarge)?),
-		);
-		let rsp_len = rsp.len();
-		let recv = (
-			rsp.as_slice_u8_mut(),
-			BuffSpec::Single(Bytes::new(rsp_len).ok_or(VirtqError::BufferToLarge)?),
-		);
+		let (cmd_header, cmd_payload_opt) = cmd;
+		let send: &[&[u8]] = if let Some(cmd_payload) = cmd_payload_opt.as_deref() {
+			&[cmd_header.as_slice_u8(), cmd_payload]
+		} else {
+			&[cmd_header.as_slice_u8()]
+		};
+		let recv = &[rsp.as_slice_u8_mut()];
 		let transfer_tkn = self.vqueues[1]
 			.clone()
-			.prep_transfer_from_raw(Some(send), Some(recv))
+			.prep_transfer_from_raw(send, recv, BufferType::Direct)
 			.unwrap();
 		transfer_tkn.dispatch_blocking()?;
 		Ok(())