diff options
| author | Peter Maydell | 2021-04-08 17:45:31 +0200 |
|---|---|---|
| committer | Peter Maydell | 2021-04-08 17:45:31 +0200 |
| commit | ce69aa92d71e13db9c3702a8e8305e8d2463aeb8 (patch) | |
| tree | db523c9f40dd1e69e3f0a829d20eb36898c25597 /net/l2tpv3.c | |
| parent | Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20210407b'... (diff) | |
| parent | tap-win32: correctly recycle buffers (diff) | |
| download | qemu-ce69aa92d71e13db9c3702a8e8305e8d2463aeb8.tar.gz qemu-ce69aa92d71e13db9c3702a8e8305e8d2463aeb8.tar.xz qemu-ce69aa92d71e13db9c3702a8e8305e8d2463aeb8.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Thu 08 Apr 2021 10:34:24 BST
# gpg: using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>" [marginal]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211
* remotes/jasowang/tags/net-pull-request:
tap-win32: correctly recycle buffers
Revert "qapi: net: Add query-netdev command"
Revert "tests: Add tests for query-netdev command"
Revert "net: Move NetClientState.info_str to dynamic allocations"
Revert "hmp: Use QAPI NetdevInfo in hmp_info_network"
Revert "net: Do not fill legacy info_str for backends"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/l2tpv3.c')
| -rw-r--r-- | net/l2tpv3.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/l2tpv3.c b/net/l2tpv3.c index b7e1d84674..e4d4218db6 100644 --- a/net/l2tpv3.c +++ b/net/l2tpv3.c @@ -723,12 +723,8 @@ int net_init_l2tpv3(const Netdev *netdev, l2tpv3_read_poll(s, true); - /* Store startup parameters */ - nc->stored_config = g_new0(NetdevInfo, 1); - nc->stored_config->type = NET_BACKEND_L2TPV3; - - QAPI_CLONE_MEMBERS(NetdevL2TPv3Options, - &nc->stored_config->u.l2tpv3, l2tpv3); + snprintf(s->nc.info_str, sizeof(s->nc.info_str), + "l2tpv3: connected"); return 0; outerr: qemu_del_net_client(nc); |