diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-03-31 00:52:50 +0200 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-03-31 01:08:29 +0200 |
commit | 891a2bb58c5c4cbedc82e9606b049bf4c298b88b (patch) | |
tree | 9f2b4e8087830d38ac0f93e6a8bc32bf4032731a /net | |
parent | 9370a3bbc478f623dd21d783560629ea2064625b (diff) | |
download | qemu-891a2bb58c5c4cbedc82e9606b049bf4c298b88b.zip qemu-891a2bb58c5c4cbedc82e9606b049bf4c298b88b.tar.gz qemu-891a2bb58c5c4cbedc82e9606b049bf4c298b88b.tar.bz2 |
Fix ipv6 options according to documentation
The options names were fixed in the qapi layer, but not in the command-line
options.
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/net.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -1054,32 +1054,32 @@ int net_client_init(QemuOpts *opts, int is_netdev, Error **errp) { /* Parse convenience option format ip6-net=fec0::0[/64] */ - const char *ip6_net = qemu_opt_get(opts, "ip6-net"); + const char *ip6_net = qemu_opt_get(opts, "ipv6-net"); if (ip6_net) { char buf[strlen(ip6_net) + 1]; if (get_str_sep(buf, sizeof(buf), &ip6_net, '/') < 0) { /* Default 64bit prefix length. */ - qemu_opt_set(opts, "ip6-prefix", ip6_net, &error_abort); - qemu_opt_set_number(opts, "ip6-prefixlen", 64, &error_abort); + qemu_opt_set(opts, "ipv6-prefix", ip6_net, &error_abort); + qemu_opt_set_number(opts, "ipv6-prefixlen", 64, &error_abort); } else { /* User-specified prefix length. */ unsigned long len; int err; - qemu_opt_set(opts, "ip6-prefix", buf, &error_abort); + qemu_opt_set(opts, "ipv6-prefix", buf, &error_abort); err = qemu_strtoul(ip6_net, NULL, 10, &len); if (err) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, - "ip6-prefix", "a number"); + "ipv6-prefix", "a number"); } else { - qemu_opt_set_number(opts, "ip6-prefixlen", len, + qemu_opt_set_number(opts, "ipv6-prefixlen", len, &error_abort); } } - qemu_opt_unset(opts, "ip6-net"); + qemu_opt_unset(opts, "ipv6-net"); } } |