Use Java style field names in AIDL.
Bug: 192294431
Test: built virt APEX
Change-Id: Ia8749923dcb5192c60be613ab4779e196d77f890
diff --git a/tests/vsock_test.cc b/tests/vsock_test.cc
index d9b8f21..c5643ec 100644
--- a/tests/vsock_test.cc
+++ b/tests/vsock_test.cc
@@ -88,7 +88,7 @@
raw_config.kernel = ParcelFileDescriptor(unique_fd(open(kVmKernelPath, O_RDONLY | O_CLOEXEC)));
raw_config.initrd = ParcelFileDescriptor(unique_fd(open(kVmInitrdPath, O_RDONLY | O_CLOEXEC)));
raw_config.params = kVmParams;
- raw_config.protected_vm = protected_vm;
+ raw_config.protectedVm = protected_vm;
VirtualMachineConfig config(std::move(raw_config));
sp<IVirtualMachine> vm;
diff --git a/virtualizationservice/aidl/android/system/virtualizationservice/VirtualMachineAppConfig.aidl b/virtualizationservice/aidl/android/system/virtualizationservice/VirtualMachineAppConfig.aidl
index 9339f82..a522dee 100644
--- a/virtualizationservice/aidl/android/system/virtualizationservice/VirtualMachineAppConfig.aidl
+++ b/virtualizationservice/aidl/android/system/virtualizationservice/VirtualMachineAppConfig.aidl
@@ -36,5 +36,5 @@
* The amount of RAM to give the VM, in MiB. If this is 0 or negative then it will default to
* the value in microdroid.json, if any, or the crosvm default.
*/
- int memory_mib;
+ int memoryMib;
}
diff --git a/virtualizationservice/aidl/android/system/virtualizationservice/VirtualMachineRawConfig.aidl b/virtualizationservice/aidl/android/system/virtualizationservice/VirtualMachineRawConfig.aidl
index 612c498..c62117e 100644
--- a/virtualizationservice/aidl/android/system/virtualizationservice/VirtualMachineRawConfig.aidl
+++ b/virtualizationservice/aidl/android/system/virtualizationservice/VirtualMachineRawConfig.aidl
@@ -41,8 +41,8 @@
DiskImage[] disks;
/** Whether the VM should be a protected VM. */
- boolean protected_vm;
+ boolean protectedVm;
/** The amount of RAM to give the VM, in MiB. 0 or negative to use the default. */
- int memory_mib;
+ int memoryMib;
}
diff --git a/virtualizationservice/src/aidl.rs b/virtualizationservice/src/aidl.rs
index 19e4877..00acd9b 100644
--- a/virtualizationservice/src/aidl.rs
+++ b/virtualizationservice/src/aidl.rs
@@ -160,8 +160,8 @@
initrd: as_asref(&config.initrd),
disks,
params: config.params.to_owned(),
- protected: config.protected_vm,
- memory_mib: config.memory_mib.try_into().ok().and_then(NonZeroU32::new),
+ protected: config.protectedVm,
+ memory_mib: config.memoryMib.try_into().ok().and_then(NonZeroU32::new),
};
let composite_disk_fds: Vec<_> =
indirect_files.iter().map(|file| file.as_raw_fd()).collect();
@@ -383,8 +383,8 @@
let vm_config_file = File::open(vm_config_path)?;
let mut vm_config = VmConfig::load(&vm_config_file)?.to_parcelable()?;
- if config.memory_mib > 0 {
- vm_config.memory_mib = config.memory_mib;
+ if config.memoryMib > 0 {
+ vm_config.memoryMib = config.memoryMib;
}
// Microdroid requires an additional payload disk image and the bootconfig partition.
diff --git a/vm/src/run.rs b/vm/src/run.rs
index 1b1d5a3..5b3f193 100644
--- a/vm/src/run.rs
+++ b/vm/src/run.rs
@@ -63,7 +63,7 @@
configPath: config_path.to_owned(),
debug,
// Use the default.
- memory_mib: 0,
+ memoryMib: 0,
});
run(service, &config, &format!("{:?}!{:?}", apk, config_path), daemonize, log_path)
}
diff --git a/vmconfig/src/lib.rs b/vmconfig/src/lib.rs
index 4a5b3b1..4ee4ea2 100644
--- a/vmconfig/src/lib.rs
+++ b/vmconfig/src/lib.rs
@@ -93,8 +93,8 @@
params: self.params.clone(),
bootloader: maybe_open_parcel_file(&self.bootloader, false)?,
disks: self.disks.iter().map(DiskImage::to_parcelable).collect::<Result<_, Error>>()?,
- protected_vm: self.protected,
- memory_mib,
+ protectedVm: self.protected,
+ memoryMib: memory_mib,
})
}
}