On Mon, Jul 23, 2012 at 01:48:35PM +0800, Jason Wang wrote: > >>+ } > >> > >>- if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)) { > >>+ ret = vi->vdev->config->find_vqs(vi->vdev, total_vqs, vqs, callbacks, > >>+ (const char **)names); > >>+ if (ret) > >>+ goto err; > >>+ > >>+ if (vi->has_cvq) > >> vi->cvq = vqs[2]; > >> > >>- if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VLAN)) > >>- vi->dev->features |= NETIF_F_HW_VLAN_FILTER; > >>+ for (i = 0; i< vi->num_queue_pairs * 2; i += 2) { > >>+ int j = i == 0 ? i : i + vi->has_cvq; > >>+ vi->rq[i / 2]->vq = vqs[j]; > >>+ vi->sq[i / 2]->vq = vqs[j + 1]; > >Same here. > > Consider the code is really simple, seem no need to use helpers. Well it was not simple to at least one reader :) The problem is not this logic is complex, it is that it is spread all over the code. If we had e.g. vnet_tx_vqn_to_queuenum vnet_tx_queuenum_to_vqn and same for rx, then the logic would all be in one place, and have a tidy comment on top explaining the VQ numbering scheme. -- MST -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html