[PATCH 01/13] qemu: command: Fix name of qemuBuildMemoryBackendStr

[Peter Krempa <pkrempa@xxxxxxxxxx>]

The function generates JSON properties rather than a string so rename
it.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/qemu/qemu_command.c | 26 +++++++++++++-------------
 src/qemu/qemu_command.h | 16 ++++++++--------
 src/qemu/qemu_hotplug.c |  4 ++--
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 07fa35c6b3..39dcd1cfba 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2941,7 +2941,7 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd,


 /**
- * qemuBuildMemoryBackendStr:
+ * qemuBuildMemoryBackendProps:
  * @backendProps: [out] constructed object
  * @backendType: [out] type of the backennd used
  * @cfg: qemu driver config object
@@ -2967,14 +2967,14 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd,
  *         -1 on error.
  */
 int
-qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps,
-                          const char **backendType,
-                          virQEMUDriverConfigPtr cfg,
-                          virQEMUCapsPtr qemuCaps,
-                          virDomainDefPtr def,
-                          virDomainMemoryDefPtr mem,
-                          virBitmapPtr autoNodeset,
-                          bool force)
+qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
+                            const char **backendType,
+                            virQEMUDriverConfigPtr cfg,
+                            virQEMUCapsPtr qemuCaps,
+                            virDomainDefPtr def,
+                            virDomainMemoryDefPtr mem,
+                            virBitmapPtr autoNodeset,
+                            bool force)
 {
     virDomainNumatuneMemMode mode;
     const long system_page_size = virGetSystemPageSizeKB();
@@ -3225,8 +3225,8 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def,
     mem.targetNode = cell;
     mem.info.alias = alias;

-    if ((rc = qemuBuildMemoryBackendStr(&props, &backendType, cfg, priv->qemuCaps,
-                                        def, &mem, priv->autoNodeset, false)) < 0)
+    if ((rc = qemuBuildMemoryBackendProps(&props, &backendType, cfg, priv->qemuCaps,
+                                          def, &mem, priv->autoNodeset, false)) < 0)
         goto cleanup;

     if (!(*backendStr = virQEMUBuildObjectCommandlineFromJSON(backendType,
@@ -3264,8 +3264,8 @@ qemuBuildMemoryDimmBackendStr(virDomainMemoryDefPtr mem,
     if (virAsprintf(&alias, "mem%s", mem->info.alias) < 0)
         goto cleanup;

-    if (qemuBuildMemoryBackendStr(&props, &backendType, cfg, priv->qemuCaps,
-                                  def, mem, priv->autoNodeset, true) < 0)
+    if (qemuBuildMemoryBackendProps(&props, &backendType, cfg, priv->qemuCaps,
+                                    def, mem, priv->autoNodeset, true) < 0)
         goto cleanup;

     ret = virQEMUBuildObjectCommandlineFromJSON(backendType, alias, props);
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index bbbf152660..2b2168d1ee 100644
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -119,14 +119,14 @@ int qemuBuildControllerDevStr(const virDomainDef *domainDef,
                               char **devstr,
                               int *nusbcontroller);

-int qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps,
-                              const char **backendType,
-                              virQEMUDriverConfigPtr cfg,
-                              virQEMUCapsPtr qemuCaps,
-                              virDomainDefPtr def,
-                              virDomainMemoryDefPtr mem,
-                              virBitmapPtr autoNodeset,
-                              bool force);
+int qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
+                                const char **backendType,
+                                virQEMUDriverConfigPtr cfg,
+                                virQEMUCapsPtr qemuCaps,
+                                virDomainDefPtr def,
+                                virDomainMemoryDefPtr mem,
+                                virBitmapPtr autoNodeset,
+                                bool force);

 char *qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem);

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 4f58cfbd9a..7ce427be0d 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2142,8 +2142,8 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver,
     if (!(devstr = qemuBuildMemoryDeviceStr(mem)))
         goto cleanup;

-    if (qemuBuildMemoryBackendStr(&props, &backendType, cfg,
-                                  priv->qemuCaps, vm->def, mem, NULL, true) < 0)
+    if (qemuBuildMemoryBackendProps(&props, &backendType, cfg,
+                                    priv->qemuCaps, vm->def, mem, NULL, true) < 0)
         goto cleanup;

     if (qemuProcessBuildDestroyMemoryPaths(driver, vm, mem, true) < 0)
-- 
2.16.2

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list