[pve-devel] [PATCH manager 4/5] Utils: add is_windows and use in MachineEdit

Stefan Reiter s.reiter at proxmox.com
Mon Mar 8 11:01:50 CET 2021


A bit more future proof and reuseable than a regex match.

Signed-off-by: Stefan Reiter <s.reiter at proxmox.com>
---
 www/manager6/Utils.js            | 9 +++++++++
 www/manager6/qemu/MachineEdit.js | 4 +---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index ab4988b0..f502950f 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -69,6 +69,15 @@ Ext.define('PVE.Utils', {
 	],
     },
 
+    is_windows: function(ostype) {
+	for (let entry of PVE.Utils.kvm_ostypes['Microsoft Windows']) {
+	    if (entry.val === ostype) {
+		return true;
+	    }
+	}
+	return false;
+    },
+
     get_health_icon: function(state, circle) {
 	if (circle === undefined) {
 	    circle = false;
diff --git a/www/manager6/qemu/MachineEdit.js b/www/manager6/qemu/MachineEdit.js
index 87b405f5..f928c80c 100644
--- a/www/manager6/qemu/MachineEdit.js
+++ b/www/manager6/qemu/MachineEdit.js
@@ -138,9 +138,7 @@ Ext.define('PVE.qemu.MachineEdit', {
 		let values = {
 		    machine: conf.machine || '__default__',
 		};
-		if (conf.ostype && conf.ostype.match(/^(win|wvista|wxp|w2k)/i)) {
-		    values.isWindows = true;
-		}
+		values.isWindows = PVE.Utils.is_windows(conf.ostype);
 		me.setValues(values);
 	    },
 	});
-- 
2.20.1






More information about the pve-devel mailing list