diff options
| author | Erik Arvstedt <erik.arvstedt@gmail.com> | 2020-05-27 22:07:43 +0200 |
|---|---|---|
| committer | Erik Arvstedt <erik.arvstedt@gmail.com> | 2020-06-01 21:55:33 +0200 |
| commit | d85dc4f6902819be8277d1d65414e51bfbef0ac6 (patch) | |
| tree | 1f245e3e53dea0710f2d8b48d2b5289a7c9de26b /nixos | |
| parent | dfa743e49e45bcb6d334e50f24275b04a004a6f6 (diff) | |
| download | nixpkgs-d85dc4f6902819be8277d1d65414e51bfbef0ac6.tar nixpkgs-d85dc4f6902819be8277d1d65414e51bfbef0ac6.tar.gz nixpkgs-d85dc4f6902819be8277d1d65414e51bfbef0ac6.tar.bz2 nixpkgs-d85dc4f6902819be8277d1d65414e51bfbef0ac6.tar.lz nixpkgs-d85dc4f6902819be8277d1d65414e51bfbef0ac6.tar.xz nixpkgs-d85dc4f6902819be8277d1d65414e51bfbef0ac6.tar.zst nixpkgs-d85dc4f6902819be8277d1d65414e51bfbef0ac6.zip | |
qemu-vm: fix inconsistent caching of xchg dirs
xchg is advertised as a bidirectional exchange dir, but file content transfer from host to VM fails due to caching: If a file is read in the VM and then modified on the host, subsequent re-reads in the VM can yield old, cached data. This is caused by the use of 9p's cache=loose mode that is explicitly meant for read-only mounts. 9p doesn't provide any suitable cache modes, so fix this by disabling caching. Also, remove a now unnecessary sync in the test driver.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/lib/test-driver/test-driver.py | 1 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/qemu-vm.nix | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index ff6d763989f..b9616582372 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -615,7 +615,6 @@ class Machine: # Copy the file to the shared directory inside VM self.succeed(make_command(["mkdir", "-p", vm_shared_temp])) self.succeed(make_command(["cp", "-r", vm_src, vm_intermediate])) - self.succeed("sync") abs_target = out_dir / target_dir / vm_src.name abs_target.parent.mkdir(exist_ok=True, parents=True) # Copy the file from the shared directory outside VM diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 31d332e9f07..3ecb8aa11ca 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -567,7 +567,7 @@ in "/tmp/xchg" = { device = "xchg"; fsType = "9p"; - options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ]; + options = [ "trans=virtio" "version=9p2000.L" ]; neededForBoot = true; }; "/tmp/shared" = |