[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 2/2] virtio-net: code cleanup
From: |
Wei Wang |
Subject: |
[Qemu-devel] [PATCH v3 2/2] virtio-net: code cleanup |
Date: |
Fri, 23 Jun 2017 10:32:34 +0800 |
Use is_power_of_2(), and remove trailing "." from error_setg().
Signed-off-by: Wei Wang <address@hidden>
---
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 d13ca60..b42423c 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -1924,9 +1924,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);
@@ -1947,7 +1947,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
- [Qemu-devel] [PATCH v3 1/2] virtio-net: enable configurable tx queue size, Wei Wang, 2017/06/22
- [Qemu-devel] [PATCH v3 2/2] virtio-net: code cleanup,
Wei Wang <=
- Re: [Qemu-devel] [PATCH v3 1/2] virtio-net: enable configurable tx queue size, Jason Wang, 2017/06/25
- Re: [Qemu-devel] [PATCH v3 1/2] virtio-net: enable configurable tx queue size, Wei Wang, 2017/06/26
- Re: [Qemu-devel] [virtio-dev] Re: [PATCH v3 1/2] virtio-net: enable configurable tx queue size, Jason Wang, 2017/06/26
- Re: [Qemu-devel] [virtio-dev] Re: [PATCH v3 1/2] virtio-net: enable configurable tx queue size, Wei Wang, 2017/06/26
- Re: [Qemu-devel] [virtio-dev] Re: [PATCH v3 1/2] virtio-net: enable configurable tx queue size, Michael S. Tsirkin, 2017/06/26
- Re: [Qemu-devel] [virtio-dev] Re: [PATCH v3 1/2] virtio-net: enable configurable tx queue size, Wei Wang, 2017/06/26
- Re: [Qemu-devel] [virtio-dev] Re: [PATCH v3 1/2] virtio-net: enable configurable tx queue size, Michael S. Tsirkin, 2017/06/26
- Re: [Qemu-devel] [virtio-dev] Re: [PATCH v3 1/2] virtio-net: enable configurable tx queue size, Jason Wang, 2017/06/26
- Re: [Qemu-devel] [virtio-dev] Re: [PATCH v3 1/2] virtio-net: enable configurable tx queue size, Wang, Wei W, 2017/06/27
Re: [Qemu-devel] [PATCH v3 1/2] virtio-net: enable configurable tx queue size, Eric Blake, 2017/06/26