Re: [PATCH 03/18] migration: RDMA is not compatible with anything else

2023-06-22 Thread Lukas Straub
On Tue, 13 Jun 2023 16:57:42 +0200
Juan Quintela  wrote:

> So give an error instead of just ignoring the other methods.
> 
> Signed-off-by: Juan Quintela 

Reviewed-by: Lukas Straub 

> ---
>  migration/migration.c | 12 
>  1 file changed, 12 insertions(+)
> 
> diff --git a/migration/migration.c b/migration/migration.c
> index dc05c6f6ea..84551f040c 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -436,6 +436,18 @@ static void qemu_start_incoming_migration(const char 
> *uri, Error **errp)
>  socket_start_incoming_migration(p ? p : uri, errp);
>  #ifdef CONFIG_RDMA
>  } else if (strstart(uri, "rdma:", &p)) {
> +if (migrate_compress()) {
> +error_setg(errp, "RDMA and compression can't be used together");
> +return;
> +}
> +if (migrate_xbzrle()) {
> +error_setg(errp, "RDMA and XBZRLE can't be used together");
> +return;
> +}
> +if (migrate_multifd()) {
> +error_setg(errp, "RDMA and multifd can't be used together");
> +return;
> +}
>  rdma_start_incoming_migration(p, errp);
>  #endif
>  } else if (strstart(uri, "exec:", &p)) {



pgpgZCKRQl6cS.pgp
Description: OpenPGP digital signature


[PATCH 03/18] migration: RDMA is not compatible with anything else

2023-06-13 Thread Juan Quintela
So give an error instead of just ignoring the other methods.

Signed-off-by: Juan Quintela 
---
 migration/migration.c | 12 
 1 file changed, 12 insertions(+)

diff --git a/migration/migration.c b/migration/migration.c
index dc05c6f6ea..84551f040c 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -436,6 +436,18 @@ static void qemu_start_incoming_migration(const char *uri, 
Error **errp)
 socket_start_incoming_migration(p ? p : uri, errp);
 #ifdef CONFIG_RDMA
 } else if (strstart(uri, "rdma:", &p)) {
+if (migrate_compress()) {
+error_setg(errp, "RDMA and compression can't be used together");
+return;
+}
+if (migrate_xbzrle()) {
+error_setg(errp, "RDMA and XBZRLE can't be used together");
+return;
+}
+if (migrate_multifd()) {
+error_setg(errp, "RDMA and multifd can't be used together");
+return;
+}
 rdma_start_incoming_migration(p, errp);
 #endif
 } else if (strstart(uri, "exec:", &p)) {
-- 
2.40.1