[PATCH v3 1/2] qemu: Allow migration over UNIX socket

Jiri Denemark jdenemar at redhat.com
Fri Sep 4 15:57:46 UTC 2020


On Fri, Sep 04, 2020 at 10:58:45 +0200, Martin Kletzander wrote:
> This allows:
> 
>  a) migration without access to network
> 
>  b) complete control of the migration stream
> 
>  c) easy migration between containerised libvirt daemons on the same host
> 
> Resolves: https://bugzilla.redhat.com/1638889
> 
> Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
> ---
>  docs/manpages/virsh.rst          |  13 ++-
>  docs/migration.html.in           |  33 ++++++++
>  src/qemu/qemu_driver.c           |  22 ++++-
>  src/qemu/qemu_migration.c        | 138 +++++++++++++++++++++++--------
>  src/qemu/qemu_migration_params.c |   9 ++
>  src/qemu/qemu_migration_params.h |   3 +
>  src/qemu/qemu_monitor.c          |  15 ++++
>  src/qemu/qemu_monitor.h          |   4 +
>  8 files changed, 198 insertions(+), 39 deletions(-)
...
> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> index f3870b3c0b9d..f862942f87f9 100644
> --- a/src/qemu/qemu_migration.c
> +++ b/src/qemu/qemu_migration.c
...
> @@ -3684,6 +3715,14 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
>      if (migrate_flags & (QEMU_MONITOR_MIGRATE_NON_SHARED_DISK |
>                           QEMU_MONITOR_MIGRATE_NON_SHARED_INC)) {
>          if (mig->nbd) {
> +            const char *host = "";
> +
> +            if (spec->destType == MIGRATION_DEST_HOST ||
> +                spec->destType == MIGRATION_DEST_CONNECT_HOST) {
> +                host = spec->dest.host.name;
> +            }
> +
> +

One empty line would be enough :-)

>              /* Currently libvirt does not support setting up of the NBD
>               * non-shared storage migration with TLS. As we need to honour the
>               * VIR_MIGRATE_TLS flag, we need to reject such migration until
...

Reviewed-by: Jiri Denemark <jdenemar at redhat.com>




More information about the libvir-list mailing list