github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-16 15:07:46 +00:00
Code Issues Projects Releases Wiki Activity

runtime: fixing merge conflicts

Browse Source 
Signed-off-by: Georgina Kinge <georgina.kinge@ibm.com>
This commit is contained in:
Georgina Kinge 2023-01-09 14:22:32 +00:00
parent e8c63ccc4d
commit 73532eb400
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime-rs/crates/resource/src/share_fs/virtio_fs_share_mount.rs
View File

@ -196,7 +196,7 @@ impl ShareFsMount for VirtiofsShareMount {
async fn umount_volume(&self, file_name: &str) -> Result<()> { async fn umount_volume(&self, file_name: &str) -> Result<()> {
let host_dest = do_get_host_path(file_name, &self.id, "", true, false); let host_dest = do_get_host_path(file_name, &self.id, "", true, false);
umount_timeout(host_dest, 0).context("umount volume")?; umount_timeout(&host_dest, 0).context("umount volume")?;
// Umount event will be propagated to ro directory // Umount event will be propagated to ro directory
// Remove the directory of mointpoint // Remove the directory of mointpoint

2
src/runtime/virtcontainers/hypervisor.go
View File

@ -51,7 +51,7 @@ const (
// RemoteHypervisor is the Remote hypervisor. // RemoteHypervisor is the Remote hypervisor.
RemoteHypervisor HypervisorType = "remote" RemoteHypervisor HypervisorType = "remote"
// VirtFrameworkHypervisor is the Darwin Virtualization.framework hypervisor // VirtFrameworkHypervisor is the Darwin Virtualization.framework hypervisor
VirtframeworkHypervisor HypervisorType = "virtframework" VirtframeworkHypervisor HypervisorType = "virtframework"