Allow debugging with KVM enabled

This commit is contained in:
Zhang Junyang
2024-07-26 19:07:41 +08:00
committed by Tate, Hongliang Tian
parent 42aac5ce8b
commit 91d524c19a
2 changed files with 4 additions and 15 deletions

View File

@ -3,7 +3,7 @@
use super::{build::create_base_and_cached_build, util::DEFAULT_TARGET_RELPATH};
use crate::{
cli::GdbServerArgs,
config::{scheme::ActionChoice, unix_args::split_to_kv_array, Config},
config::{scheme::ActionChoice, Config},
util::{get_current_crate_info, get_target_directory},
};
@ -41,20 +41,6 @@ pub fn execute_run_command(config: &Config, gdb_server_args: &GdbServerArgs) {
};
config.run.qemu.args += &qemu_gdb_args;
// FIXME: Disable KVM from QEMU args in debug mode.
// Currently, the QEMU GDB server does not work properly with KVM enabled.
let mut splitted = split_to_kv_array(&config.run.qemu.args);
let args_num = splitted.len();
splitted.retain(|x| !x.contains("kvm"));
if splitted.len() != args_num {
println!(
"[WARNING] KVM is forced to be disabled in GDB server currently. \
Options related with KVM are ignored."
);
}
config.run.qemu.args = splitted.join(" ");
// Ensure debug info added when debugging in the release profile.
if config.run.build.profile.contains("release") {
config