From cc7f874e03a6050c47b592fe5ed7b3704eeedfcc Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Wed, 24 Mar 2021 21:12:01 +0200
Subject: refactor: when deleting, ask all VMs to shut down at once, for speed

---
 src/cmd/delete.rs |  5 +++++
 src/libvirt.rs    | 18 +++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/cmd/delete.rs b/src/cmd/delete.rs
index 66eb23f..fbb6ab5 100644
--- a/src/cmd/delete.rs
+++ b/src/cmd/delete.rs
@@ -9,8 +9,13 @@ use log::info;
 /// Delete the VM corresponding to each specification provided by the caller.
 pub fn delete(specs: &[Specification]) -> Result<(), VirtError> {
     let libvirt = Libvirt::connect("qemu:///system")?;
+    for spec in specs {
+        info!("asking virtual machine {} to shutdown", spec.name);
+        libvirt.trigger_shutdown(&spec.name)?;
+    }
     for spec in specs {
         info!("deleting virtual machine {}", spec.name);
+        libvirt.shutdown(&spec.name)?;
         libvirt.delete(&spec.name, &spec.image)?;
     }
     Ok(())
diff --git a/src/libvirt.rs b/src/libvirt.rs
index c93bd9f..7d8235d 100644
--- a/src/libvirt.rs
+++ b/src/libvirt.rs
@@ -95,9 +95,20 @@ impl Libvirt {
         Ok(())
     }
 
+    pub fn trigger_shutdown(&self, name: &str) -> Result<(), VirtError> {
+        if let Some(domain) = self.get_domain(name)? {
+            debug!("asking {} to shut down", name);
+            if domain.is_active()? {
+                domain.shutdown()?;
+            }
+        }
+        Ok(())
+    }
+
     pub fn shutdown(&self, name: &str) -> Result<(), VirtError> {
         if let Some(domain) = self.get_domain(name)? {
-            domain.shutdown()?;
+            debug!("shutting down {}", name);
+            self.trigger_shutdown(name)?;
             wait_until_inactive(&domain, name);
         }
         Ok(())
@@ -105,10 +116,7 @@ impl Libvirt {
 
     pub fn delete(&self, name: &str, image: &Path) -> Result<(), VirtError> {
         if let Some(domain) = self.get_domain(name)? {
-            debug!("shutting down {}", name);
-            domain.shutdown().ok();
-
-            wait_until_inactive(&domain, name);
+            self.shutdown(name)?;
 
             debug!("undefine {}", name);
             domain.undefine()?;
-- 
cgit v1.2.1