Revert "vmm, tests: Disable reboot support"

This reverts commit 8308e1bf25.
This commit is contained in:
Rob Bradford 2019-09-05 10:01:20 +01:00
parent 5dd675710b
commit 1f06c5907f
2 changed files with 0 additions and 5 deletions

View File

@ -2074,7 +2074,6 @@ mod tests {
} }
#[test] #[test]
#[ignore]
fn test_reboot() { fn test_reboot() {
test_block!(tb, "", { test_block!(tb, "", {
let mut clear = ClearDiskConfig::new(); let mut clear = ClearDiskConfig::new();
@ -2143,7 +2142,6 @@ mod tests {
} }
#[test] #[test]
#[ignore]
fn test_bzimage_reboot() { fn test_bzimage_reboot() {
test_block!(tb, "", { test_block!(tb, "", {
let mut clear = ClearDiskConfig::new(); let mut clear = ClearDiskConfig::new();

View File

@ -55,7 +55,6 @@ impl Vmm {
} }
pub fn boot_kernel(config: VmConfig) -> Result<()> { pub fn boot_kernel(config: VmConfig) -> Result<()> {
#[allow(clippy::never_loop)]
loop { loop {
let vmm = Vmm::new()?; let vmm = Vmm::new()?;
let mut vm = Vm::new(&vmm.kvm, &config).map_err(Error::VmNew)?; let mut vm = Vm::new(&vmm.kvm, &config).map_err(Error::VmNew)?;
@ -64,8 +63,6 @@ pub fn boot_kernel(config: VmConfig) -> Result<()> {
if vm.start(entry).map_err(Error::VmStart)? == ExitBehaviour::Shutdown { if vm.start(entry).map_err(Error::VmStart)? == ExitBehaviour::Shutdown {
break; break;
} }
error!("Shutting down rather than rebooting due to known resource leaks: https://github.com/intel/cloud-hypervisor/issues/223");
break;
} }
Ok(()) Ok(())