Am 13.02.25 um 14:17 schrieb Dominik Csapak:
> 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 <d.csa...@proxmox.com>
Reviewed-by: Fiona Ebner <f.eb...@proxmox.com>
> ---
> no changes in v6
> 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 604b63e7..46fc0cf3 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')) {
Correct me if I'm wrong, but doesn't mappedResources always evaluate to
true because it's {} (and same was true for [])? To get the same as
before, don't you need to check the number of keys now? But I suppose
the code handles the case where it's empty just fine, so we could also
skip that check.
> + 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 faf58255..9f2ea651 100644
> --- a/www/manager6/window/PCIMapEdit.js
> +++ b/www/manager6/window/PCIMapEdit.js
> @@ -244,6 +244,18 @@ Ext.define('PVE.window.PCIMapEditWindow', {
> disabled: '{hideComment}',
> },
> },
> + {
> + xtype: 'proxmoxcheckbox',
> + fieldLabel: gettext('Live Migration Capable'),
> + labelWidth: 200,
> + boxLabel: `<i class="fa fa-exclamation-triangle
> warning"></i> ${gettext('Experimental')}`,
> + reference: 'live-migration-capable',
> + name: 'live-migration-capable',
> + cbind: {
> + deleteEmpty: '{!isCreate}',
> + disabled: '{hideComment}',
Pre-existing above, but might be better to rename the 'hideComment' if
we reuse it for different things.
> + },
> + },
> ],
>
> columnB: [
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
