[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/13] qemu-sockets: Simplify setting numeric and bo
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 11/13] qemu-sockets: Simplify setting numeric and boolean options |
Date: |
Mon, 16 Feb 2015 15:44:23 +0100 |
Don't convert numbers or bools to strings for use with qemu_opt_set(),
simply use qemu_opt_set_number() or qemu_opt_set_bool() instead.
Signed-off-by: Markus Armbruster <address@hidden>
---
util/qemu-sockets.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index e908523..87c9bc6 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -199,13 +199,13 @@ listen:
freeaddrinfo(res);
return -1;
}
- snprintf(uport, sizeof(uport), "%d", inet_getport(e) - port_offset);
qemu_opt_set(opts, "host", uaddr, &error_abort);
- qemu_opt_set(opts, "port", uport, &error_abort);
- qemu_opt_set(opts, "ipv6", (e->ai_family == PF_INET6) ? "on" : "off",
- &error_abort);
- qemu_opt_set(opts, "ipv4", (e->ai_family != PF_INET6) ? "on" : "off",
- &error_abort);
+ qemu_opt_set_number(opts, "port", inet_getport(e) - port_offset,
+ &error_abort);
+ qemu_opt_set_bool(opts, "ipv6", e->ai_family == PF_INET6,
+ &error_abort);
+ qemu_opt_set_bool(opts, "ipv4", e->ai_family != PF_INET6,
+ &error_abort);
freeaddrinfo(res);
return slisten;
}
@@ -586,9 +586,7 @@ static void inet_addr_to_opts(QemuOpts *opts, const
InetSocketAddress *addr)
qemu_opt_set_bool(opts, "ipv6", ipv6, &error_abort);
}
if (addr->has_to) {
- char to[20];
- snprintf(to, sizeof(to), "%d", addr->to);
- qemu_opt_set(opts, "to", to, &error_abort);
+ qemu_opt_set_number(opts, "to", addr->to, &error_abort);
}
qemu_opt_set(opts, "host", addr->host, &error_abort);
qemu_opt_set(opts, "port", addr->port, &error_abort);
--
1.9.3
- Re: [Qemu-devel] [PATCH 04/13] qemu-img: Suppress unhelpful extra errors in convert, resize, (continued)
- [Qemu-devel] [PATCH 13/13] qtest: Use qemu_opt_set() instead of qemu_opts_parse(), Markus Armbruster, 2015/02/16
- [Qemu-devel] [PATCH 09/13] qemu-img: Suppress unhelpful extra errors in convert, amend, Markus Armbruster, 2015/02/16
- [Qemu-devel] [PATCH 01/13] QemuOpts: Convert qemu_opt_set_bool() to Error, fix its use, Markus Armbruster, 2015/02/16
- [Qemu-devel] [PATCH 11/13] qemu-sockets: Simplify setting numeric and boolean options,
Markus Armbruster <=
- [Qemu-devel] [PATCH 02/13] QemuOpts: Convert qemu_opt_set_number() to Error, fix its use, Markus Armbruster, 2015/02/16
- [Qemu-devel] [PATCH 08/13] QemuOpts: Propagate errors through opts_parse(), Markus Armbruster, 2015/02/16
- [Qemu-devel] [PATCH 12/13] pc: Use qemu_opt_set() instead of qemu_opts_parse(), Markus Armbruster, 2015/02/16
- [Qemu-devel] [PATCH 05/13] block: Suppress unhelpful extra errors in bdrv_img_create(), Markus Armbruster, 2015/02/16
- [Qemu-devel] [PATCH 07/13] QemuOpts: Propagate errors through opts_do_parse(), Markus Armbruster, 2015/02/16