pa-fazil
/
android_packages_modules_Virtualization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Log to logcat."

This commit is contained in:
Andrew Walbran 2021-03-16 11:09:27 +00:00 committed by Gerrit Code Review
parent af5f756ee9 bf1fb04f23
commit 22c92a9699
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
virtmanager/Android.bp
View File

@ -9,7 +9,7 @@ rust_binary {
edition: "2018", edition: "2018",
rustlibs: [ rustlibs: [
"android.system.virtmanager-rust", "android.system.virtmanager-rust",
"libenv_logger", "libandroid_logger",
"liblog_rust", "liblog_rust",
"libserde_json", "libserde_json",
"libserde", "libserde",

9
virtmanager/src/main.rs
View File

@ -21,17 +21,22 @@ mod crosvm;
use crate::aidl::{VirtManager, BINDER_SERVICE_IDENTIFIER}; use crate::aidl::{VirtManager, BINDER_SERVICE_IDENTIFIER};
use android_system_virtmanager::aidl::android::system::virtmanager::IVirtManager::BnVirtManager; use android_system_virtmanager::aidl::android::system::virtmanager::IVirtManager::BnVirtManager;
use android_system_virtmanager::binder::{add_service, ProcessState}; use android_system_virtmanager::binder::{add_service, ProcessState};
use log::info; use log::{info, Level};
/// The first CID to assign to a guest VM managed by the Virt Manager. CIDs lower than this are /// The first CID to assign to a guest VM managed by the Virt Manager. CIDs lower than this are
/// reserved for the host or other usage. /// reserved for the host or other usage.
const FIRST_GUEST_CID: Cid = 10; const FIRST_GUEST_CID: Cid = 10;
const LOG_TAG: &str = "VirtManager";
/// The unique ID of a VM used (together with a port number) for vsock communication. /// The unique ID of a VM used (together with a port number) for vsock communication.
type Cid = u32; type Cid = u32;
fn main() { fn main() {
env_logger::init(); android_logger::init_once(android_logger::Config::default().with_tag(LOG_TAG).with_min_level(
if env!("TARGET_BUILD_VARIANT") == "user" { Level::Info } else { Level::Trace },
));
let virt_manager = VirtManager::default(); let virt_manager = VirtManager::default();
let virt_manager = BnVirtManager::new_binder(virt_manager); let virt_manager = BnVirtManager::new_binder(virt_manager);
add_service(BINDER_SERVICE_IDENTIFIER, virt_manager.as_binder()).unwrap(); add_service(BINDER_SERVICE_IDENTIFIER, virt_manager.as_binder()).unwrap();