Revision 7267c094 net/queue.c
| b/net/queue.c | ||
|---|---|---|
| 63 | 63 |
{
|
| 64 | 64 |
NetQueue *queue; |
| 65 | 65 |
|
| 66 |
queue = qemu_mallocz(sizeof(NetQueue));
|
|
| 66 |
queue = g_malloc0(sizeof(NetQueue));
|
|
| 67 | 67 |
|
| 68 | 68 |
queue->deliver = deliver; |
| 69 | 69 |
queue->deliver_iov = deliver_iov; |
| ... | ... | |
| 82 | 82 |
|
| 83 | 83 |
QTAILQ_FOREACH_SAFE(packet, &queue->packets, entry, next) {
|
| 84 | 84 |
QTAILQ_REMOVE(&queue->packets, packet, entry); |
| 85 |
qemu_free(packet);
|
|
| 85 |
g_free(packet);
|
|
| 86 | 86 |
} |
| 87 | 87 |
|
| 88 |
qemu_free(queue);
|
|
| 88 |
g_free(queue);
|
|
| 89 | 89 |
} |
| 90 | 90 |
|
| 91 | 91 |
static ssize_t qemu_net_queue_append(NetQueue *queue, |
| ... | ... | |
| 97 | 97 |
{
|
| 98 | 98 |
NetPacket *packet; |
| 99 | 99 |
|
| 100 |
packet = qemu_malloc(sizeof(NetPacket) + size);
|
|
| 100 |
packet = g_malloc(sizeof(NetPacket) + size);
|
|
| 101 | 101 |
packet->sender = sender; |
| 102 | 102 |
packet->flags = flags; |
| 103 | 103 |
packet->size = size; |
| ... | ... | |
| 124 | 124 |
max_len += iov[i].iov_len; |
| 125 | 125 |
} |
| 126 | 126 |
|
| 127 |
packet = qemu_malloc(sizeof(NetPacket) + max_len);
|
|
| 127 |
packet = g_malloc(sizeof(NetPacket) + max_len);
|
|
| 128 | 128 |
packet->sender = sender; |
| 129 | 129 |
packet->sent_cb = sent_cb; |
| 130 | 130 |
packet->flags = flags; |
| ... | ... | |
| 227 | 227 |
QTAILQ_FOREACH_SAFE(packet, &queue->packets, entry, next) {
|
| 228 | 228 |
if (packet->sender == from) {
|
| 229 | 229 |
QTAILQ_REMOVE(&queue->packets, packet, entry); |
| 230 |
qemu_free(packet);
|
|
| 230 |
g_free(packet);
|
|
| 231 | 231 |
} |
| 232 | 232 |
} |
| 233 | 233 |
} |
| ... | ... | |
| 255 | 255 |
packet->sent_cb(packet->sender, ret); |
| 256 | 256 |
} |
| 257 | 257 |
|
| 258 |
qemu_free(packet);
|
|
| 258 |
g_free(packet);
|
|
| 259 | 259 |
} |
| 260 | 260 |
} |
Also available in: Unified diff