From: Markus Frank <m.frank@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager v7 11/11] ui: add options to add virtio-fs to qemu config
Date: Wed, 9 Aug 2023 10:37:39 +0200 [thread overview]
Message-ID: <20230809083739.100024-12-m.frank@proxmox.com> (raw)
In-Reply-To: <20230809083739.100024-1-m.frank@proxmox.com>
Signed-off-by: Markus Frank <m.frank@proxmox.com>
---
www/manager6/Makefile | 1 +
www/manager6/Utils.js | 1 +
www/manager6/qemu/HardwareView.js | 19 ++++
www/manager6/qemu/VirtiofsEdit.js | 146 ++++++++++++++++++++++++++++++
4 files changed, 167 insertions(+)
create mode 100644 www/manager6/qemu/VirtiofsEdit.js
diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 69627ae0..d8e23fd4 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -260,6 +260,7 @@ JSSRC= \
qemu/Smbios1Edit.js \
qemu/SystemEdit.js \
qemu/USBEdit.js \
+ qemu/VirtiofsEdit.js \
sdn/Browser.js \
sdn/ControllerView.js \
sdn/Status.js \
diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index 4e094213..eb0959e4 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -1609,6 +1609,7 @@ Ext.define('PVE.Utils', {
serial: 4,
rng: 1,
tpmstate: 1,
+ virtiofs: 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 5b33b1e2..b44485dc 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.virtiofs; i++) {
+ let confid = "virtiofs" + i.toString();
+ rows[confid] = {
+ group: 50,
+ order: i,
+ iconCls: 'folder',
+ editor: 'PVE.qemu.VirtiofsEdit',
+ header: gettext('Virtiofs') + ' (' + confid +')',
+ };
+ }
var sorterFn = function(rec1, rec2) {
var v1 = rec1.data.key;
@@ -583,6 +593,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(noHWPerm || isAtUsbLimit());
me.down('#addPci').setDisabled(noHWPerm || isAtLimit('hostpci'));
@@ -592,6 +603,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('#addVirtiofs').setDisabled(noVMConfigOptionsPerm || isAtLimit('virtiofs'));
me.down('#addCloudinitDrive').setDisabled(noVMConfigCDROMPerm || noVMConfigCloudinitPerm || hasCloudInit);
if (!rec) {
@@ -736,6 +748,13 @@ Ext.define('PVE.qemu.HardwareView', {
disabled: !caps.nodes['Sys.Console'],
handler: editorFactory('RNGEdit'),
},
+ {
+ text: gettext("Virtiofs"),
+ itemId: 'addVirtiofs',
+ iconCls: 'fa fa-folder',
+ disabled: !caps.nodes['Sys.Console'],
+ handler: editorFactory('VirtiofsEdit'),
+ },
],
}),
},
diff --git a/www/manager6/qemu/VirtiofsEdit.js b/www/manager6/qemu/VirtiofsEdit.js
new file mode 100644
index 00000000..46a52854
--- /dev/null
+++ b/www/manager6/qemu/VirtiofsEdit.js
@@ -0,0 +1,146 @@
+Ext.define('PVE.qemu.VirtiofsInputPanel', {
+ extend: 'Proxmox.panel.InputPanel',
+ xtype: 'pveVirtiofsInputPanel',
+ onlineHelp: 'qm_virtiofs',
+
+ insideWizard: false,
+
+ onGetValues: function(values) {
+ var me = this;
+ var confid = me.confid;
+ var params = {};
+ if (values.delete === "xattr") {
+ delete values.xattr;
+ }
+ if (values.delete === "acl") {
+ delete values.acl;
+ }
+ delete values.delete;
+ params[confid] = PVE.Parser.printPropertyString(values, 'dirid');
+ return params;
+ },
+
+ setSharedfiles: function(confid, data) {
+ var me = this;
+ me.confid = confid;
+ me.virtiofs = data;
+ me.setValues(me.virtiofs);
+ },
+ initComponent: function() {
+ let me = this;
+
+ me.nodename = me.pveSelNode.data.node;
+ if (!me.nodename) {
+ throw "no node name specified";
+ }
+ me.items = [
+ {
+ xtype: 'pveDIRMapSelector',
+ emptyText: 'dirid',
+ nodename: me.nodename,
+ fieldLabel: gettext('Directory ID'),
+ name: 'dirid',
+ allowBlank: false,
+ },
+ {
+ xtype: 'proxmoxKVComboBox',
+ value: '__default__',
+ fieldLabel: gettext('Cache'),
+ name: 'cache',
+ deleteEmpty: false,
+ comboItems: [
+ ['__default__', 'Default (auto)'],
+ ['auto', 'auto'],
+ ['always', 'always'],
+ ['never', 'never'],
+ ],
+ allowBlank: false,
+ },
+ {
+ xtype: 'proxmoxKVComboBox',
+ value: '__default__',
+ fieldLabel: gettext('xattr'),
+ name: 'xattr',
+ deleteDefaultValue: true,
+ comboItems: [
+ ['__default__', 'Default (Mapping Settings)'],
+ ['0', 'off'],
+ ['1', 'on'],
+ ],
+ allowBlank: false,
+ },
+ {
+ xtype: 'proxmoxKVComboBox',
+ value: '__default__',
+ fieldLabel: gettext('acl (implies xattr)'),
+ name: 'acl',
+ deleteDefaultValue: true,
+ comboItems: [
+ ['__default__', 'Default (Mapping Settings)'],
+ ['0', 'off'],
+ ['1', 'on'],
+ ],
+ allowBlank: false,
+ },
+ {
+ xtype: 'proxmoxcheckbox',
+ fieldLabel: gettext('Direct-io'),
+ name: 'direct-io',
+ },
+ ];
+
+ me.virtiofs = {};
+ me.confid = 'virtiofs0';
+ me.callParent();
+ },
+});
+
+Ext.define('PVE.qemu.VirtiofsEdit', {
+ extend: 'Proxmox.window.Edit',
+
+ subject: gettext('Filesystem Passthrough'),
+
+ initComponent: function() {
+ var me = this;
+
+ me.isCreate = !me.confid;
+
+ var ipanel = Ext.create('PVE.qemu.VirtiofsInputPanel', {
+ confid: me.confid,
+ pveSelNode: me.pveSelNode,
+ 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 virtiofs = PVE.Parser.parsePropertyString(value, "dirid");
+ if (!virtiofs) {
+ Ext.Msg.alert(gettext('Error'), 'Unable to parse virtiofs options');
+ me.close();
+ return;
+ }
+ ipanel.setSharedfiles(me.confid, virtiofs);
+ } else {
+ for (i = 0; i < PVE.Utils.hardware_counts.virtiofs; i++) {
+ confid = 'virtiofs' + i.toString();
+ if (!Ext.isDefined(me.conf[confid])) {
+ me.confid = confid;
+ break;
+ }
+ }
+ ipanel.setSharedfiles(me.confid, {});
+ }
+ },
+ });
+ },
+});
--
2.39.2
next prev parent reply other threads:[~2023-08-09 8:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-09 8:37 [pve-devel] [PATCH cluster/guest-common/docs/qemu-server/manager v6 0/11] virtiofs Markus Frank
2023-08-09 8:37 ` [pve-devel] [PATCH cluster v7 1/11] add mapping/dir.cfg for resource mapping Markus Frank
2023-08-09 8:37 ` [pve-devel] [PATCH guest-common v7 2/11] add Dir mapping config Markus Frank
2023-08-09 8:37 ` [pve-devel] [PATCH docs v7 3/11] added shared filesystem doc for virtio-fs Markus Frank
2023-10-05 8:56 ` Fabian Grünbichler
2023-08-09 8:37 ` [pve-devel] [PATCH qemu-server v7 4/11] feature #1027: virtio-fs support Markus Frank
2023-10-05 8:56 ` Fabian Grünbichler
2023-08-09 8:37 ` [pve-devel] [PATCH qemu-server v7 5/11] Permission check for virtiofs directory access Markus Frank
2023-10-05 8:56 ` Fabian Grünbichler
2023-08-09 8:37 ` [pve-devel] [PATCH qemu-server v7 6/11] check_local_resources: virtiofs Markus Frank
2023-08-09 8:37 ` [pve-devel] [PATCH manager v7 07/11] api: add resource map api endpoints for directories Markus Frank
2023-08-09 8:37 ` [pve-devel] [PATCH manager v7 08/11] ui: add edit window for dir mappings Markus Frank
2023-08-09 8:37 ` [pve-devel] [PATCH manager v7 09/11] ui: ResourceMapTree for DIR Markus Frank
2023-08-09 8:37 ` [pve-devel] [PATCH manager v7 10/11] ui: form: add DIRMapSelector Markus Frank
2023-08-09 8:37 ` Markus Frank [this message]
2023-10-05 8:57 ` [pve-devel] [PATCH cluster/guest-common/docs/qemu-server/manager v6 0/11] virtiofs Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230809083739.100024-12-m.frank@proxmox.com \
--to=m.frank@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.