qemu: block: Extract code for adding NBD exports to 'qemuBlockExportAddNBD'

Centralize the logic deciding which arguments to use when exporting a
block backend via NBD to a single place so that it can be centrally
fixed in upcoming commits to support the new export method via
'block-export-add'.

Additionally this allows simplification of the caller from migration as
the logic deciding which arguments to use is extracted too.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
index 4e61a5e52b93903b874b7f7f2e4fba379004cd95..5376d9485d945b949ded9fca664c27a0ee8a3935 100644 (file)
--- a/src/qemu/qemu_backup.c
+++ b/src/qemu/qemu_backup.c
@@ -502,7 +502,6 @@ qemuBackupBeginPullExportDisks(virDomainObjPtr vm,
                                struct qemuBackupDiskData *disks,
                                size_t ndisks)
 {
-    qemuDomainObjPrivatePtr priv = vm->privateData;
     size_t i;
 
     for (i = 0; i < ndisks; i++) {
@@ -511,11 +510,11 @@ qemuBackupBeginPullExportDisks(virDomainObjPtr vm,
         if (!dd->backupdisk->exportname)
             dd->backupdisk->exportname = g_strdup(dd->domdisk->dst);
 
-        if (qemuMonitorNBDServerAdd(priv->mon,
-                                    dd->store->nodeformat,
-                                    dd->backupdisk->exportname,
-                                    false,
-                                    dd->incrementalBitmap) < 0)
+        if (qemuBlockExportAddNBD(vm, NULL,
+                                  dd->store,
+                                  dd->backupdisk->exportname,
+                                  false,
+                                  dd->incrementalBitmap) < 0)
             return -1;
     }
 

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 6bea21347a79244951c57ed5e5ec8f5507566180..0be612eb1fa19190c8dd6d52fefb76b9bce84a81 100644 (file)
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -3363,3 +3363,41 @@ qemuBlockUpdateRelativeBacking(virDomainObjPtr vm,
 
     return 0;
 }
+
+
+/**
+ * qemuBlockExportAddNBD:
+ * @vm: domain object
+ * @drivealias: (optional) alias of -drive to export in pre-blockdev configurations
+ * @src: disk source to export
+ * @exportname: name for the export
+ * @writable: whether the NBD export allows writes
+ * @bitmap: (optional) block dirty bitmap to export along
+ *
+ * This function automatically selects the proper invocation of exporting a
+ * block backend via NBD in qemu. This includes use of nodename for blockdev
+ * and proper configuration for the exportname for older qemus.
+ *
+ * This function must be called while in the monitor context.
+ */
+int
+qemuBlockExportAddNBD(virDomainObjPtr vm,
+                      const char *drivealias,
+                      virStorageSourcePtr src,
+                      const char *exportname,
+                      bool writable,
+                      const char *bitmap)
+{
+    qemuDomainObjPrivatePtr priv = vm->privateData;
+    const char *exportsrc = drivealias;
+
+    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) {
+        exportsrc = src->nodeformat;
+    } else {
+        /* older qemu versions didn't support configuring the exportname and
+         * took the 'drivealias' as the export name */
+        exportname = NULL;
+    }
+
+    return qemuMonitorNBDServerAdd(priv->mon, exportsrc, exportname, writable, bitmap);
+}

diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
index 0701fc18d12297f24f2633c635bf5523cd86b7fa..0fc95fa6f600d2fa25e2313b6aad6f6262c83474 100644 (file)
--- a/src/qemu/qemu_block.h
+++ b/src/qemu/qemu_block.h
@@ -276,3 +276,11 @@ int
 qemuBlockUpdateRelativeBacking(virDomainObjPtr vm,
                                virStorageSourcePtr src,
                                virStorageSourcePtr topsrc);
+
+int
+qemuBlockExportAddNBD(virDomainObjPtr vm,
+                      const char *drivealias,
+                      virStorageSourcePtr src,
+                      const char *exportname,
+                      bool writable,
+                      const char *bitmap);

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 4e959abebf4b8330572db9b30ce2f6070368b735..132545c99f7546c0ec6eefd5c5c6d5cc03211fd1 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -445,8 +445,6 @@ qemuMigrationDstStartNBDServer(virQEMUDriverPtr driver,
     for (i = 0; i < vm->def->ndisks; i++) {
         virDomainDiskDefPtr disk = vm->def->disks[i];
         g_autofree char *diskAlias = NULL;
-        const char *exportname = NULL;
-        const char *devicename = NULL;
 
         /* check whether disk should be migrated */
         if (!qemuMigrationAnyCopyDisk(disk, nmigrate_disks, migrate_disks))
@@ -462,14 +460,6 @@ qemuMigrationDstStartNBDServer(virQEMUDriverPtr driver,
         if (!(diskAlias = qemuAliasDiskDriveFromDisk(disk)))
             goto cleanup;
 
-        if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) {
-            exportname = diskAlias;
-            devicename = disk->src->nodeformat;
-        } else {
-            exportname = NULL;
-            devicename = diskAlias;
-        }
-
         if (!server_started &&
             server.transport == VIR_STORAGE_NET_HOST_TRANS_TCP) {
             if (server.port) {
@@ -493,7 +483,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriverPtr driver,
             qemuMonitorNBDServerStart(priv->mon, &server, tls_alias) < 0)
             goto exit_monitor;
 
-        if (qemuMonitorNBDServerAdd(priv->mon, devicename, exportname, true, NULL) < 0)
+        if (qemuBlockExportAddNBD(vm, diskAlias, disk->src, diskAlias, true, NULL) < 0)
             goto exit_monitor;
         if (qemuDomainObjExitMonitor(driver, vm) < 0)
             goto cleanup;