From 113008b06daf56d2a1e89c518fde5207d4d4102a Mon Sep 17 00:00:00 2001
From: Bianco Veigel <devel@zivillian.de>
Date: Mon, 20 Jul 2020 19:28:22 +0200
Subject: [PATCH] use name from commandline parameter for kvm

---
 plugins/libvirt/kvm_cpu | 7 +++++++
 plugins/libvirt/kvm_io  | 7 +++++++
 plugins/libvirt/kvm_mem | 7 +++++++
 plugins/libvirt/kvm_net | 8 ++++++++
 4 files changed, 29 insertions(+)

diff --git a/plugins/libvirt/kvm_cpu b/plugins/libvirt/kvm_cpu
index f43f2902..b8aeecf8 100755
--- a/plugins/libvirt/kvm_cpu
+++ b/plugins/libvirt/kvm_cpu
@@ -52,6 +52,13 @@ def clean_vm_name(vm_name):
     if suffix:
         vm_name = re.sub(suffix,'',vm_name)
 
+    parts = vm_name.split('\x00')
+    if (parts[0].endswith('kvm')):
+        try:
+            return parts[parts.index('-name')+1]
+        except ValueError:
+            pass
+
     return re.sub(r"[^a-zA-Z0-9_]", "_", vm_name)
 
 def detect_kvm():
diff --git a/plugins/libvirt/kvm_io b/plugins/libvirt/kvm_io
index d1aff23d..329db9ad 100755
--- a/plugins/libvirt/kvm_io
+++ b/plugins/libvirt/kvm_io
@@ -52,6 +52,13 @@ def clean_vm_name(vm_name):
     if suffix:
         vm_name = re.sub(suffix,'',vm_name)
 
+    parts = vm_name.split('\x00')
+    if (parts[0].endswith('kvm')):
+        try:
+            return parts[parts.index('-name')+1]
+        except ValueError:
+            pass
+
     return re.sub(r"[^a-zA-Z0-9_]", "_", vm_name)
 
 def fetch(vms):
diff --git a/plugins/libvirt/kvm_mem b/plugins/libvirt/kvm_mem
index d316bae3..65e6599f 100755
--- a/plugins/libvirt/kvm_mem
+++ b/plugins/libvirt/kvm_mem
@@ -49,6 +49,13 @@ def clean_vm_name(vm_name):
     if suffix:
         vm_name = re.sub(suffix,'',vm_name)
 
+    parts = vm_name.split('\x00')
+    if (parts[0].endswith('kvm')):
+        try:
+            return parts[parts.index('-name')+1]
+        except ValueError:
+            pass
+
     return re.sub(r"[^a-zA-Z0-9_]", "_", vm_name)
 
 def fetch(vms):
diff --git a/plugins/libvirt/kvm_net b/plugins/libvirt/kvm_net
index e9b6a711..e7b1b8db 100755
--- a/plugins/libvirt/kvm_net
+++ b/plugins/libvirt/kvm_net
@@ -100,6 +100,14 @@ def clean_vm_name(vm_name):
     suffix = os.getenv("vmsuffix")
     if suffix:
         vm_name = re.sub(suffix, "", vm_name)
+
+    parts = vm_name.split('\x00')
+    if (parts[0].endswith('kvm')):
+        try:
+            return parts[parts.index('-name')+1]
+        except ValueError:
+            pass
+
     return re.sub(r"[^a-zA-Z0-9_]", "_", vm_name)