qemu: command: Rename qemuBuildHostNetStr -> qemuBuildHostNetProps

The function is already returning JSON properties, rename it
accordingly.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 24dd00af9bd8dc6125d10754066d8d22f8ab9d20..9293a413e624e6a957c15ca35ba55f35ac9c5101 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3936,13 +3936,13 @@ qemuBuildNicDevProps(virDomainDef *def,
 
 
 virJSONValue *
-qemuBuildHostNetStr(virDomainNetDef *net,
-                    char **tapfd,
-                    size_t tapfdSize,
-                    char **vhostfd,
-                    size_t vhostfdSize,
-                    const char *slirpfd,
-                    const char *vdpadev)
+qemuBuildHostNetProps(virDomainNetDef *net,
+                      char **tapfd,
+                      size_t tapfdSize,
+                      char **vhostfd,
+                      size_t vhostfdSize,
+                      const char *slirpfd,
+                      const char *vdpadev)
 {
     bool is_tap = false;
     virDomainNetType netType = virDomainNetGetActualType(net);
@@ -8975,10 +8975,10 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
     if (chardev)
         virCommandAddArgList(cmd, "-chardev", chardev, NULL);
 
-    if (!(hostnetprops = qemuBuildHostNetStr(net,
-                                             tapfdName, tapfdSize,
-                                             vhostfdName, vhostfdSize,
-                                             slirpfdName, vdpafdName)))
+    if (!(hostnetprops = qemuBuildHostNetProps(net,
+                                               tapfdName, tapfdSize,
+                                               vhostfdName, vhostfdSize,
+                                               slirpfdName, vdpafdName)))
         goto cleanup;
 
     if (qemuBuildNetdevCommandlineFromJSON(cmd, hostnetprops, qemuCaps) < 0)

diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index 81fd24406d8354481932c81059236d0a62dc308e..c544c9ec67c9c0ba7d9317bb19d6f95d07468468 100644 (file)
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -87,13 +87,14 @@ qemuBuildChrDeviceProps(const virDomainDef *vmdef,
 virJSONValue *
 qemuBuildChannelGuestfwdNetdevProps(virDomainChrDef *chr);
 
-virJSONValue *qemuBuildHostNetStr(virDomainNetDef *net,
-                                    char **tapfd,
-                                    size_t tapfdSize,
-                                    char **vhostfd,
-                                    size_t vhostfdSize,
-                                    const char *slirpfd,
-                                    const char *vdpadev);
+virJSONValue *
+qemuBuildHostNetProps(virDomainNetDef *net,
+                      char **tapfd,
+                      size_t tapfdSize,
+                      char **vhostfd,
+                      size_t vhostfdSize,
+                      const char *slirpfd,
+                      const char *vdpadev);
 
 /* Current, best practice */
 virJSONValue *

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 6f667dfb76871369e7f1e23e387bc4f05dabfa91..3df0a1f17aca70e3f3402e0a47abd398c2824982 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1459,10 +1459,10 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
         vdpafdName = g_strdup_printf("/dev/fdset/%d", fdinfo.fdset);
     }
 
-    if (!(netprops = qemuBuildHostNetStr(net,
-                                         tapfdName, tapfdSize,
-                                         vhostfdName, vhostfdSize,
-                                         slirpfdName, vdpafdName))) {
+    if (!(netprops = qemuBuildHostNetProps(net,
+                                           tapfdName, tapfdSize,
+                                           vhostfdName, vhostfdSize,
+                                           slirpfdName, vdpafdName))) {
         ignore_value(qemuDomainObjExitMonitor(driver, vm));
         goto cleanup;
     }