[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 1/4] net: fix assertion failure when ipv6-prefixl
From: |
Stefano Garzarella |
Subject: |
[Qemu-devel] [PATCH v3 1/4] net: fix assertion failure when ipv6-prefixlen is not a number |
Date: |
Fri, 17 May 2019 15:47:45 +0200 |
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>
---
net/net.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/net/net.c b/net/net.c
index 2cf5e76469..555504a404 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1135,11 +1135,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");
}
@@ -1161,6 +1161,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.20.1