From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 45A281FF138 for ; Mon, 29 Jun 2026 14:46:41 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 5418621440; Mon, 29 Jun 2026 14:46:34 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH-SERIES qemu-server 0/3] fix #7743: api: disk import: avoid locking twice when importing from OVA or same VM Date: Mon, 29 Jun 2026 14:45:46 +0200 Message-ID: <20260629124625.115457-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1782737178432 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.009 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 Message-ID-Hash: ZNZK4W6P4WN74CWTXDNRFB6AH6IPRSVF X-Message-ID-Hash: ZNZK4W6P4WN74CWTXDNRFB6AH6IPRSVF X-MailFrom: f.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: When import_from_volid->() is called, the VM configuration of the destination VM is already locked. In case the source volume belongs to the same VM, there would be a second attempt to lock the config. In particular, this also happens when importing from OVA, because the source image is first extracted and belongs to the same VM. Additionally, the update VM API call is changed to fork before locking using the usual early+repeated checks pattern. qemu-server: Fiona Ebner (3): api: disk import: remove unused wrongly named variable fix #7743: api: disk import: avoid locking twice when importing from OVA or same VM api: update vm: fork before locking src/PVE/API2/Qemu.pm | 780 ++++++++++++++++++++++--------------------- 1 file changed, 397 insertions(+), 383 deletions(-) Summary over all repositories: 1 files changed, 397 insertions(+), 383 deletions(-) -- Generated by git-murpp 0.5.0