From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark McLoughlin Subject: [PATCH] kvm: qemu: net: unbreak tap networking Date: Tue, 28 Apr 2009 09:48:20 +0100 Message-ID: <1240908500-25598-1-git-send-email-markmc@redhat.com> Cc: kvm@vger.kernel.org, Mark McLoughlin To: avi@redhat.com Return-path: Received: from mail08.svc.cra.dublin.eircom.net ([159.134.118.24]:33074 "HELO mail08.svc.cra.dublin.eircom.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753407AbZD1IsY (ORCPT ); Tue, 28 Apr 2009 04:48:24 -0400 Sender: kvm-owner@vger.kernel.org List-ID: A recent merge broke tap networking because qemu_send_packet() now always returns -EAGAIN causing tap to try and resend the same packet forever. Fix by having qemu_send_packet() return the status from the qemu_deliver_packet() of the packet in question, rather than any packets which happened to have been queued up during the delivery of the original packet. Signed-off-by: Mark McLoughlin --- net.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net.c b/net.c index 16f6e48..b5ebcea 100644 --- a/net.c +++ b/net.c @@ -445,9 +445,9 @@ int qemu_send_packet(VLANClientState *vc, const uint8_t *buf, int size) vlan->send_queue = packet; } else { vlan->delivering = 1; - qemu_deliver_packet(vc, buf, size); + ret = qemu_deliver_packet(vc, buf, size); while ((packet = vlan->send_queue) != NULL) { - ret = qemu_deliver_packet(packet->sender, packet->data, packet->size); + qemu_deliver_packet(packet->sender, packet->data, packet->size); vlan->send_queue = packet->next; qemu_free(packet); } -- 1.6.0.6