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 D55789423F for ; Wed, 10 Apr 2024 13:04:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 24308CDAE for ; Wed, 10 Apr 2024 13:04:10 +0200 (CEST) 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 ; Wed, 10 Apr 2024 13:04:08 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C671D43C88 for ; Wed, 10 Apr 2024 13:04:05 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 10 Apr 2024 13:03:59 +0200 Message-Id: <20240410110401.2226201-21-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240410110401.2226201-1-d.csapak@proxmox.com> References: <20240410110401.2226201-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.014 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 manager v2 5/5] fix #5175: ui: allow configuring and live migration of mapped pci resources 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: Wed, 10 Apr 2024 11:04:42 -0000 if the hardware/driver is capable, the admin can now mark a pci device as 'live-migration-capable', which then tries enabling live migration for such devices. mark it as experimental when configuring and in the migrate window Signed-off-by: Dominik Csapak --- www/manager6/window/Migrate.js | 25 ++++++++++++++++++++----- www/manager6/window/PCIMapEdit.js | 12 ++++++++++++ 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/www/manager6/window/Migrate.js b/www/manager6/window/Migrate.js index c553a1ee..272ab022 100644 --- a/www/manager6/window/Migrate.js +++ b/www/manager6/window/Migrate.js @@ -244,10 +244,10 @@ Ext.define('PVE.window.Migrate', { } let blockingResources = []; - let mappedResources = migrateStats['mapped-resources'] ?? []; + let mappedResources = migrateStats['mapped-resource-info'] ?? {}; for (const res of migrateStats.local_resources) { - if (mappedResources.indexOf(res) === -1) { + if (!mappedResources[res]) { blockingResources.push(res); } } @@ -271,14 +271,29 @@ Ext.define('PVE.window.Migrate', { } } - if (mappedResources && mappedResources.length) { - if (vm.get('running')) { + if (mappedResources && vm.get('running')) { + let allowed = []; + let notAllowed = []; + for (const [key, resource] of Object.entries(mappedResources)) { + if (resource['live-migration']) { + allowed.push(key); + } else { + notAllowed.push(key); + } + } + if (notAllowed.length > 0) { migration.possible = false; migration.preconditions.push({ text: Ext.String.format('Can\'t migrate running VM with mapped resources: {0}', - mappedResources.join(', ')), + notAllowed.join(', ')), severity: 'error', }); + } else if (allowed.length > 0) { + migration.preconditions.push({ + text: Ext.String.format('Live-migrating running VM with mapped resources (Experimental): {0}', + allowed.join(', ')), + severity: 'warning', + }); } } diff --git a/www/manager6/window/PCIMapEdit.js b/www/manager6/window/PCIMapEdit.js index d43f04eb..731269a0 100644 --- a/www/manager6/window/PCIMapEdit.js +++ b/www/manager6/window/PCIMapEdit.js @@ -242,6 +242,18 @@ Ext.define('PVE.window.PCIMapEditWindow', { disabled: '{hideComment}', }, }, + { + xtype: 'proxmoxcheckbox', + fieldLabel: gettext('Live Migration Capable'), + labelWidth: 200, + boxLabel: ` ${gettext('Experimental')}`, + reference: 'live-migration-capable', + name: 'live-migration-capable', + cbind: { + deleteEmpty: '{!isCreate}', + disabled: '{hideComment}', + }, + }, ], columnB: [ -- 2.39.2