From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 924BF91CC8 for ; Fri, 23 Dec 2022 14:11:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6618E25F0D for ; Fri, 23 Dec 2022 14:10:51 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 23 Dec 2022 14:10:49 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 2ED5644079 for ; Fri, 23 Dec 2022 14:10:49 +0100 (CET) From: Markus Frank To: pve-devel@lists.proxmox.com Date: Fri, 23 Dec 2022 14:10:06 +0100 Message-Id: <20221223131007.130310-6-m.frank@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221223131007.130310-1-m.frank@proxmox.com> References: <20221223131007.130310-1-m.frank@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.037 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server v2 5/6] added options to add virtio-9p & virtio-fs Shared Filesystems to qemu config X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Dec 2022 13:11:21 -0000 Signed-off-by: Markus Frank --- www/manager6/Makefile | 1 + www/manager6/Utils.js | 1 + www/manager6/qemu/HardwareView.js | 19 +++++ www/manager6/qemu/SharedfilesEdit.js | 101 +++++++++++++++++++++++++++ 4 files changed, 122 insertions(+) create mode 100644 www/manager6/qemu/SharedfilesEdit.js diff --git a/www/manager6/Makefile b/www/manager6/Makefile index 7146fab1..cb035734 100644 --- a/www/manager6/Makefile +++ b/www/manager6/Makefile @@ -237,6 +237,7 @@ JSSRC= \ qemu/QemuBiosEdit.js \ qemu/RNGEdit.js \ qemu/SSHKey.js \ + qemu/SharedfilesEdit.js \ qemu/ScsiHwEdit.js \ qemu/SerialEdit.js \ qemu/Smbios1Edit.js \ diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 8c118fa2..5ac830a3 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1579,6 +1579,7 @@ Ext.define('PVE.Utils', { serial: 4, rng: 1, tpmstate: 1, + sharedfiles: 10, }, // we can have usb6 and up only for specific machine/ostypes diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js index af35a980..10091aee 100644 --- a/www/manager6/qemu/HardwareView.js +++ b/www/manager6/qemu/HardwareView.js @@ -309,6 +309,16 @@ Ext.define('PVE.qemu.HardwareView', { never_delete: !caps.nodes['Sys.Console'], header: gettext("VirtIO RNG"), }; + for (let i = 0; i < PVE.Utils.hardware_counts.sharedfiles; i++) { + let confid = "sharedfiles" + i.toString(); + rows[confid] = { + group: 50, + order: i, + iconCls: 'folder', + editor: 'PVE.qemu.SharedfilesEdit', + header: gettext('Shared FS') + ' (' + confid +')', + }; + } var sorterFn = function(rec1, rec2) { var v1 = rec1.data.key; @@ -582,6 +592,7 @@ Ext.define('PVE.qemu.HardwareView', { const noVMConfigDiskPerm = !caps.vms['VM.Config.Disk']; const noVMConfigCDROMPerm = !caps.vms['VM.Config.CDROM']; const noVMConfigCloudinitPerm = !caps.vms['VM.Config.Cloudinit']; + const noVMConfigOptionsPerm = !caps.vms['VM.Config.Options']; me.down('#addUsb').setDisabled(noSysConsolePerm || isAtUsbLimit()); me.down('#addPci').setDisabled(noSysConsolePerm || isAtLimit('hostpci')); @@ -591,6 +602,7 @@ Ext.define('PVE.qemu.HardwareView', { me.down('#addRng').setDisabled(noSysConsolePerm || isAtLimit('rng')); efidisk_menuitem.setDisabled(noVMConfigDiskPerm || isAtLimit('efidisk')); me.down('#addTpmState').setDisabled(noSysConsolePerm || isAtLimit('tpmstate')); + me.down('#addFileshare').setDisabled(noVMConfigOptionsPerm || isAtLimit('sharedfiles')); me.down('#addCloudinitDrive').setDisabled(noVMConfigCDROMPerm || noVMConfigCloudinitPerm || hasCloudInit); if (!rec) { @@ -735,6 +747,13 @@ Ext.define('PVE.qemu.HardwareView', { disabled: !caps.nodes['Sys.Console'], handler: editorFactory('RNGEdit'), }, + { + text: gettext("Shared Filesystem"), + itemId: 'addFileshare', + iconCls: 'fa fa-folder', + disabled: !caps.nodes['Sys.Console'], + handler: editorFactory('SharedfilesEdit'), + }, ], }), }, diff --git a/www/manager6/qemu/SharedfilesEdit.js b/www/manager6/qemu/SharedfilesEdit.js new file mode 100644 index 00000000..8ebcef6c --- /dev/null +++ b/www/manager6/qemu/SharedfilesEdit.js @@ -0,0 +1,101 @@ +Ext.define('PVE.qemu.SharedfilesInputPanel', { + extend: 'Proxmox.panel.InputPanel', + xtype: 'pveSharedfilesInputPanel', + onlineHelp: 'qm_sharedfiles', + + insideWizard: false, + + onGetValues: function(values) { + var me = this; + var confid = me.confid; + var params = {}; + params[confid] = PVE.Parser.printPropertyString(values, 'type'); + return params; + }, + + setSharedfiles: function(confid, data) { + var me = this; + me.confid = confid; + me.sharedfiles = data; + me.setValues(me.sharedfiles); + }, + items: [ + { + name: 'type', + xtype: 'proxmoxKVComboBox', + fieldLabel: gettext('Shared FS Type'), + comboItems: [['virtio-9p', 'virtio-9p'], ['virtio-fs', 'virtio-fs']], + allowBlank: false, + }, + { + xtype: 'proxmoxtextfield', + emptyText: 'dirid', + fieldLabel: gettext('Directory ID'), + name: 'dirid', + allowBlank: false, + }, + { + xtype: 'proxmoxtextfield', + emptyText: 'tag name', + fieldLabel: gettext('tag'), + name: 'tag', + allowBlank: false, + }, + ], + initComponent: function() { + var me = this; + + me.sharedfiles = {}; + me.confid = 'sharedfiles0'; + me.callParent(); + }, +}); + +Ext.define('PVE.qemu.SharedfilesEdit', { + extend: 'Proxmox.window.Edit', + + subject: gettext('Filesystem Passthrough'), + + initComponent: function() { + var me = this; + + me.isCreate = !me.confid; + + var ipanel = Ext.create('PVE.qemu.SharedfilesInputPanel', { + confid: me.confid, + isCreate: me.isCreate, + }); + + Ext.applyIf(me, { + items: ipanel, + }); + + me.callParent(); + + me.load({ + success: function(response) { + me.conf = response.result.data; + var i, confid; + if (!me.isCreate) { + var value = me.conf[me.confid]; + var sharedfiles = PVE.Parser.parsePropertyString(value, "type"); + if (!sharedfiles) { + Ext.Msg.alert(gettext('Error'), 'Unable to parse sharedfiles options'); + me.close(); + return; + } + ipanel.setSharedfiles(me.confid, sharedfiles); + } else { + for (i = 0; i < PVE.Utils.hardware_counts.sharedfiles; i++) { + confid = 'sharedfiles' + i.toString(); + if (!Ext.isDefined(me.conf[confid])) { + me.confid = confid; + break; + } + } + ipanel.setSharedfiles(me.confid, {}); + } + }, + }); + }, +}); -- 2.30.2