External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

qemuBuildHostNetStr: remove unnecessary cleanup label

Browse Source 
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Ján Tomko 2019-08-26 22:28:27 +02:00
parent 1a8e03f886
commit f9b650a848
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/qemu/qemu_command.c
View File

@ -3916,13 +3916,12 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER;
virDomainNetType netType = virDomainNetGetActualType(net);
size_t i;
char *ret = NULL;
if (net->script && netType != VIR_DOMAIN_NET_TYPE_ETHERNET) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("scripts are not supported on interfaces of type %s"),
virDomainNetTypeToString(netType));
goto cleanup;
return NULL;
}
switch (netType) {
@ -3989,7 +3988,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
const char *prefix = "";
if (!(addr = virSocketAddrFormat(&ip->address)))
goto cleanup;
return NULL;
if (VIR_SOCKET_ADDR_IS_FAMILY(&ip->address, AF_INET))
prefix = "net=";
@ -4046,11 +4045,9 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
virBufferTrim(&buf, ",", -1);
if (virBufferCheckError(&buf) < 0)
goto cleanup;
return NULL;
ret = virBufferContentAndReset(&buf);
cleanup:
return ret;
return virBufferContentAndReset(&buf);
}