ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: drop if expression that is always true 

Both is_netdev and !is_netdev paths already check that
net_client_init_func[opts->kind] is non-NULL so there is no need for the
if statement.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-id: 1432743412-15943-5-git-send-email-stefanha@redhat.com
This commit is contained in:
Stefan Hajnoczi 2015-05-27 17:16:51 +01:00
parent d139e9a6cf
commit 4ef0defbad
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
net/net.c
View File

@ -919,6 +919,7 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp)
} u; } u;
const NetClientOptions *opts; const NetClientOptions *opts;
const char *name; const char *name;
NetClientState *peer = NULL;
if (is_netdev) { if (is_netdev) {
u.netdev = object; u.netdev = object;
@ -955,25 +956,21 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp)
} }
} }
if (net_client_init_fun[opts->kind]) { /* Do not add to a vlan if it's a -netdev or a nic with a netdev=
NetClientState *peer = NULL; * parameter. */
if (!is_netdev &&
(opts->kind != NET_CLIENT_OPTIONS_KIND_NIC ||
!opts->nic->has_netdev)) {
peer = net_hub_add_port(u.net->has_vlan ? u.net->vlan : 0, NULL);
}
/* Do not add to a vlan if it's a -netdev or a nic with a netdev= if (net_client_init_fun[opts->kind](opts, name, peer, errp) < 0) {
* parameter. */ /* FIXME drop when all init functions store an Error */
if (!is_netdev && if (errp && !*errp) {
(opts->kind != NET_CLIENT_OPTIONS_KIND_NIC || error_setg(errp, QERR_DEVICE_INIT_FAILED,
!opts->nic->has_netdev)) { NetClientOptionsKind_lookup[opts->kind]);
peer = net_hub_add_port(u.net->has_vlan ? u.net->vlan : 0, NULL);
}
if (net_client_init_fun[opts->kind](opts, name, peer, errp) < 0) {
/* FIXME drop when all init functions store an Error */
if (errp && !*errp) {
error_setg(errp, QERR_DEVICE_INIT_FAILED,
NetClientOptionsKind_lookup[opts->kind]);
}
return -1;
} }
return -1;
} }
return 0; return 0;
} }