queue: split out struct QueueState

Split out `struct QueueState` from `struct Queue`, which contains
all the fields related to virtio queue state. It will be reused to
support concurent operations for multi-threading context later.

Signed-off-by: Liu Jiang <gerry@linux.alibaba.com>

Author: jiangliu

crates/virtio-device/src/lib.rs

@@ -284,7 +284,7 @@ mod tests {
             assert_eq!(d.cfg.device_features & (1 << VIRTIO_F_RING_EVENT_IDX), 0);
 
             for q in d.cfg.queues.iter() {
-                assert_eq!(q.event_idx_enabled, false);
+                assert_eq!(q.state.event_idx_enabled, false);
             }
 
             // Revert status.
@@ -302,7 +302,7 @@ mod tests {
             assert_eq!(d.cfg.device_status, status);
 
             for q in d.cfg.queues.iter() {
-                assert_eq!(q.event_idx_enabled, true);
+                assert_eq!(q.state.event_idx_enabled, true);
             }
         }
 

crates/virtio-device/src/mmio.rs

@@ -258,16 +258,16 @@ mod tests {
         // The max size for the queue in `Dummy` is 256.
         assert_eq!(mmio_read(&d, 0x34), 256);
 
-        assert_eq!(d.cfg.queues[0].size, 256);
+        assert_eq!(d.cfg.queues[0].state.size, 256);
         d.write(0x38, &32u32.to_le_bytes());
         // Updating the queue field has no effect due to invalid device status.
-        assert_eq!(d.cfg.queues[0].size, 256);
+        assert_eq!(d.cfg.queues[0].state.size, 256);
 
         d.cfg.device_status |= status::FEATURES_OK;
 
         // Let's try the update again.
         d.write(0x38, &32u32.to_le_bytes());
-        assert_eq!(d.cfg.queues[0].size, 32);
+        assert_eq!(d.cfg.queues[0].state.size, 32);
 
         // The queue in `Dummy` is not ready yet.
         assert_eq!(mmio_read(&d, 0x44), 0);
@@ -281,23 +281,23 @@ mod tests {
         d.write(0x50, &2u32.to_le_bytes());
         assert_eq!(d.last_queue_notify, 2);
 
-        assert_eq!(d.cfg.queues[0].desc_table.0, 0);
+        assert_eq!(d.cfg.queues[0].state.desc_table.0, 0);
         d.write(0x80, &1u32.to_le_bytes());
-        assert_eq!(d.cfg.queues[0].desc_table.0, 1);
+        assert_eq!(d.cfg.queues[0].state.desc_table.0, 1);
         d.write(0x84, &2u32.to_le_bytes());
-        assert_eq!(d.cfg.queues[0].desc_table.0, (2 << 32) + 1);
+        assert_eq!(d.cfg.queues[0].state.desc_table.0, (2 << 32) + 1);
 
-        assert_eq!(d.cfg.queues[0].avail_ring.0, 0);
+        assert_eq!(d.cfg.queues[0].state.avail_ring.0, 0);
         d.write(0x90, &1u32.to_le_bytes());
-        assert_eq!(d.cfg.queues[0].avail_ring.0, 1);
+        assert_eq!(d.cfg.queues[0].state.avail_ring.0, 1);
         d.write(0x94, &2u32.to_le_bytes());
-        assert_eq!(d.cfg.queues[0].avail_ring.0, (2 << 32) + 1);
+        assert_eq!(d.cfg.queues[0].state.avail_ring.0, (2 << 32) + 1);
 
-        assert_eq!(d.cfg.queues[0].used_ring.0, 0);
+        assert_eq!(d.cfg.queues[0].state.used_ring.0, 0);
         d.write(0xa0, &1u32.to_le_bytes());
-        assert_eq!(d.cfg.queues[0].used_ring.0, 1);
+        assert_eq!(d.cfg.queues[0].state.used_ring.0, 1);
         d.write(0xa4, &2u32.to_le_bytes());
-        assert_eq!(d.cfg.queues[0].used_ring.0, (2 << 32) + 1);
+        assert_eq!(d.cfg.queues[0].state.used_ring.0, (2 << 32) + 1);
 
         // Let's select a non-existent queue.
         d.write(0x30, &1u32.to_le_bytes());