]> git.proxmox.com Git - pve-manager.git/commitdiff
ui: qemu/USBEdit: add 'mapped' device case
authorDominik Csapak <d.csapak@proxmox.com>
Fri, 16 Jun 2023 13:05:34 +0000 (15:05 +0200)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Fri, 16 Jun 2023 14:25:42 +0000 (16:25 +0200)
to be able to select 'mapped' usb devices

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
www/manager6/qemu/USBEdit.js

index fe51d186f1948e7f353abb657ac3459e16ff47df..b372d53d3b90649d04da07d0ffca2c1ebf1189e7 100644 (file)
@@ -5,6 +5,15 @@ Ext.define('PVE.qemu.USBInputPanel', {
     autoComplete: false,
     onlineHelp: 'qm_usb_passthrough',
 
+    cbindData: function(initialConfig) {
+       let me = this;
+       if (!me.pveSelNode) {
+           throw "no pveSelNode given";
+       }
+
+       return { nodename: me.pveSelNode.data.node };
+    },
+
     viewModel: {
        data: {},
     },
@@ -36,6 +45,10 @@ Ext.define('PVE.qemu.USBInputPanel', {
            case 'spice':
                val = 'spice';
                break;
+           case 'mapped':
+               val = `mapping=${values[type]}`;
+               delete values.mapped;
+               break;
            case 'hostdevice':
            case 'port':
                val = 'host=' + values[type];
@@ -66,6 +79,23 @@ Ext.define('PVE.qemu.USBInputPanel', {
                    submitValue: false,
                    checked: true,
                },
+               {
+                   name: 'usb',
+                   inputValue: 'mapped',
+                   boxLabel: gettext('Use mapped Device'),
+                   reference: 'mapped',
+                   submitValue: false,
+               },
+               {
+                   xtype: 'pveUSBMapSelector',
+                   disabled: true,
+                   name: 'mapped',
+                   cbind: { nodename: '{nodename}' },
+                   bind: { disabled: '{!mapped.checked}' },
+                   allowBlank: false,
+                   fieldLabel: gettext('Choose Device'),
+                   labelAlign: 'right',
+               },
                {
                    name: 'usb',
                    inputValue: 'hostdevice',
@@ -149,30 +179,33 @@ Ext.define('PVE.qemu.USBEdit', {
                    return;
                }
 
-               var data = response.result.data[me.confid].split(',');
-               var port, hostdevice, usb3 = false;
-               var type = 'spice';
-
-               for (let i = 0; i < data.length; i++) {
-                   if (/^(host=)?(0x)?[a-zA-Z0-9]{4}:(0x)?[a-zA-Z0-9]{4}$/.test(data[i])) {
-                       hostdevice = data[i];
-                       hostdevice = hostdevice.replace('host=', '').replace('0x', '');
-                       type = 'hostdevice';
-                   } else if (/^(host=)?(\d+)-(\d+(\.\d+)*)$/.test(data[i])) {
-                       port = data[i];
-                       port = port.replace('host=', '');
-                       type = 'port';
-                   }
-
-                   if (/^usb3=(1|on|true)$/.test(data[i])) {
-                       usb3 = true;
+               let data = PVE.Parser.parsePropertyString(response.result.data[me.confid], 'host');
+               let port, hostdevice, mapped, usb3 = false;
+               let usb;
+
+               if (data.host) {
+                   if (/^(0x)?[a-zA-Z0-9]{4}:(0x)?[a-zA-Z0-9]{4}$/.test(data.host)) {
+                       hostdevice = data.host.replace('0x', '');
+                       usb = 'hostdevice';
+                   } else if (/^(\d+)-(\d+(\.\d+)*)$/.test(data.host)) {
+                       port = data.host;
+                       usb = 'port';
+                   } else if (/^spice$/i.test(data.host)) {
+                       usb = 'spice';
                    }
+               } else if (data.mapping) {
+                   mapped = data.mapping;
+                   usb = 'mapped';
                }
+
+               usb3 = data.usb3 ?? false;
+
                var values = {
-                   usb: type,
-                   hostdevice: hostdevice,
-                   port: port,
-                   usb3: usb3,
+                   usb,
+                   hostdevice,
+                   port,
+                   usb3,
+                   mapped,
                };
 
                ipanel.setValues(values);