From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark McLoughlin Subject: [PATCH 3/5] kvm: qemu: Simplify virtio_net_can_receive() a little Date: Wed, 8 Oct 2008 20:35:11 +0100 Message-ID: <1223494513-18826-3-git-send-email-markmc@redhat.com> References: <> <1223494513-18826-1-git-send-email-markmc@redhat.com> <1223494513-18826-2-git-send-email-markmc@redhat.com> Cc: kvm@vger.kernel.org, Rusty Russell , Mark McLoughlin To: Avi Kivity Return-path: Received: from mail17.svc.cra.dublin.eircom.net ([159.134.118.216]:38559 "HELO mail17.svc.cra.dublin.eircom.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755979AbYJHTf4 (ORCPT ); Wed, 8 Oct 2008 15:35:56 -0400 In-Reply-To: <1223494513-18826-2-git-send-email-markmc@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: In order to de-obfuscate the final patch in this series Signed-off-by: Mark McLoughlin --- qemu/hw/virtio-net.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/qemu/hw/virtio-net.c b/qemu/hw/virtio-net.c index bc2ede6..4b4c48b 100644 --- a/qemu/hw/virtio-net.c +++ b/qemu/hw/virtio-net.c @@ -140,17 +140,18 @@ static void virtio_net_handle_rx(VirtIODevice *vdev, VirtQueue *vq) static int virtio_net_can_receive(void *opaque) { VirtIONet *n = opaque; + VirtQueue *vq = n->rx_vq; - if (n->rx_vq->vring.avail == NULL || + if (vq->vring.avail == NULL || !(n->vdev.status & VIRTIO_CONFIG_S_DRIVER_OK)) return 0; - if (n->rx_vq->vring.avail->idx == n->rx_vq->last_avail_idx) { - n->rx_vq->vring.used->flags &= ~VRING_USED_F_NO_NOTIFY; + if (vq->vring.avail->idx == vq->last_avail_idx) { + vq->vring.used->flags &= ~VRING_USED_F_NO_NOTIFY; return 0; } - n->rx_vq->vring.used->flags |= VRING_USED_F_NO_NOTIFY; + vq->vring.used->flags |= VRING_USED_F_NO_NOTIFY; return 1; } -- 1.5.4.3