Merge pull request avocado-framework#3164 from yanan-fu/luks_F

qemu_storage: require -F with -b backing image
vipmike007 · Aug 11, 2021 · 332722d · 332722d
2 parents 455c7f9 + 553bf05
commit 332722d
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/virttest/qemu_storage.py b/virttest/qemu_storage.py
@@ -739,8 +739,7 @@ def create(self, params, ignore_errors=False):
                                        self.root_dir)
                 else:
                     cmd_dict["backing_file"] = self.base_image_filename
-                    if self.base_format:
-                        cmd_dict["backing_format"] = self.base_format
+                cmd_dict["backing_format"] = self.base_format
 
             # secret objects of the backing images
             secret_objects = self._backing_access_secret_objects
@@ -975,7 +974,7 @@ def rebase(self, params, cache_mode=None, source_cache_mode=None):
                         base_image.tag, base_image.params, base_image.root_dir)
                 else:
                     cmd_dict["backing_file"] = base_image.image_filename
-                    cmd_dict["backing_format"] = base_image.image_format
+                cmd_dict["backing_format"] = base_image.image_format
         else:
             raise exceptions.TestError("Can not find the image parameters need"
                                        " for rebase.")