The function is already returning JSON properties, rename it accordingly. Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx> --- src/qemu/qemu_command.c | 22 +++++++++++----------- src/qemu/qemu_command.h | 15 ++++++++------- src/qemu/qemu_hotplug.c | 8 ++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 24dd00af9b..9293a413e6 100644 --- 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 81fd24406d..c544c9ec67 100644 --- 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 6f667dfb76..3df0a1f17a 100644 --- 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; } -- 2.31.1