summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-03-14 01:50:00 +0000
committerAlyssa Ross <hi@alyssa.is>2020-06-15 09:36:59 +0000
commitfa7932782af1144b41c1a049e16c44fb5bfbe1a2 (patch)
treebd03ad3da0e7051987783f72700c97eeefc4c937
parent3806c2d8455b1a54cd20c9c9e6bd46fe95bf6a43 (diff)
downloadcrosvm-fa7932782af1144b41c1a049e16c44fb5bfbe1a2.tar
crosvm-fa7932782af1144b41c1a049e16c44fb5bfbe1a2.tar.gz
crosvm-fa7932782af1144b41c1a049e16c44fb5bfbe1a2.tar.bz2
crosvm-fa7932782af1144b41c1a049e16c44fb5bfbe1a2.tar.lz
crosvm-fa7932782af1144b41c1a049e16c44fb5bfbe1a2.tar.xz
crosvm-fa7932782af1144b41c1a049e16c44fb5bfbe1a2.tar.zst
crosvm-fa7932782af1144b41c1a049e16c44fb5bfbe1a2.zip
devices: return Vec from queue_max_sizes
-rw-r--r--devices/src/virtio/balloon.rs4
-rw-r--r--devices/src/virtio/block.rs4
-rw-r--r--devices/src/virtio/console.rs4
-rw-r--r--devices/src/virtio/controller.rs4
-rw-r--r--devices/src/virtio/fs/mod.rs4
-rw-r--r--devices/src/virtio/gpu/mod.rs4
-rw-r--r--devices/src/virtio/input/mod.rs4
-rw-r--r--devices/src/virtio/net.rs4
-rw-r--r--devices/src/virtio/p9.rs4
-rw-r--r--devices/src/virtio/pmem.rs4
-rw-r--r--devices/src/virtio/rng.rs4
-rw-r--r--devices/src/virtio/tpm.rs4
-rw-r--r--devices/src/virtio/vhost/net.rs4
-rw-r--r--devices/src/virtio/vhost/vsock.rs4
-rw-r--r--devices/src/virtio/virtio_device.rs2
-rw-r--r--devices/src/virtio/virtio_pci_common_config.rs4
-rw-r--r--devices/src/virtio/wl.rs4
17 files changed, 33 insertions, 33 deletions
diff --git a/devices/src/virtio/balloon.rs b/devices/src/virtio/balloon.rs
index b549258..d115377 100644
--- a/devices/src/virtio/balloon.rs
+++ b/devices/src/virtio/balloon.rs
@@ -381,8 +381,8 @@ impl VirtioDevice for Balloon {
         TYPE_BALLOON
     }
 
-    fn queue_max_sizes(&self) -> &[u16] {
-        QUEUE_SIZES
+    fn queue_max_sizes(&self) -> Vec<u16> {
+        QUEUE_SIZES.to_vec()
     }
 
     fn read_config(&self, offset: u64, data: &mut [u8]) {
diff --git a/devices/src/virtio/block.rs b/devices/src/virtio/block.rs
index 5a8972a..57a243b 100644
--- a/devices/src/virtio/block.rs
+++ b/devices/src/virtio/block.rs
@@ -726,8 +726,8 @@ impl VirtioDevice for Block {
         TYPE_BLOCK
     }
 
-    fn queue_max_sizes(&self) -> &[u16] {
-        QUEUE_SIZES
+    fn queue_max_sizes(&self) -> Vec<u16> {
+        QUEUE_SIZES.to_vec()
     }
 
     fn read_config(&self, offset: u64, data: &mut [u8]) {
diff --git a/devices/src/virtio/console.rs b/devices/src/virtio/console.rs
index 50a5a76..e22f91d 100644
--- a/devices/src/virtio/console.rs
+++ b/devices/src/virtio/console.rs
@@ -347,8 +347,8 @@ impl VirtioDevice for Console {
         TYPE_CONSOLE
     }
 
-    fn queue_max_sizes(&self) -> &[u16] {
-        QUEUE_SIZES
+    fn queue_max_sizes(&self) -> Vec<u16> {
+        QUEUE_SIZES.to_vec()
     }
 
     fn read_config(&self, offset: u64, data: &mut [u8]) {
diff --git a/devices/src/virtio/controller.rs b/devices/src/virtio/controller.rs
index 514a96b..22e2850 100644
--- a/devices/src/virtio/controller.rs
+++ b/devices/src/virtio/controller.rs
@@ -331,8 +331,8 @@ impl VirtioDevice for Controller {
         }
     }
 
-    fn queue_max_sizes(&self) -> &[u16] {
-        QUEUE_SIZES
+    fn queue_max_sizes(&self) -> Vec<u16> {
+        QUEUE_SIZES.to_vec()
     }
 
     fn features(&self) -> u64 {
diff --git a/devices/src/virtio/fs/mod.rs b/devices/src/virtio/fs/mod.rs
index 9cac98b..63b2a04 100644
--- a/devices/src/virtio/fs/mod.rs
+++ b/devices/src/virtio/fs/mod.rs
@@ -199,8 +199,8 @@ impl VirtioDevice for Fs {
         TYPE_FS
     }
 
-    fn queue_max_sizes(&self) -> &[u16] {
-        &self.queue_sizes
+    fn queue_max_sizes(&self) -> Vec<u16> {
+        self.queue_sizes.to_vec()
     }
 
     fn features(&self) -> u64 {
diff --git a/devices/src/virtio/gpu/mod.rs b/devices/src/virtio/gpu/mod.rs
index 2873b74..3382b4e 100644
--- a/devices/src/virtio/gpu/mod.rs
+++ b/devices/src/virtio/gpu/mod.rs
@@ -1108,8 +1108,8 @@ impl VirtioDevice for Gpu {
         TYPE_GPU
     }
 
-    fn queue_max_sizes(&self) -> &[u16] {
-        QUEUE_SIZES
+    fn queue_max_sizes(&self) -> Vec<u16> {
+        QUEUE_SIZES.to_vec()
     }
 
     fn features(&self) -> u64 {
diff --git a/devices/src/virtio/input/mod.rs b/devices/src/virtio/input/mod.rs
index 452a003..7c9418c 100644
--- a/devices/src/virtio/input/mod.rs
+++ b/devices/src/virtio/input/mod.rs
@@ -570,8 +570,8 @@ where
         TYPE_INPUT
     }
 
-    fn queue_max_sizes(&self) -> &[u16] {
-        QUEUE_SIZES
+    fn queue_max_sizes(&self) -> Vec<u16> {
+        QUEUE_SIZES.to_vec()
     }
 
     fn read_config(&self, offset: u64, data: &mut [u8]) {
diff --git a/devices/src/virtio/net.rs b/devices/src/virtio/net.rs
index 8e9aa9e..c15bd3d 100644
--- a/devices/src/virtio/net.rs
+++ b/devices/src/virtio/net.rs
@@ -598,8 +598,8 @@ where
         TYPE_NET
     }
 
-    fn queue_max_sizes(&self) -> &[u16] {
-        &self.queue_sizes
+    fn queue_max_sizes(&self) -> Vec<u16> {
+        self.queue_sizes.clone().into_vec()
     }
 
     fn features(&self) -> u64 {
diff --git a/devices/src/virtio/p9.rs b/devices/src/virtio/p9.rs
index 7854c39..c139c53 100644
--- a/devices/src/virtio/p9.rs
+++ b/devices/src/virtio/p9.rs
@@ -193,8 +193,8 @@ impl VirtioDevice for P9 {
         TYPE_9P
     }
 
-    fn queue_max_sizes(&self) -> &[u16] {
-        QUEUE_SIZES
+    fn queue_max_sizes(&self) -> Vec<u16> {
+        QUEUE_SIZES.to_vec()
     }
 
     fn features(&self) -> u64 {
diff --git a/devices/src/virtio/pmem.rs b/devices/src/virtio/pmem.rs
index cbeecc3..72d47c4 100644
--- a/devices/src/virtio/pmem.rs
+++ b/devices/src/virtio/pmem.rs
@@ -283,8 +283,8 @@ impl VirtioDevice for Pmem {
         TYPE_PMEM
     }
 
-    fn queue_max_sizes(&self) -> &[u16] {
-        QUEUE_SIZES
+    fn queue_max_sizes(&self) -> Vec<u16> {
+        QUEUE_SIZES.to_vec()
     }
 
     fn features(&self) -> u64 {
diff --git a/devices/src/virtio/rng.rs b/devices/src/virtio/rng.rs
index 3897ee3..ec1eb64 100644
--- a/devices/src/virtio/rng.rs
+++ b/devices/src/virtio/rng.rs
@@ -164,8 +164,8 @@ impl VirtioDevice for Rng {
         TYPE_RNG
     }
 
-    fn queue_max_sizes(&self) -> &[u16] {
-        QUEUE_SIZES
+    fn queue_max_sizes(&self) -> Vec<u16> {
+        QUEUE_SIZES.to_vec()
     }
 
     fn activate(
diff --git a/devices/src/virtio/tpm.rs b/devices/src/virtio/tpm.rs
index 727c634..459e8ba 100644
--- a/devices/src/virtio/tpm.rs
+++ b/devices/src/virtio/tpm.rs
@@ -192,8 +192,8 @@ impl VirtioDevice for Tpm {
         TYPE_TPM
     }
 
-    fn queue_max_sizes(&self) -> &[u16] {
-        QUEUE_SIZES
+    fn queue_max_sizes(&self) -> Vec<u16> {
+        QUEUE_SIZES.to_vec()
     }
 
     fn activate(
diff --git a/devices/src/virtio/vhost/net.rs b/devices/src/virtio/vhost/net.rs
index 6800691..49fe14d 100644
--- a/devices/src/virtio/vhost/net.rs
+++ b/devices/src/virtio/vhost/net.rs
@@ -166,8 +166,8 @@ where
         TYPE_NET
     }
 
-    fn queue_max_sizes(&self) -> &[u16] {
-        QUEUE_SIZES
+    fn queue_max_sizes(&self) -> Vec<u16> {
+        QUEUE_SIZES.to_vec()
     }
 
     fn features(&self) -> u64 {
diff --git a/devices/src/virtio/vhost/vsock.rs b/devices/src/virtio/vhost/vsock.rs
index 390c857..70d2f2e 100644
--- a/devices/src/virtio/vhost/vsock.rs
+++ b/devices/src/virtio/vhost/vsock.rs
@@ -112,8 +112,8 @@ impl VirtioDevice for Vsock {
         TYPE_VSOCK
     }
 
-    fn queue_max_sizes(&self) -> &[u16] {
-        QUEUE_SIZES
+    fn queue_max_sizes(&self) -> Vec<u16> {
+        QUEUE_SIZES.to_vec()
     }
 
     fn features(&self) -> u64 {
diff --git a/devices/src/virtio/virtio_device.rs b/devices/src/virtio/virtio_device.rs
index 7c07651..58b6886 100644
--- a/devices/src/virtio/virtio_device.rs
+++ b/devices/src/virtio/virtio_device.rs
@@ -33,7 +33,7 @@ pub trait VirtioDevice: Send {
     fn device_type(&self) -> u32;
 
     /// The maximum size of each queue that this device supports.
-    fn queue_max_sizes(&self) -> &[u16];
+    fn queue_max_sizes(&self) -> Vec<u16>;
 
     /// The set of feature bits that this device supports.
     fn features(&self) -> u64 {
diff --git a/devices/src/virtio/virtio_pci_common_config.rs b/devices/src/virtio/virtio_pci_common_config.rs
index 97d7001..14aefcb 100644
--- a/devices/src/virtio/virtio_pci_common_config.rs
+++ b/devices/src/virtio/virtio_pci_common_config.rs
@@ -256,8 +256,8 @@ mod tests {
         fn device_type(&self) -> u32 {
             return self.0;
         }
-        fn queue_max_sizes(&self) -> &[u16] {
-            QUEUE_SIZES
+        fn queue_max_sizes(&self) -> Vec<u16> {
+            QUEUE_SIZES.to_vec()
         }
         fn activate(
             &mut self,
diff --git a/devices/src/virtio/wl.rs b/devices/src/virtio/wl.rs
index bc65039..2c94d3c 100644
--- a/devices/src/virtio/wl.rs
+++ b/devices/src/virtio/wl.rs
@@ -1586,8 +1586,8 @@ impl VirtioDevice for Wl {
         TYPE_WL
     }
 
-    fn queue_max_sizes(&self) -> &[u16] {
-        QUEUE_SIZES
+    fn queue_max_sizes(&self) -> Vec<u16> {
+        QUEUE_SIZES.to_vec()
     }
 
     fn features(&self) -> u64 {