|
|
fbe740 |
From ca5b0a17880bd76c2965e86fa6b6ee93dec204b9 Mon Sep 17 00:00:00 2001
|
|
|
fbe740 |
Message-Id: <ca5b0a17880bd76c2965e86fa6b6ee93dec204b9@dist-git>
|
|
|
fbe740 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
fbe740 |
Date: Tue, 4 Feb 2020 15:07:41 +0100
|
|
|
fbe740 |
Subject: [PATCH] qemu: backup: Implement support for backup disk export name
|
|
|
fbe740 |
configuration
|
|
|
fbe740 |
MIME-Version: 1.0
|
|
|
fbe740 |
Content-Type: text/plain; charset=UTF-8
|
|
|
fbe740 |
Content-Transfer-Encoding: 8bit
|
|
|
fbe740 |
|
|
|
fbe740 |
Pass the exportname as configured when exporting the image via NBD and
|
|
|
fbe740 |
fill it with the default if it's not configured.
|
|
|
fbe740 |
|
|
|
fbe740 |
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
|
fbe740 |
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
|
|
|
fbe740 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
fbe740 |
(cherry picked from commit bce4ac55f8d3df9d649c74d2f35feeaad4422028)
|
|
|
fbe740 |
|
|
|
fbe740 |
https://bugzilla.redhat.com/show_bug.cgi?id=1207659
|
|
|
fbe740 |
Message-Id: <de4d8ed67fa09ec4016bcafb818f9ab704afb305.1580824112.git.pkrempa@redhat.com>
|
|
|
fbe740 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
fbe740 |
---
|
|
|
fbe740 |
src/qemu/qemu_backup.c | 5 ++++-
|
|
|
fbe740 |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
fbe740 |
|
|
|
fbe740 |
diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
|
|
|
fbe740 |
index c47de2f4a8..2cc0e6ab07 100644
|
|
|
fbe740 |
--- a/src/qemu/qemu_backup.c
|
|
|
fbe740 |
+++ b/src/qemu/qemu_backup.c
|
|
|
fbe740 |
@@ -548,9 +548,12 @@ qemuBackupBeginPullExportDisks(virDomainObjPtr vm,
|
|
|
fbe740 |
for (i = 0; i < ndisks; i++) {
|
|
|
fbe740 |
struct qemuBackupDiskData *dd = disks + i;
|
|
|
fbe740 |
|
|
|
fbe740 |
+ if (!dd->backupdisk->exportname)
|
|
|
fbe740 |
+ dd->backupdisk->exportname = g_strdup(dd->domdisk->dst);
|
|
|
fbe740 |
+
|
|
|
fbe740 |
if (qemuMonitorNBDServerAdd(priv->mon,
|
|
|
fbe740 |
dd->store->nodeformat,
|
|
|
fbe740 |
- dd->domdisk->dst,
|
|
|
fbe740 |
+ dd->backupdisk->exportname,
|
|
|
fbe740 |
false,
|
|
|
fbe740 |
dd->incrementalBitmap) < 0)
|
|
|
fbe740 |
return -1;
|
|
|
fbe740 |
--
|
|
|
fbe740 |
2.25.0
|
|
|
fbe740 |
|