aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2009-06-18 18:21:29 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-06-22 10:15:30 -0500
commit8cad55161c98b95deacdb9c1a66980f5b24d3179 (patch)
treea04068a9130c6df2bc6a43367737cd38e399ed20
parent08b9d66b96f7afe77448e73882281586680a58c6 (diff)
net: add qemu_purge_queued_packets()
If net client sends packets asynchronously, it needs to purge its queued packets in cleanup() so as to prevent sent callbacks being invoked with a freed client. Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--net.c16
-rw-r--r--net.h1
2 files changed, 17 insertions, 0 deletions
diff --git a/net.c b/net.c
index 5b092c7482..cea545e4c0 100644
--- a/net.c
+++ b/net.c
@@ -439,6 +439,22 @@ qemu_deliver_packet(VLANClientState *sender, const uint8_t *buf, int size)
return ret;
}
+void qemu_purge_queued_packets(VLANClientState *vc)
+{
+ VLANPacket **pp = &vc->vlan->send_queue;
+
+ while (*pp != NULL) {
+ VLANPacket *packet = *pp;
+
+ if (packet->sender == vc) {
+ *pp = packet->next;
+ qemu_free(packet);
+ } else {
+ pp = &packet->next;
+ }
+ }
+}
+
void qemu_flush_queued_packets(VLANClientState *vc)
{
VLANPacket *packet;
diff --git a/net.h b/net.h
index 3fbfdba4fd..484b000851 100644
--- a/net.h
+++ b/net.h
@@ -70,6 +70,7 @@ ssize_t qemu_sendv_packet_async(VLANClientState *vc, const struct iovec *iov,
void qemu_send_packet(VLANClientState *vc, const uint8_t *buf, int size);
ssize_t qemu_send_packet_async(VLANClientState *vc, const uint8_t *buf,
int size, NetPacketSent *sent_cb);
+void qemu_purge_queued_packets(VLANClientState *vc);
void qemu_flush_queued_packets(VLANClientState *vc);
void qemu_format_nic_info_str(VLANClientState *vc, uint8_t macaddr[6]);
void qemu_check_nic_model(NICInfo *nd, const char *model);