From e39b2b3bab4ccca48a0586e34c9673486e481dca Mon Sep 17 00:00:00 2001 From: Aihua Liang Date: Tue, 18 Feb 2025 16:46:22 +0800 Subject: [PATCH] blockdev_inc_backup_inc_success:remove data-file remove data-file format when starting vm with backup images Signed-off-by: Aihua Liang --- qemu/tests/blockdev_inc_backup_after_commit.py | 3 +++ qemu/tests/blockdev_inc_backup_inc_success.py | 3 +++ qemu/tests/blockdev_inc_backup_with_guest_agent.py | 3 +++ qemu/tests/blockdev_inc_backup_with_migration.py | 3 +++ qemu/tests/blockdev_inc_backup_xpt_bitmap.py | 6 +++++- 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/qemu/tests/blockdev_inc_backup_after_commit.py b/qemu/tests/blockdev_inc_backup_after_commit.py index b9d43d68d8..1868ae137c 100644 --- a/qemu/tests/blockdev_inc_backup_after_commit.py +++ b/qemu/tests/blockdev_inc_backup_after_commit.py @@ -90,6 +90,9 @@ def clone_vm_with_incremental_images(self): params = self.main_vm.params.copy() images = [params.objects("images")[0]] + self._inc_bk_images params["images"] = " ".join(images) + # fix me if data-file support for backup images are requested + if params.get("enable_data_file"): + del params["enable_data_file"] self.clone_vm = self.main_vm.clone(params=params) self.clone_vm.create() diff --git a/qemu/tests/blockdev_inc_backup_inc_success.py b/qemu/tests/blockdev_inc_backup_inc_success.py index b61e93dcb5..e31532f49c 100644 --- a/qemu/tests/blockdev_inc_backup_inc_success.py +++ b/qemu/tests/blockdev_inc_backup_inc_success.py @@ -91,6 +91,9 @@ def clone_main_vm(self): self.main_vm.destroy() imgs = [self.params["images"].split()[0]] + self.inc_backup_tags self.params["images"] = " ".join(imgs) + # fix me if data-file support for backup images are requested + if self.params.get("enable_data_file"): + del self.params["enable_data_file"] self.prepare_main_vm() self.clone_vm = self.main_vm diff --git a/qemu/tests/blockdev_inc_backup_with_guest_agent.py b/qemu/tests/blockdev_inc_backup_with_guest_agent.py index e27e30c7f7..52a49082d0 100644 --- a/qemu/tests/blockdev_inc_backup_with_guest_agent.py +++ b/qemu/tests/blockdev_inc_backup_with_guest_agent.py @@ -58,6 +58,9 @@ def do_incremental_backup(self): def restart_vm_with_inc(self): images = self.params["images"] self.params["images"] = " ".join([images.split()[0]] + self.inc_backup_tags) + # fix me if data-file support for backup images are requested + if self.params.get("enable_data_file"): + del self.params["enable_data_file"] self.prepare_main_vm() self.clone_vm = self.main_vm self.params["images"] = images diff --git a/qemu/tests/blockdev_inc_backup_with_migration.py b/qemu/tests/blockdev_inc_backup_with_migration.py index b8aadb0a7d..89ccedb7ce 100644 --- a/qemu/tests/blockdev_inc_backup_with_migration.py +++ b/qemu/tests/blockdev_inc_backup_with_migration.py @@ -64,6 +64,9 @@ def do_incremental_backup(self): def restart_vm_with_inc(self): images = self.params["images"] self.params["images"] = " ".join([images.split()[0]] + self.inc_backup_tags) + # fix me if data-file support for backup images are requested + if self.params.get("enable_data_file"): + del self.params["enable_data_file"] self.prepare_main_vm() self.clone_vm = self.main_vm self.params["images"] = images diff --git a/qemu/tests/blockdev_inc_backup_xpt_bitmap.py b/qemu/tests/blockdev_inc_backup_xpt_bitmap.py index d6db548ffd..6b1c37093d 100644 --- a/qemu/tests/blockdev_inc_backup_xpt_bitmap.py +++ b/qemu/tests/blockdev_inc_backup_xpt_bitmap.py @@ -30,9 +30,13 @@ def _init_arguments_by_params(self, tag): self.bitmaps.append("bitmap_%s" % tag) image_params["nbd_export_bitmaps"] = "bitmap_%s" % tag self.nbd_exports.append(QemuNBDExportImage(image_params, tag)) + nbd_image_params = self.params.object_params(image_params["nbd_image_tag"]) + # fix me if data_file is supported for nbd expose image + if nbd_image_params.get("enable_data_file"): + del nbd_image_params["enable_data_file"] self.nbd_images.append( qemu_storage.QemuImg( - self.params.object_params(image_params["nbd_image_tag"]), + nbd_image_params, None, image_params["nbd_image_tag"], )