[libvirt PATCH 3/3] virsh: Wire up VIR_MIGRATE_ASSUME_SHARED_STORAGE support
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
docs/manpages/virsh.rst | 5 ++++-
tools/virsh-domain.c | 5 +++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst
index 3e7a4c6c22..849933fa2e 100644
--- a/docs/manpages/virsh.rst
+++ b/docs/manpages/virsh.rst
@@ -3382,6 +3382,7 @@ migrate
[--parallel [--parallel-connections connections]]
[--bandwidth bandwidth] [--tls-destination hostname]
[--disks-uri URI] [--copy-storage-synchronous-writes]
+ [--assume-shared-storage]
Migrate domain to another host. Add *--live* for live migration; <--p2p>
for peer-2-peer migration; *--direct* for direct migration; or *--tunnelled*
@@ -3461,7 +3462,9 @@ considered unsafe. For QEMU domain, this may happen if the domain
uses disks
without explicitly setting cache mode to "none". Migrating such domains is
unsafe unless the disk images are stored on coherent clustered filesystem,
such as GFS2 or GPFS. If you are sure the migration is safe or you just do not
-care, use *--unsafe* to force the migration.
+care, use *--unsafe* to force the migration. *--assume-shared-storage* is a
+weaker version of *--unsafe* which allows migration if the source disk is
+detected as local while retaining all other checks.
*dname* is used for renaming the domain to new name during migration, which
also usually can be omitted. Likewise, *--xml* ``file`` is usually
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 66f933dead..cccf079c34 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -11128,6 +11128,10 @@ static const vshCmdOptDef opts_migrate[] = {
.type = VSH_OT_INT,
.help = N_("compress level for zstd compression")
},
+ {.name = "assume-shared-storage",
+ .type = VSH_OT_BOOL,
+ .help = N_("assume that disk storage is shared even if libvirt detects it as
local")
+ },
{.name = NULL}
};
@@ -11177,6 +11181,7 @@ doMigrate(void *opaque)
{ "tls", VIR_MIGRATE_TLS },
{ "parallel", VIR_MIGRATE_PARALLEL },
{ "suspend", VIR_MIGRATE_PAUSED },
+ { "assume-shared-storage", VIR_MIGRATE_ASSUME_SHARED_STORAGE },
};
#ifndef WIN32
--
2.41.0