[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/17] net: fix assertion failure when ipv6-prefixlen
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 04/17] net: fix assertion failure when ipv6-prefixlen is not a number |
Date: |
Tue, 2 Jul 2019 10:31:16 +0800 |
From: Stefano Garzarella <address@hidden>
If 'ipv6-prefixlen' is not a number, the current behaviour
produces an assertion failure:
$ qemu-system-x86_64 -net user,ipv6-net=feca::0/a
qemu-system-x86_64: qemu/util/qemu-option.c:1175: qemu_opts_foreach:
Assertion `!errp || !*errp' failed.
Aborted (core dumped)
This patch fixes it, jumping to the end of the function when
'ipv6-prefixlen' is not a number, and printing the more friendly
message:
$ qemu-system-x86_64 -net user,ipv6-net=feca::0/a
qemu-system-x86_64: Parameter 'ipv6-prefixlen' expects a number
Signed-off-by: Stefano Garzarella <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
net/net.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/net/net.c b/net/net.c
index 3e65c93..d21c2c7 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1136,11 +1136,11 @@ static int net_client_init(QemuOpts *opts, bool
is_netdev, Error **errp)
if (err) {
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "ipv6-prefix", "a number");
- } else {
- qemu_opt_set_number(opts, "ipv6-prefixlen", len,
- &error_abort);
+ "ipv6-prefixlen", "a number");
+ goto out;
}
+
+ qemu_opt_set_number(opts, "ipv6-prefixlen", len, &error_abort);
}
qemu_opt_unset(opts, "ipv6-net");
}
@@ -1162,6 +1162,7 @@ static int net_client_init(QemuOpts *opts, bool
is_netdev, Error **errp)
qapi_free_NetLegacy(object);
}
+out:
error_propagate(errp, err);
visit_free(v);
return ret;
--
2.5.0
- [Qemu-devel] [PULL 00/17] Net patches, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 04/17] net: fix assertion failure when ipv6-prefixlen is not a number,
Jason Wang <=
- [Qemu-devel] [PULL 06/17] net: use g_strsplit() for parsing host address and port, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 07/17] net: remove unused get_str_sep() function, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 03/17] ftgmac100: do not link to netdev, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 08/17] net/announce: Allow optional list of interfaces, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 01/17] MAINTAINERS: Add qemu-bridge-helper.c to "Network device backends", Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 02/17] qemu-bridge-helper: Document known shortcomings, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 09/17] net/announce: Add HMP optional interface list, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 05/17] net: avoid using variable length array in net_client_init(), Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 10/17] net/announce: Add optional ID, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 11/17] net/announce: Add HMP optional ID, Jason Wang, 2019/07/01