summary refs log tree commit diff
path: root/src/linux.rs
diff options
context:
space:
mode:
authorDaniel Verkamp <dverkamp@chromium.org>2018-08-09 16:26:59 -0700
committerchrome-bot <chrome-bot@chromium.org>2018-08-13 14:25:11 -0700
commitde9ae03d522d9f134d76cc60a7c49b7c38714423 (patch)
tree983245e58edda3f93816a20b7d21d96ff12abec7 /src/linux.rs
parent5f871eb8f4b152a5f97af0482edefe3a1708f033 (diff)
downloadcrosvm-de9ae03d522d9f134d76cc60a7c49b7c38714423.tar
crosvm-de9ae03d522d9f134d76cc60a7c49b7c38714423.tar.gz
crosvm-de9ae03d522d9f134d76cc60a7c49b7c38714423.tar.bz2
crosvm-de9ae03d522d9f134d76cc60a7c49b7c38714423.tar.lz
crosvm-de9ae03d522d9f134d76cc60a7c49b7c38714423.tar.xz
crosvm-de9ae03d522d9f134d76cc60a7c49b7c38714423.tar.zst
crosvm-de9ae03d522d9f134d76cc60a7c49b7c38714423.zip
main: replace block writable option with read_only
This is more consistent with the way it will be used in the virtio-blk
device model.

BUG=chromium:872973
TEST=cargo test

Change-Id: I28c5d007a7f3864ef6e18e9b343d263123302484
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1170304
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Diffstat (limited to 'src/linux.rs')
-rw-r--r--src/linux.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/linux.rs b/src/linux.rs
index 98d0c5e..e3784f2 100644
--- a/src/linux.rs
+++ b/src/linux.rs
@@ -405,15 +405,15 @@ fn setup_mmio_bus(cfg: &Config,
         } else {
             OpenOptions::new()
                 .read(true)
-                .write(disk.writable)
+                .write(!disk.read_only)
                 .open(&disk.path)
                 .map_err(|e| Error::Disk(e))?
         };
         // Lock the disk image to prevent other crosvm instances from using it.
-        let lock_op = if disk.writable {
-            FlockOperation::LockExclusive
-        } else {
+        let lock_op = if disk.read_only {
             FlockOperation::LockShared
+        } else {
+            FlockOperation::LockExclusive
         };
         flock(&raw_image, lock_op, true).map_err(Error::DiskImageLock)?;