[v1] Migration compression cleanup

[PATCH 02/18] migration: Give one error if trying to set COMPRESSION and XBZRLE

Posted by Juan Quintela 2 years, 8 months ago

As we have disable to use both together in the previous patch, we can
remove this check.

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/options.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/migration/options.c b/migration/options.c
index c6674a4753..a18689c314 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -554,6 +554,13 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp)
         }
     }
 
+    if (new_caps[MIGRATION_CAPABILITY_COMPRESS]) {
+        if (new_caps[MIGRATION_CAPABILITY_XBZRLE]) {
+            error_setg(errp, "Compression is not compatible with xbzrle");
+            return false;
+        }
+    }
+
     return true;
 }
 
-- 
2.40.1

Re: [PATCH 02/18] migration: Give one error if trying to set COMPRESSION and XBZRLE

Posted by Lukas Straub 2 years, 7 months ago

On Tue, 13 Jun 2023 16:57:41 +0200
Juan Quintela <quintela@redhat.com> wrote:

> As we have disable to use both together in the previous patch, we can
> remove this check.

This commit message is off.

>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  migration/options.c | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/migration/options.c b/migration/options.c
> index c6674a4753..a18689c314 100644
> --- a/migration/options.c
> +++ b/migration/options.c
> @@ -554,6 +554,13 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp)
>          }
>      }
>
> +    if (new_caps[MIGRATION_CAPABILITY_COMPRESS]) {
> +        if (new_caps[MIGRATION_CAPABILITY_XBZRLE]) {
> +            error_setg(errp, "Compression is not compatible with xbzrle");
> +            return false;
> +        }
> +    }
> +
>      return true;
>  }
>