From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Timothy Nicholson <t.nicholson@proxmox.com>
Subject: [pve-devel] applied: [PATCH manager v2] fix #5302: ui: vm cpu affinity displayed in hardware overview
Date: Wed, 16 Oct 2024 18:41:12 +0200 [thread overview]
Message-ID: <f307d9b3-0e9d-4711-961f-56e047abbe2f@proxmox.com> (raw)
In-Reply-To: <20241015091758.48629-1-t.nicholson@proxmox.com>
Am 15/10/2024 um 11:17 schrieb Timothy Nicholson:
> Signed-off-by: Timothy Nicholson <t.nicholson@proxmox.com>
> ---
> changes since v1:
> * fix javascript indentation
>
> www/manager6/qemu/HardwareView.js | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
>
applied, thanks!
FWIW, and definitively pre-exsiting, this rendered could be cleaned up and
condensed a bit, e.g. by doing something like:
----8<----
diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js
index 59e670db9..0b83a23f7 100644
--- a/www/manager6/qemu/HardwareView.js
+++ b/www/manager6/qemu/HardwareView.js
@@ -104,37 +104,27 @@ Ext.define('PVE.qemu.HardwareView', {
group: 3,
defaultValue: '1',
multiKey: ['sockets', 'cpu', 'cores', 'numa', 'vcpus', 'cpulimit', 'cpuunits', 'affinity'],
- renderer: function(value, metaData, record, rowIndex, colIndex, store, pending) {
- var sockets = me.getObjectValue('sockets', 1, pending);
- var model = me.getObjectValue('cpu', undefined, pending);
- var cores = me.getObjectValue('cores', 1, pending);
- var numa = me.getObjectValue('numa', undefined, pending);
- var vcpus = me.getObjectValue('vcpus', undefined, pending);
- var cpulimit = me.getObjectValue('cpulimit', undefined, pending);
- var cpuunits = me.getObjectValue('cpuunits', undefined, pending);
- var cpuaffinity = me.getObjectValue('affinity', undefined, pending);
+ renderer: function(_value, metaData, record, rowIndex, colIndex, store, pending) {
+ let sockets = me.getObjectValue('sockets', 1, pending);
+ let cores = me.getObjectValue('cores', 1, pending);
let res = Ext.String.format(
'{0} ({1} sockets, {2} cores)', sockets * cores, sockets, cores);
- if (model) {
- res += ' [' + model + ']';
- }
- if (numa) {
- res += ' [numa=' + numa +']';
- }
- if (vcpus) {
- res += ' [vcpus=' + vcpus +']';
- }
- if (cpulimit) {
- res += ' [cpulimit=' + cpulimit +']';
- }
- if (cpuunits) {
- res += ' [cpuunits=' + cpuunits +']';
- }
- if (cpuaffinity) {
- res += ' [cpuaffinity=' + cpuaffinity + ']';
- }
+ let renderKeyIfSet = (key, label, valueOnly) => {
+ let value = me.getObjectValue(key, undefined, pending);
+ if (value) {
+ label ??= key;
+ res += valueOnly ? ` [${value}]` : ` [${label}=${value}]`;
+ }
+ };
+
+ renderKeyIfSet('cpu', 'model', true);
+ renderKeyIfSet('numa');
+ renderKeyIfSet('vcpus');
+ renderKeyIfSet('cpulimit');
+ renderKeyIfSet('cpuunits');
+ renderKeyIfSet('affinity');
return res;
},
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
prev parent reply other threads:[~2024-10-16 16:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-15 9:17 [pve-devel] " Timothy Nicholson
2024-10-16 16:41 ` Thomas Lamprecht [this message]
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=f307d9b3-0e9d-4711-961f-56e047abbe2f@proxmox.com \
--to=t.lamprecht@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
--cc=t.nicholson@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