diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-02-16 12:36:24 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-02-16 12:36:24 +0000 |
| commit | ca5266de6cde132b647b44a108f6c0c009785fdd (patch) | |
| tree | a3dfadd929794d9ea5bd6bd80cfa76ee6a8a4602 /net/net.c | |
| parent | 5dae13cd71f0755a1395b5a4cde635b8a6ee3f58 (diff) | |
| parent | 4154c7e03fa55b4cf52509a83d50d6c09d743b77 (diff) | |
| download | focaccia-qemu-ca5266de6cde132b647b44a108f6c0c009785fdd.tar.gz focaccia-qemu-ca5266de6cde132b647b44a108f6c0c009785fdd.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Wed 15 Feb 2017 03:46:59 GMT # gpg: using RSA key 0xEF04965B398D6211 # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>" # 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: net: e1000e: fix an infinite loop issue net: imx: limit buffer descriptor count colo-compare: sort TCP packet queue by sequence number net: e1000e: fix dead code in e1000e_write_packet_to_guest net: Mark 'vlan' parameter as deprecated Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/net.c')
| -rw-r--r-- | net/net.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/net.c b/net/net.c index 939fe3193a..fb7af3a432 100644 --- a/net/net.c +++ b/net/net.c @@ -970,6 +970,7 @@ static int net_client_init1(const void *object, bool is_netdev, Error **errp) const Netdev *netdev; const char *name; NetClientState *peer = NULL; + static bool vlan_warned; if (is_netdev) { netdev = object; @@ -1050,6 +1051,11 @@ static int net_client_init1(const void *object, bool is_netdev, Error **errp) !opts->u.nic.data->has_netdev) { peer = net_hub_add_port(net->has_vlan ? net->vlan : 0, NULL); } + + if (net->has_vlan && !vlan_warned) { + error_report("'vlan' is deprecated. Please use 'netdev' instead."); + vlan_warned = true; + } } if (net_client_init_fun[netdev->type](netdev, name, peer, errp) < 0) { |