Merge "virtualizationservice: Fix log messages"
diff --git a/virtualizationservice/src/aidl.rs b/virtualizationservice/src/aidl.rs
index de63e3d..4e3bed2 100644
--- a/virtualizationservice/src/aidl.rs
+++ b/virtualizationservice/src/aidl.rs
@@ -1070,7 +1070,7 @@
fn notifyPayloadStarted(&self) -> binder::Result<()> {
let cid = self.cid;
if let Some(vm) = self.state.lock().unwrap().get_vm(cid) {
- info!("VM having CID {} started payload", cid);
+ info!("VM with CID {} started payload", cid);
vm.update_payload_state(PayloadState::Started).map_err(|e| {
Status::new_exception_str(ExceptionCode::ILLEGAL_STATE, Some(e.to_string()))
})?;
@@ -1092,7 +1092,7 @@
fn notifyPayloadReady(&self) -> binder::Result<()> {
let cid = self.cid;
if let Some(vm) = self.state.lock().unwrap().get_vm(cid) {
- info!("VM having CID {} payload is ready", cid);
+ info!("VM with CID {} reported payload is ready", cid);
vm.update_payload_state(PayloadState::Ready).map_err(|e| {
Status::new_exception_str(ExceptionCode::ILLEGAL_STATE, Some(e.to_string()))
})?;
@@ -1110,7 +1110,7 @@
fn notifyPayloadFinished(&self, exit_code: i32) -> binder::Result<()> {
let cid = self.cid;
if let Some(vm) = self.state.lock().unwrap().get_vm(cid) {
- info!("VM having CID {} finished payload", cid);
+ info!("VM with CID {} finished payload", cid);
vm.update_payload_state(PayloadState::Finished).map_err(|e| {
Status::new_exception_str(ExceptionCode::ILLEGAL_STATE, Some(e.to_string()))
})?;
@@ -1128,7 +1128,7 @@
fn notifyError(&self, error_code: ErrorCode, message: &str) -> binder::Result<()> {
let cid = self.cid;
if let Some(vm) = self.state.lock().unwrap().get_vm(cid) {
- info!("VM having CID {} encountered an error", cid);
+ info!("VM with CID {} encountered an error", cid);
vm.update_payload_state(PayloadState::Finished).map_err(|e| {
Status::new_exception_str(ExceptionCode::ILLEGAL_STATE, Some(e.to_string()))
})?;
@@ -1146,7 +1146,7 @@
fn notifyCpuStatus(&self, status: &VirtualMachineCpuStatus) -> binder::Result<()> {
let cid = self.cid;
if let Some(vm) = self.state.lock().unwrap().get_vm(cid) {
- info!("VM having CID {} encountered an error", cid);
+ info!("VM with CID {} reported its CPU status", cid);
write_vm_cpu_status_stats(vm.requester_uid as i32, &vm.name, status);
Ok(())
} else {
@@ -1161,7 +1161,7 @@
fn notifyMemStatus(&self, status: &VirtualMachineMemStatus) -> binder::Result<()> {
let cid = self.cid;
if let Some(vm) = self.state.lock().unwrap().get_vm(cid) {
- info!("VM having CID {} encountered an error", cid);
+ info!("VM with CID {} reported its memory status", cid);
write_vm_mem_status_stats(vm.requester_uid as i32, &vm.name, status);
Ok(())
} else {