kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Consolidate "gdb" build feature into "guest_debug"

Browse Source 
This simplifies the CI process but also logical with the existing
functionality under "guest_debug" (dumping guest memory).

Fixes: #4679

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford
2022-09-27 12:17:40 +01:00
parent b8503b5f45
commit 06eb82d239
10 changed files with 96 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vmm/src/config.rs
+7 -7
View File
@@ -379,7 +379,7 @@ pub struct VmParams<'a> {
pub sgx_epc: Option<Vec<&'a str>>,
pub numa: Option<Vec<&'a str>>,
pub watchdog: bool,
#[cfg(feature = "gdb")]
#[cfg(feature = "guest_debug")]
pub gdb: bool,
pub platform: Option<&'a str>,
}
@@ -411,7 +411,7 @@ impl<'a> VmParams<'a> {
let numa: Option<Vec<&str>> = args.values_of("numa").map(|x| x.collect());
let watchdog = args.is_present("watchdog");
let platform = args.value_of("platform");
#[cfg(feature = "gdb")]
#[cfg(feature = "guest_debug")]
let gdb = args.is_present("gdb");
VmParams {
cpus,
@@ -437,7 +437,7 @@ impl<'a> VmParams<'a> {
sgx_epc,
numa,
watchdog,
#[cfg(feature = "gdb")]
#[cfg(feature = "guest_debug")]
gdb,
platform,
}
@@ -2315,7 +2315,7 @@ pub struct VmConfig {
pub numa: Option<Vec<NumaConfig>>,
#[serde(default)]
pub watchdog: bool,
#[cfg(feature = "gdb")]
#[cfg(feature = "guest_debug")]
pub gdb: bool,
pub platform: Option<PlatformConfig>,
}
@@ -2703,7 +2703,7 @@ impl VmConfig {
None
};
#[cfg(feature = "gdb")]
#[cfg(feature = "guest_debug")]
let gdb = vm_params.gdb;
let mut config = VmConfig {
@@ -2730,7 +2730,7 @@ impl VmConfig {
sgx_epc,
numa,
watchdog: vm_params.watchdog,
#[cfg(feature = "gdb")]
#[cfg(feature = "guest_debug")]
gdb,
platform,
};
@@ -3340,7 +3340,7 @@ mod tests {
sgx_epc: None,
numa: None,
watchdog: false,
#[cfg(feature = "gdb")]
#[cfg(feature = "guest_debug")]
gdb: false,
platform: None,
};