From 1f06c5907f9fa6d5f9a3b546327149fecba65814 Mon Sep 17 00:00:00 2001
From: Rob Bradford <robert.bradford@intel.com>
Date: Thu, 5 Sep 2019 10:01:20 +0100
Subject: [PATCH] Revert "vmm, tests: Disable reboot support"

This reverts commit 8308e1bf25c505640c2b1c914deec06e83636cbb.
---
 src/main.rs    | 2 --
 vmm/src/lib.rs | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 8dd925bae..46f02e695 100755
--- a/src/main.rs
+++ b/src/main.rs
@@ -2074,7 +2074,6 @@ mod tests {
     }
 
     #[test]
-    #[ignore]
     fn test_reboot() {
         test_block!(tb, "", {
             let mut clear = ClearDiskConfig::new();
@@ -2143,7 +2142,6 @@ mod tests {
     }
 
     #[test]
-    #[ignore]
     fn test_bzimage_reboot() {
         test_block!(tb, "", {
             let mut clear = ClearDiskConfig::new();
diff --git a/vmm/src/lib.rs b/vmm/src/lib.rs
index 78077e30a..a2706ad68 100644
--- a/vmm/src/lib.rs
+++ b/vmm/src/lib.rs
@@ -55,7 +55,6 @@ impl Vmm {
 }
 
 pub fn boot_kernel(config: VmConfig) -> Result<()> {
-    #[allow(clippy::never_loop)]
     loop {
         let vmm = Vmm::new()?;
         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 {
             break;
         }
-        error!("Shutting down rather than rebooting due to known resource leaks: https://github.com/intel/cloud-hypervisor/issues/223");
-        break;
     }
 
     Ok(())