mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-02 11:35:46 +00:00
Revert "vmm, tests: Disable reboot support"
This reverts commit 8308e1bf25
.
This commit is contained in:
parent
5dd675710b
commit
1f06c5907f
@ -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();
|
||||||
|
@ -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(())
|
||||||
|
Loading…
Reference in New Issue
Block a user