Don't use ioctl

Kazuyoshi Kato · Kazuyoshi Kato · commit 14ae5459c27c · 2019-11-06T09:23:18.000-08:00
Signed-off-by: Kazuyoshi Kato &lt;katokazu@amazon.com&gt;
diff --git a/sys_util/src/block.rs b/sys_util/src/block.rs
@@ -1,23 +1,13 @@
 // Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-use ioctl::ioctl_with_mut_ref;
 use std::fs::File;
-use std::io::Error;
+use std::io::{Error, Seek, SeekFrom};
 use std::os::raw;
 
-const FS: raw::c_uint = 0x12;
-ioctl_ior_nr!(BLKGETSIZE64, FS, 114, ::std::os::raw::c_ulong);
-
 pub fn get_blk_dev_size(path: &std::path::Path) -> std::result::Result<u64, std::io::Error> {
-    let mut size: u64 = 0;
-
-    let file = File::open(path)?;
-    let ret = unsafe { ioctl_with_mut_ref(&file, BLKGETSIZE64(), &mut size) };
-
-    if ret < 0 {
-        return Err(Error::last_os_error());
-    }
+    let mut file = File::open(path)?;
+    let size = file.seek(SeekFrom::End(0))?;
     Ok(size)
 }
 
diff --git a/tests/integration_tests/functional/test_drives.py b/tests/integration_tests/functional/test_drives.py
@@ -61,8 +61,6 @@ def test_rescan_file(test_microvm_with_ssh, network_config):
 def test_rescan_dev(test_microvm_with_ssh, network_config):
     """Verify that rescan works with a device-backed virtio device."""
     test_microvm = test_microvm_with_ssh
-    # To access a block device, seccomp_level = 2 is too restrictive
-    test_microvm.jailer.seccomp_level = 1
     test_microvm.spawn()
 
     # Set up the microVM with 1 vCPUs, 256 MiB of RAM, 0 network ifaces and
