From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id CFDA71FF16B for ; Thu, 14 Nov 2024 16:09:41 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F00573449F; Thu, 14 Nov 2024 16:08:30 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 14 Nov 2024 16:07:28 +0100 Message-Id: <20241114150754.374376-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241114150754.374376-1-f.ebner@proxmox.com> References: <20241114150754.374376-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.056 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 qemu v4 01/27] PVE backup: add target ID in backup state 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" In preparation for allowing multiple backup providers and potentially multiple targets for a given provider. Each backup target can then have its own dirty bitmap and there can be additional checks that the current backup state is actually associated to the expected target. Signed-off-by: Fiona Ebner --- Changes in v4: * rename provider -> target in error message pve-backup.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pve-backup.c b/pve-backup.c index d931746453..78cebab4da 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -70,6 +70,7 @@ static struct PVEBackupState { JobTxn *txn; CoMutex backup_mutex; CoMutex dump_callback_mutex; + char *target_id; } backup_state; static void pvebackup_init(void) @@ -848,7 +849,7 @@ UuidInfo coroutine_fn *qmp_backup( if (backup_state.di_list) { error_set(errp, ERROR_CLASS_GENERIC_ERROR, - "previous backup not finished"); + "previous backup for target '%s' not finished", backup_state.target_id); qemu_co_mutex_unlock(&backup_state.backup_mutex); return NULL; } @@ -1100,6 +1101,11 @@ UuidInfo coroutine_fn *qmp_backup( backup_state.vmaw = vmaw; backup_state.pbs = pbs; + if (backup_state.target_id) { + g_free(backup_state.target_id); + } + backup_state.target_id = g_strdup("Proxmox"); + backup_state.di_list = di_list; uuid_info = g_malloc0(sizeof(*uuid_info)); -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel