summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-06-07 09:39:08 +0000
committerAlyssa Ross <hi@alyssa.is>2020-06-15 09:37:42 +0000
commita5d8b143a440ab8def7f1bcb8438279df30d4d21 (patch)
treee447963bff9ac6dd17dc5291ea4d63b82dac572d
parentbc0ec272425e645cae664fd1d08f2f2bee4ea46c (diff)
downloadcrosvm-a5d8b143a440ab8def7f1bcb8438279df30d4d21.tar
crosvm-a5d8b143a440ab8def7f1bcb8438279df30d4d21.tar.gz
crosvm-a5d8b143a440ab8def7f1bcb8438279df30d4d21.tar.bz2
crosvm-a5d8b143a440ab8def7f1bcb8438279df30d4d21.tar.lz
crosvm-a5d8b143a440ab8def7f1bcb8438279df30d4d21.tar.xz
crosvm-a5d8b143a440ab8def7f1bcb8438279df30d4d21.tar.zst
crosvm-a5d8b143a440ab8def7f1bcb8438279df30d4d21.zip
msg_socket: make usize fixed size
Seems like an accidental ommission.  All other numeric types are
fixed-size, and usize is serialized as a u64 anyway.
-rw-r--r--msg_socket/src/msg_on_socket.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/msg_socket/src/msg_on_socket.rs b/msg_socket/src/msg_on_socket.rs
index 3dc59c0..ddf8622 100644
--- a/msg_socket/src/msg_on_socket.rs
+++ b/msg_socket/src/msg_on_socket.rs
@@ -347,8 +347,8 @@ rawfd_impl!(SharedMemory);
 
 // usize could be different sizes on different targets. We always use u64.
 impl MsgOnSocket for usize {
-    fn msg_size(&self) -> usize {
-        size_of::<u64>()
+    fn fixed_size() -> Option<usize> {
+        Some(size_of::<u64>())
     }
     unsafe fn read_from_buffer(buffer: &[u8], _fds: &[RawFd]) -> MsgResult<(Self, usize)> {
         if buffer.len() < size_of::<u64>() {