mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
qemuBuildHostNetProps: Append ipv6 address using virJSONValueObjectAdd
The 'ipv6-prefix' and 'ipv6-prefixlen' fields can be directly added using virJSONValueObjectAdd rather than by two separate calls. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
609353275b
commit
9fd45b8df2
@ -3974,11 +3974,10 @@ qemuBuildHostNetProps(virDomainObj *vm,
|
|||||||
if (virJSONValueObjectAppendString(netprops, "net", ipv4netaddr) < 0)
|
if (virJSONValueObjectAppendString(netprops, "net", ipv4netaddr) < 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
} else if (VIR_SOCKET_ADDR_IS_FAMILY(&ip->address, AF_INET6)) {
|
} else if (VIR_SOCKET_ADDR_IS_FAMILY(&ip->address, AF_INET6)) {
|
||||||
if (virJSONValueObjectAppendString(netprops, "ipv6-prefix", addr) < 0)
|
if (virJSONValueObjectAdd(&netprops,
|
||||||
return NULL;
|
"s:ipv6-prefix", addr,
|
||||||
if (ip->prefix &&
|
"p:ipv6-prefixlen", ip->prefix,
|
||||||
virJSONValueObjectAppendNumberUlong(netprops, "ipv6-prefixlen",
|
NULL) < 0)
|
||||||
ip->prefix) < 0)
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user