Re: [Qemu-devel] [PATCH v1] virtio-net: code cleanup

["Michael S. Tsirkin" <mst@redhat.com>]

On Wed, Jun 28, 2017 at 01:53:20PM +0800, Wei Wang wrote:
> Use is_power_of_2(), and remove trailing "." from error_setg().
> 
> Signed-off-by: Wei Wang <wei.w.wang@intel.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

> ---
>  hw/net/virtio-net.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
> index 91eddaf..144169c 100644
> --- a/hw/net/virtio-net.c
> +++ b/hw/net/virtio-net.c
> @@ -1918,9 +1918,9 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
>       */
>      if (n->net_conf.rx_queue_size < VIRTIO_NET_RX_QUEUE_MIN_SIZE ||
>          n->net_conf.rx_queue_size > VIRTQUEUE_MAX_SIZE ||
> -        (n->net_conf.rx_queue_size & (n->net_conf.rx_queue_size - 1))) {
> +        !is_power_of_2(n->net_conf.rx_queue_size)) {
>          error_setg(errp, "Invalid rx_queue_size (= %" PRIu16 "), "
> -                   "must be a power of 2 between %d and %d.",
> +                   "must be a power of 2 between %d and %d",
>                     n->net_conf.rx_queue_size, VIRTIO_NET_RX_QUEUE_MIN_SIZE,
>                     VIRTQUEUE_MAX_SIZE);
>          virtio_cleanup(vdev);
> @@ -1930,7 +1930,7 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
>      n->max_queues = MAX(n->nic_conf.peers.queues, 1);
>      if (n->max_queues * 2 + 1 > VIRTIO_QUEUE_MAX) {
>          error_setg(errp, "Invalid number of queues (= %" PRIu32 "), "
> -                   "must be a positive integer less than %d.",
> +                   "must be a positive integer less than %d",
>                     n->max_queues, (VIRTIO_QUEUE_MAX - 1) / 2);
>          virtio_cleanup(vdev);
>          return;
> -- 
> 2.7.4