On 12/24/2014 12:53 AM, Paolo Bonzini wrote:
> Using net_host_check_device is unnecessary. qemu_del_net_client asserts
> for the non-peer case that it can only process NIC type NetClientStates,
> and that assertion is valid for the peered case as well, so move it and
> use the same check in net_host_device_remove. host_net_remove_completion
> is already checking the type.
>
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
> ---
> net/net.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/net/net.c b/net/net.c
> index 7acc162..1da612f 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -324,6 +324,8 @@ void qemu_del_net_client(NetClientState *nc)
> NetClientState *ncs[MAX_QUEUE_NUM];
> int queues, i;
>
> + assert(nc->info->type != NET_CLIENT_OPTIONS_KIND_NIC);
> +
> /* If the NetClientState belongs to a multiqueue backend, we will change
> all
> * other NetClientStates also.
> */
> @@ -355,8 +357,6 @@ void qemu_del_net_client(NetClientState *nc)
> return;
> }
>
> - assert(nc->info->type != NET_CLIENT_OPTIONS_KIND_NIC);
> -
> for (i = 0; i < queues; i++) {
> qemu_cleanup_net_client(ncs[i]);
> qemu_free_net_client(ncs[i]);
> @@ -992,7 +992,7 @@ void net_host_device_remove(Monitor *mon, const QDict
> *qdict)
> device, vlan_id);
> return;
> }
> - if (!net_host_check_device(nc->model)) {
> + if (nc->info->type == NET_CLIENT_OPTIONS_KIND_NIC) {
> error_report("invalid host network device '%s'", device);
> return;
> }
Reviewed-by: Jason Wang <jasow...@redhat.com>
