From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 pve-manager 2/2] ui: qemu : memoryedit: add new max && virtio fields
Date: Mon, 19 Jun 2023 09:28:33 +0200 [thread overview]
Message-ID: <20230619072841.38531-5-aderumier@odiso.com> (raw)
In-Reply-To: <20230619072841.38531-1-aderumier@odiso.com>
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
www/manager6/qemu/MemoryEdit.js | 52 +++++++++++++++++++++++++++------
1 file changed, 43 insertions(+), 9 deletions(-)
diff --git a/www/manager6/qemu/MemoryEdit.js b/www/manager6/qemu/MemoryEdit.js
index 5e91dc9b..be7903a2 100644
--- a/www/manager6/qemu/MemoryEdit.js
+++ b/www/manager6/qemu/MemoryEdit.js
@@ -20,12 +20,12 @@ Ext.define('PVE.qemu.MemoryInputPanel', {
let me = this;
let view = me.getView(), viewModel = me.getViewModel();
if (view.insideWizard) {
- let memory = view.down('pveMemoryField[name=memory]');
+ let current = view.down('pveMemoryField[name=current]');
// NOTE: we only set memory but that then sets balloon in its change handler
if (viewModel.get('current.ostype') === 'win11') {
- memory.setValue('4096');
+ current.setValue('4096');
} else {
- memory.setValue('2048');
+ current.setValue('2048');
}
}
},
@@ -36,13 +36,23 @@ Ext.define('PVE.qemu.MemoryInputPanel', {
var res = {};
- res.memory = values.memory;
+ let memory = {};
+ memory.current = values.current;
+ if (values.max && values.max !== 0) {
+ memory.max = values.max;
+ }
+ if (values.virtio) {
+ memory.virtio = values.virtio;
+ }
+
+ res.memory = PVE.Parser.printPropertyString(memory, 'current');
+
res.balloon = values.balloon;
if (!values.ballooning) {
res.balloon = 0;
res.delete = 'shares';
- } else if (values.memory === values.balloon) {
+ } else if (values.current === values.balloon) {
delete res.balloon;
res.delete = 'balloon,shares';
} else if (Ext.isDefined(values.shares) && values.shares !== "") {
@@ -63,7 +73,7 @@ Ext.define('PVE.qemu.MemoryInputPanel', {
xtype: 'pveMemoryField',
labelWidth: labelWidth,
fieldLabel: gettext('Memory') + ' (MiB)',
- name: 'memory',
+ name: 'current',
value: '512', // better defaults get set via the view controllers afterrender
minValue: 1,
step: 32,
@@ -96,12 +106,25 @@ Ext.define('PVE.qemu.MemoryInputPanel', {
allowBlank: false,
listeners: {
change: function(f, value) {
- var memory = me.down('field[name=memory]').getValue();
+ var memory = me.down('field[name=current]').getValue();
var shares = me.down('field[name=shares]');
shares.setDisabled(value === memory);
},
},
},
+ {
+ xtype: 'pveMemoryField',
+ name: 'max',
+ minValue: 65536,
+ maxValue: 4194304,
+ value: '',
+ step: 65536,
+ fieldLabel: gettext('Maximum memory') + ' (MiB)',
+ labelWidth: labelWidth,
+ allowBlank: true,
+ emptyText: gettext('Disabled'),
+ submitEmptyText: false,
+ },
{
xtype: 'proxmoxintegerfield',
name: 'shares',
@@ -132,6 +155,13 @@ Ext.define('PVE.qemu.MemoryInputPanel', {
},
},
},
+ {
+ xtype: 'proxmoxcheckbox',
+ labelWidth: labelWidth,
+ name: 'virtio',
+ defaultValue: 0,
+ fieldLabel: gettext('Virtiomem'),
+ },
];
if (me.insideWizard) {
@@ -178,11 +208,15 @@ Ext.define('PVE.qemu.MemoryEdit', {
success: function(response, options) {
var data = response.result.data;
+ let memory = PVE.Parser.parsePropertyString(data.memory, 'current');
+
var values = {
ballooning: data.balloon === 0 ? '0' : '1',
shares: data.shares,
- memory: data.memory || '512',
- balloon: data.balloon > 0 ? data.balloon : data.memory || '512',
+ current: memory.current || '512',
+ max: memory.max || '',
+ virtio: memory.virtio,
+ balloon: data.balloon > 0 ? data.balloon : memory.current || '512',
};
ipanel.setValues(values);
--
2.39.2
next prev parent reply other threads:[~2023-06-19 7:29 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-19 7:28 [pve-devel] [PATCH-SERIE v6 qemu-server/pve-manager] rework memory hotplug + virtiomem Alexandre Derumier
2023-06-19 7:28 ` [pve-devel] [PATCH v6 qemu-server 01/10] add memory parser Alexandre Derumier
2023-09-01 10:23 ` Fiona Ebner
2023-06-19 7:28 ` [pve-devel] [PATCH v2 pve-manager 1/2] ui: qemu: hardware: add new memory format support Alexandre Derumier
2023-06-19 7:28 ` [pve-devel] [PATCH v6 qemu-server 02/10] memory: add get_static_mem Alexandre Derumier
2023-06-19 7:28 ` Alexandre Derumier [this message]
2023-09-01 9:48 ` [pve-devel] [PATCH v2 pve-manager 2/2] ui: qemu : memoryedit: add new max && virtio fields Thomas Lamprecht
2023-09-01 10:24 ` Fiona Ebner
2023-09-02 6:18 ` DERUMIER, Alexandre
2023-09-04 10:48 ` Fiona Ebner
2023-09-04 11:40 ` Thomas Lamprecht
2023-09-04 11:48 ` Fiona Ebner
2023-09-05 15:10 ` DERUMIER, Alexandre
2023-09-05 15:16 ` Thomas Lamprecht
2023-09-05 22:35 ` DERUMIER, Alexandre
2024-07-08 15:10 ` Fiona Ebner
2024-07-09 9:38 ` DERUMIER, Alexandre via pve-devel
2023-06-19 7:28 ` [pve-devel] [PATCH v6 qemu-server 03/10] memory: use static_memory in foreach_dimm Alexandre Derumier
2023-09-01 11:39 ` [pve-devel] applied: " Fiona Ebner
2023-06-19 7:28 ` [pve-devel] [PATCH v6 qemu-server 04/10] config: memory: add 'max' option Alexandre Derumier
2023-06-19 7:28 ` [pve-devel] [PATCH v6 qemu-server 05/10] memory: get_max_mem: use config memory max Alexandre Derumier
2023-06-19 7:28 ` [pve-devel] [PATCH v6 qemu-server 06/10] memory: use 64 slots && static dimm size when max is defined Alexandre Derumier
2023-06-19 7:28 ` [pve-devel] [PATCH v6 qemu-server 07/10] test: add memory-max tests Alexandre Derumier
2023-06-19 7:28 ` [pve-devel] [PATCH v6 qemu-server 08/10] memory: add virtio-mem support Alexandre Derumier
2023-06-19 7:28 ` [pve-devel] [PATCH v6 qemu-server 09/10] memory: virtio-mem : implement redispatch retry Alexandre Derumier
2023-06-19 7:28 ` [pve-devel] [PATCH v6 qemu-server 10/10] tests: add virtio-mem tests Alexandre Derumier
2023-09-01 12:24 ` [pve-devel] [PATCH-SERIE v6 qemu-server/pve-manager] rework memory hotplug + virtiomem Fiona Ebner
[not found] ` <CAOKSTBveZE6K6etnDESKXBt1_XpDYUMGpr12qQPyuv0beDRcQw@mail.gmail.com>
2023-09-01 16:30 ` DERUMIER, Alexandre
2023-09-01 16:32 ` DERUMIER, Alexandre
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=20230619072841.38531-5-aderumier@odiso.com \
--to=aderumier@odiso.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox