diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-04-08 16:45:31 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-04-08 16:45:31 +0100 |
| commit | ce69aa92d71e13db9c3702a8e8305e8d2463aeb8 (patch) | |
| tree | db523c9f40dd1e69e3f0a829d20eb36898c25597 /net/netmap.c | |
| parent | d8724020dd13c88a72fc391a6a2cf63abbd3dcca (diff) | |
| parent | 21df394d9e2ffce9fa308f496d1ae228cf6cdb57 (diff) | |
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/netmap.c')
| -rw-r--r-- | net/netmap.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/netmap.c b/net/netmap.c index ad59d4ade4..350f097f91 100644 --- a/net/netmap.c +++ b/net/netmap.c @@ -427,13 +427,6 @@ int net_init_netmap(const Netdev *netdev, pstrcpy(s->ifname, sizeof(s->ifname), netmap_opts->ifname); netmap_read_poll(s, true); /* Initially only poll for reads. */ - /* Store startup parameters */ - nc->stored_config = g_new0(NetdevInfo, 1); - nc->stored_config->type = NET_BACKEND_NETMAP; - - QAPI_CLONE_MEMBERS(NetdevNetmapOptions, - &nc->stored_config->u.netmap, netmap_opts); - return 0; } |