From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55766) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHoJh-0001jb-GR for qemu-devel@nongnu.org; Thu, 14 Aug 2014 02:15:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XHoJT-0006pm-2G for qemu-devel@nongnu.org; Thu, 14 Aug 2014 02:15:17 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:11557) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHoJS-0006lg-7I for qemu-devel@nongnu.org; Thu, 14 Aug 2014 02:15:03 -0400 From: zhanghailiang Date: Thu, 14 Aug 2014 14:13:58 +0800 Message-ID: <1407996838-10212-4-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1407996838-10212-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1407996838-10212-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 3/3] virtio-net: Remove checking vm state in virtio_net_can_receive List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, stefanha@redhat.com, mst@redhat.com, luonengjun@huawei.com, peter.huangpeng@huawei.com, aliguori@amazon.com, akong@redhat.com, zhanghailiang We will check vm-running state in the generic net layer. Also we have to flush queues in nic_vmstate_change_handler() when vm state changes to run. The check here will prevent the flushing process, because we will check the return value of virtio_net_can_receive in nic_vmstate_change_handler, When the vdev->vm_running is still false. Actually it depends on the register sequence of callback functions. Here nic_vmstate_change_handler will called before virtio_vmstate_change. So remove the unnecessarily checking. Signed-off-by: zhanghailiang --- hw/net/virtio-net.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 268eff9..287d762 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -839,10 +839,6 @@ static int virtio_net_can_receive(NetClientState *nc) VirtIODevice *vdev = VIRTIO_DEVICE(n); VirtIONetQueue *q = virtio_net_get_subqueue(nc); - if (!vdev->vm_running) { - return 0; - } - if (nc->queue_index >= n->curr_queues) { return 0; } -- 1.7.12.4