From patchwork Fri Jun 23 02:32:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Wei W" X-Patchwork-Id: 9805539 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 57DD660329 for ; Fri, 23 Jun 2017 02:41:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49ED02522B for ; Fri, 23 Jun 2017 02:41:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3DA3026E74; Fri, 23 Jun 2017 02:41:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BB1012522B for ; Fri, 23 Jun 2017 02:41:40 +0000 (UTC) Received: from localhost ([::1]:33341 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dOEXU-0006C5-3J for patchwork-qemu-devel@patchwork.kernel.org; Thu, 22 Jun 2017 22:41:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42009) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dOEVi-0005ZF-4o for qemu-devel@nongnu.org; Thu, 22 Jun 2017 22:39:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dOEVe-0008Pn-5x for qemu-devel@nongnu.org; Thu, 22 Jun 2017 22:39:50 -0400 Received: from mga05.intel.com ([192.55.52.43]:46340) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dOEVd-0008Kq-Sb for qemu-devel@nongnu.org; Thu, 22 Jun 2017 22:39:46 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP; 22 Jun 2017 19:39:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,375,1493708400"; d="scan'208";a="102715893" Received: from devel-ww.sh.intel.com ([10.239.48.97]) by orsmga002.jf.intel.com with ESMTP; 22 Jun 2017 19:39:41 -0700 From: Wei Wang To: mst@redhat.com, jasowang@redhat.com, eblake@redhat.com, virtio-dev@lists.oasis-open.org, qemu-devel@nongnu.org Date: Fri, 23 Jun 2017 10:32:34 +0800 Message-Id: <1498185154-29015-2-git-send-email-wei.w.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498185154-29015-1-git-send-email-wei.w.wang@intel.com> References: <1498185154-29015-1-git-send-email-wei.w.wang@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.43 Subject: [Qemu-devel] [PATCH v3 2/2] virtio-net: code cleanup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stefanha@gmail.com, armbru@redhat.com, jan.scheurich@ericsson.com, Wei Wang , marcandre.lureau@gmail.com, pbonzini@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Use is_power_of_2(), and remove trailing "." from error_setg(). Signed-off-by: Wei Wang --- 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;