Fix PvmfwDebugPolicyHostTests#testRamdump
If a device without new AVF debug policy (e.g. some lab devices),
virtualizationmanager don't prepare ramdump for protected VM
because virtualizationmanager reads empty debug policy.
However, PvmfwDebugPolicyHostTests#testRamdump build custom pvmfw
image with custom debug policy, so the test runs while pvmfw
expects ramdump setup in the virtualizationmanager.
This CL relaxes the condition for ramdump preparation, so ramdump
is prepared when debug policy or debug level says so.
Test: atest after erase AVF debug policy.
Bug: 271527749
Change-Id: I1e140ffba4c0b49d6ddeb5f60e8d04f1c5e5e864
diff --git a/virtualizationmanager/src/debug_config.rs b/virtualizationmanager/src/debug_config.rs
index a4ec419..eda854a 100644
--- a/virtualizationmanager/src/debug_config.rs
+++ b/virtualizationmanager/src/debug_config.rs
@@ -40,19 +40,13 @@
pub fn is_ramdump_needed(config: &VirtualMachineConfig) -> bool {
let enabled_in_dp =
get_debug_policy_bool("/proc/device-tree/avf/guest/common/ramdump").unwrap_or_default();
- let (protected, debuggable) = match config {
- VirtualMachineConfig::RawConfig(config) => {
+ let debuggable = match config {
+ VirtualMachineConfig::RawConfig(_) => {
// custom VMs are considered debuggable for flexibility
- (config.protectedVm, true)
+ true
}
- VirtualMachineConfig::AppConfig(config) => {
- (config.protectedVm, config.debugLevel == DebugLevel::FULL)
- }
+ VirtualMachineConfig::AppConfig(config) => config.debugLevel == DebugLevel::FULL,
};
- if protected {
- enabled_in_dp
- } else {
- enabled_in_dp || debuggable
- }
+ enabled_in_dp || debuggable
}