shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 01:34:11 +03:00
Code Releases Activity

qemuBuildHostNetProps: Append aliases without virJSONValueObjectAppendStringPrintf

Browse Source 
Format aliases into temporary strings and append them using
virJSONValueObjectAdd.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-03-06 09:58:23 +01:00
parent 9fd45b8df2
commit 4afac135fd
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qemu/qemu_command.c
View File

@ -3821,6 +3821,7 @@ qemuBuildHostNetProps(virDomainObj *vm,
size_t i;
qemuDomainNetworkPrivate *netpriv = QEMU_DOMAIN_NETWORK_PRIVATE(net);
g_autoptr(virJSONValue) netprops = NULL;
g_autofree char *alias = g_strdup_printf("host%s", net->info.alias);
if (net->script && netType != VIR_DOMAIN_NET_TYPE_ETHERNET) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@ -3989,15 +3990,20 @@ qemuBuildHostNetProps(virDomainObj *vm,
return NULL;
break;
case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
if (virJSONValueObjectAdd(&netprops, "s:type", "vhost-user", NULL) < 0 ||
virJSONValueObjectAppendStringPrintf(netprops, "chardev", "char%s", net->info.alias) < 0)
case VIR_DOMAIN_NET_TYPE_VHOSTUSER: {
g_autofree char *charalias = g_strdup_printf("char%s", net->info.alias);
if (virJSONValueObjectAdd(&netprops,
"s:type", "vhost-user",
"s:chardev", charalias,
NULL) < 0)
return NULL;
if (net->driver.virtio.queues > 1 &&
virJSONValueObjectAppendNumberUlong(netprops, "queues", net->driver.virtio.queues) < 0)
return NULL;
break;
}
case VIR_DOMAIN_NET_TYPE_VDPA:
/* Caller will pass the fd to qemu with add-fd */
@ -4026,7 +4032,7 @@ qemuBuildHostNetProps(virDomainObj *vm,
return NULL;
}
if (virJSONValueObjectAppendStringPrintf(netprops, "id", "host%s", net->info.alias) < 0)
if (virJSONValueObjectAdd(&netprops, "s:id", alias, NULL) < 0)
return NULL;
return g_steal_pointer(&netprops);