Merge VM and CDISK config into libvmconfig
so that virtualizationservice and vm use it.
Bug: 190503456
Test: MicrodroidHostTestCases
Change-Id: I63eaf0ac1c6d0e1e17d19f4863c5f4f14525aa32
diff --git a/vm/src/run.rs b/vm/src/run.rs
index ec95646..fbf849b 100644
--- a/vm/src/run.rs
+++ b/vm/src/run.rs
@@ -14,7 +14,6 @@
//! Command to run a VM.
-use crate::config::VmConfig;
use crate::sync::AtomicFlag;
use android_system_virtualizationservice::aidl::android::system::virtualizationservice::IVirtualizationService::IVirtualizationService;
use android_system_virtualizationservice::aidl::android::system::virtualizationservice::IVirtualMachine::IVirtualMachine;
@@ -30,6 +29,7 @@
use std::io;
use std::os::unix::io::{AsRawFd, FromRawFd};
use std::path::Path;
+use vmconfig::VmConfig;
/// Run a VM from the given configuration file.
pub fn command_run(