Use modern MMIO transport in tests.

src/queue.rs

@@ -277,7 +277,7 @@ mod tests {
 
     #[test]
     fn invalid_queue_size() {
-        let mut header = LegacyMmioTransport::make_fake_header(0, 0, 0, 4);
+        let mut header = MmioTransport::make_fake_header(0, 0, 0, 4);
         // Size not a power of 2.
         assert_eq!(
             VirtQueue::<FakeHal>::new(&mut header, 0, 3).unwrap_err(),
@@ -287,7 +287,7 @@ mod tests {
 
     #[test]
     fn queue_too_big() {
-        let mut header = LegacyMmioTransport::make_fake_header(0, 0, 0, 4);
+        let mut header = MmioTransport::make_fake_header(0, 0, 0, 4);
         assert_eq!(
             VirtQueue::<FakeHal>::new(&mut header, 0, 5).unwrap_err(),
             Error::InvalidParam
@@ -296,7 +296,7 @@ mod tests {
 
     #[test]
     fn queue_already_used() {
-        let mut header = LegacyMmioTransport::make_fake_header(0, 0, 0, 4);
+        let mut header = MmioTransport::make_fake_header(0, 0, 0, 4);
         VirtQueue::<FakeHal>::new(&mut header, 0, 4).unwrap();
         assert_eq!(
             VirtQueue::<FakeHal>::new(&mut header, 0, 4).unwrap_err(),
@@ -306,14 +306,14 @@ mod tests {
 
     #[test]
     fn add_empty() {
-        let mut header = LegacyMmioTransport::make_fake_header(0, 0, 0, 4);
+        let mut header = MmioTransport::make_fake_header(0, 0, 0, 4);
         let mut queue = VirtQueue::<FakeHal>::new(&mut header, 0, 4).unwrap();
         assert_eq!(queue.add(&[], &[]).unwrap_err(), Error::InvalidParam);
     }
 
     #[test]
     fn add_too_big() {
-        let mut header = LegacyMmioTransport::make_fake_header(0, 0, 0, 4);
+        let mut header = MmioTransport::make_fake_header(0, 0, 0, 4);
         let mut queue = VirtQueue::<FakeHal>::new(&mut header, 0, 4).unwrap();
         assert_eq!(queue.available_desc(), 4);
         assert_eq!(
@@ -326,7 +326,7 @@ mod tests {
 
     #[test]
     fn add_buffers() {
-        let mut header = LegacyMmioTransport::make_fake_header(0, 0, 0, 4);
+        let mut header = MmioTransport::make_fake_header(0, 0, 0, 4);
         let mut queue = VirtQueue::<FakeHal>::new(&mut header, 0, 4).unwrap();
         assert_eq!(queue.size(), 4);
         assert_eq!(queue.available_desc(), 4);

src/transport/mmio.rs

@@ -331,6 +331,7 @@ impl Transport for LegacyMmioTransport {
         );
         let align = PAGE_SIZE as u32;
         let pfn = (descriptors / PAGE_SIZE) as u32;
+        assert_eq!(pfn as usize * PAGE_SIZE, descriptors);
         self.0.queue_sel.write(queue);
         self.0.queue_num.write(size);
         self.0.legacy_queue_align.write(align);