virtualizationservice: Move globals closer to users
Consts FIRST_GUEST_CID and SYSPROP_LAST_CID are defined in main.rs but
actually only used in aidl.rs, so move them there. Same for the Cid
type, even though it is also used in crosvm.rs. It will make it easier
to migrate to virtmgr soon.
Test: builds
Change-Id: Idefb0d1bd57efe3464b40dbf7a86344a5193a948
diff --git a/virtualizationservice/src/crosvm.rs b/virtualizationservice/src/crosvm.rs
index 749970c..1ee33f3 100644
--- a/virtualizationservice/src/crosvm.rs
+++ b/virtualizationservice/src/crosvm.rs
@@ -14,9 +14,8 @@
//! Functions for running instances of `crosvm`.
-use crate::aidl::VirtualMachineCallbacks;
+use crate::aidl::{Cid, VirtualMachineCallbacks};
use crate::atom::write_vm_exited_stats;
-use crate::Cid;
use anyhow::{anyhow, bail, Context, Error};
use command_fds::CommandFdExt;
use lazy_static::lazy_static;