From 7317a83f6024dd6b4e1fa19436e24db0132b6cb9 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 18 May 2018 15:51:36 +0200
Subject: [PATCH] qemu: command: Fix name of qemuBuildMemoryBackendStr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 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 91b7b8ea32..889840a1ae 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2936,7 +2936,7 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd,
 
 
 /**
- * qemuBuildMemoryBackendStr:
+ * qemuBuildMemoryBackendProps:
  * @backendProps: [out] constructed object
  * @backendType: [out] type of the backennd used
  * @cfg: qemu driver config object
@@ -2962,14 +2962,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();
@@ -3220,8 +3220,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,
@@ -3259,8 +3259,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 36bf822414..9a7fed2934 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 c769fb0b8c..b2a484d2ff 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)
-- 
GitLab