From ee18cf632fbeee47c916aad58b2edbf60e354fa6 Mon Sep 17 00:00:00 2001
From: Gunjan Vyas <vyasgun20@gmail.com>
Date: Mon, 8 Jun 2026 22:18:08 +0530
Subject: [PATCH] Add explicit destructive operation logging for Kill/Remove

Signed-off-by: Gunjan Vyas <vyasgun20@gmail.com>
---
 pkg/libvirt/libvirt.go | 48 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/pkg/libvirt/libvirt.go b/pkg/libvirt/libvirt.go
index f36d9cfa..539af217 100644
--- a/pkg/libvirt/libvirt.go
+++ b/pkg/libvirt/libvirt.go
@@ -26,6 +26,26 @@ type Driver struct {
 	vmLoaded bool
 }
 
+func operationLogFields(operation string, machineName string, err error) log.Fields {
+	switch err {
+	case nil:
+		return log.Fields{
+			"operation": operation,
+			"machine":   machineName,
+		}
+	default:
+		return log.Fields{
+			"operation": operation,
+			"machine":   machineName,
+			"error":     err.Error(),
+		}
+	}
+}
+
+func operationLog(operation string, machineName string, err error) *log.Entry {
+	return log.WithFields(operationLogFields(operation, machineName, err))
+}
+
 func (d *Driver) GetMachineName() string {
 	return d.MachineName
 }
@@ -440,15 +460,28 @@ func (d *Driver) Stop() error {
 
 func (d *Driver) Remove() error {
 	log.Debugf("Removing VM %s", d.MachineName)
-	_ = d.validateVMRef()
+	err := d.validateVMRef()
+	if err != nil {
+		operationLog("Remove", d.MachineName, err).Error("destructive operation failed")
+	}
 	if !d.vmLoaded {
+		operationLog("Remove", d.MachineName, nil).Info("destructive operation succeeded")
 		return nil
 	}
 	// Note: If we switch to qcow disks instead of raw the user
 	//       could take a snapshot.  If you do, then Undefine
 	//       will fail unless we nuke the snapshots first
-	_ = d.vm.Destroy() // Ignore errors
-	return d.vm.UndefineFlags(libvirt.DOMAIN_UNDEFINE_NVRAM)
+	err = d.vm.Destroy() // Ignore errors
+	if err != nil {
+		operationLog("Remove", d.MachineName, err).Error("destructive operation failed")
+	}
+	err = d.vm.UndefineFlags(libvirt.DOMAIN_UNDEFINE_NVRAM)
+	if err != nil {
+		operationLog("Remove", d.MachineName, err).Error("destructive operation failed")
+		return err
+	}
+	operationLog("Remove", d.MachineName, nil).Info("destructive operation succeeded")
+	return nil
 }
 
 func (d *Driver) Restart() error {
@@ -462,9 +495,16 @@ func (d *Driver) Restart() error {
 func (d *Driver) Kill() error {
 	log.Debugf("Killing VM %s", d.MachineName)
 	if err := d.validateVMRef(); err != nil {
+		operationLog("Kill", d.MachineName, err).Error("destructive operation failed")
 		return err
 	}
-	return d.vm.Destroy()
+	err := d.vm.Destroy()
+	if err != nil {
+		operationLog("Kill", d.MachineName, err).Error("destructive operation failed")
+		return err
+	}
+	operationLog("Kill", d.MachineName, nil).Info("destructive operation succeeded")
+	return nil
 }
 
 func (d *Driver) GetState() (state.State, error) {