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>

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 570b57341bad814ca25213f8ad56b4f8567e26d6..fea8d8d3bdc227171b92a932a9edf2a267c52e45 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3974,11 +3974,10 @@ qemuBuildHostNetProps(virDomainObj *vm,
                     if (virJSONValueObjectAppendString(netprops, "net", ipv4netaddr) < 0)
                         return NULL;
                 } else if (VIR_SOCKET_ADDR_IS_FAMILY(&ip->address, AF_INET6)) {
-                    if (virJSONValueObjectAppendString(netprops, "ipv6-prefix", addr) < 0)
-                        return NULL;
-                    if (ip->prefix &&
-                        virJSONValueObjectAppendNumberUlong(netprops, "ipv6-prefixlen",
-                                                            ip->prefix) < 0)
+                    if (virJSONValueObjectAdd(&netprops,
+                                              "s:ipv6-prefix", addr,
+                                              "p:ipv6-prefixlen", ip->prefix,
+                                              NULL) < 0)
                         return NULL;
                 }
             }