From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id D30021FF16B for <inbox@lore.proxmox.com>; Thu, 3 Apr 2025 14:32:18 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5F7FF3F9EA; Thu, 3 Apr 2025 14:31:30 +0200 (CEST) From: Wolfgang Bumiller <w.bumiller@proxmox.com> To: pve-devel@lists.proxmox.com Date: Thu, 3 Apr 2025 14:30:50 +0200 Message-Id: <20250403123118.264974-11-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250403123118.264974-1-w.bumiller@proxmox.com> References: <20250403123118.264974-1-w.bumiller@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.079 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 v8 qemu 10/10] PVE backup: backup-access-api: explicit bitmap-mode parameter X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> This allows to explicitly request to re-create a bitmap under the same name. Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com> --- New in v8 pve-backup.c | 17 ++++++++++++++++- qapi/block-core.json | 20 +++++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/pve-backup.c b/pve-backup.c index 8909842292..18bcf29533 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -1043,7 +1043,16 @@ BackupAccessInfoList *coroutine_fn qmp_backup_access_setup( error_propagate(errp, local_err); goto err; } - di->requested_bitmap_name = g_strdup(it->value->bitmap_name); + if (it->value->bitmap_mode == BACKUP_ACCESS_SETUP_BITMAP_MODE_NONE) { + di->bitmap_action = PBS_BITMAP_ACTION_NOT_USED; + } else { + di->requested_bitmap_name = g_strdup(it->value->bitmap_name); + if (it->value->bitmap_mode == BACKUP_ACCESS_SETUP_BITMAP_MODE_NEW) { + di->bitmap_action = PBS_BITMAP_ACTION_NEW; + } else if (it->value->bitmap_mode == BACKUP_ACCESS_SETUP_BITMAP_MODE_USE) { + di->bitmap_action = PBS_BITMAP_ACTION_USED; + } + } di_list = g_list_append(di_list, di); } bdrv_graph_co_rdunlock(); @@ -1096,6 +1105,12 @@ BackupAccessInfoList *coroutine_fn qmp_backup_access_setup( && di->requested_bitmap_name && strcmp(di->requested_bitmap_name, old_bitmap_name) == 0; + /* special case: if we explicitly requested a *new* bitmap, treat an + * existing bitmap as having a different name */ + if (di->bitmap_action == PBS_BITMAP_ACTION_NEW) { + same_bitmap_name = false; + } + if (old_bitmap_name && !same_bitmap_name) { BdrvDirtyBitmap *old_bitmap = bdrv_find_dirty_bitmap(di->bs, old_bitmap_name); if (!old_bitmap) { diff --git a/qapi/block-core.json b/qapi/block-core.json index 58586170d9..e1c79649fb 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1145,9 +1145,27 @@ # in the result to see if you can actually re-use the bitmap or if it had to # be newly created. # +# @bitmap-mode: used to control whether the bitmap should be reused or +# recreated. +# ## { 'struct': 'BackupAccessSourceDevice', - 'data': { 'device': 'str', '*bitmap-name': 'str' } } + 'data': { 'device': 'str', '*bitmap-name': 'str', + '*bitmap-mode': 'BackupAccessSetupBitmapMode' } } + +## +# @BackupAccessSetupBitmapMode: +# +# How to setup a bitmap for a device for @backup-access-setup. +# +# @none: do not use a bitmap. Removes an existing bitmap if present. +# +# @new: create and use a new bitmap. +# +# @use: try to re-use an existing bitmap. Create a new one if it doesn't exist. +## +{ 'enum': 'BackupAccessSetupBitmapMode', + 'data': ['none', 'new', 'use' ] } ## # @backup-access-setup: -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel