summaryrefslogtreecommitdiffstats
path: root/net/colo.c
diff options
context:
space:
mode:
authorPeter Maydell2017-03-06 16:13:23 +0100
committerPeter Maydell2017-03-06 16:13:23 +0100
commiteba44e9339fc13c36e24c8c59e2b73ea231b46a1 (patch)
tree738208c7e3504fc23aaf4ae80ab549943d5a47f9 /net/colo.c
parentMerge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.9-20170306' into... (diff)
parentnet/filter-mirror: Follow CODING_STYLE (diff)
downloadqemu-eba44e9339fc13c36e24c8c59e2b73ea231b46a1.tar.gz
qemu-eba44e9339fc13c36e24c8c59e2b73ea231b46a1.tar.xz
qemu-eba44e9339fc13c36e24c8c59e2b73ea231b46a1.zip
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Mon 06 Mar 2017 04:15:17 GMT # gpg: using RSA key 0xEF04965B398D6211 # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>" # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211 * remotes/jasowang/tags/net-pull-request: net/filter-mirror: Follow CODING_STYLE COLO-compare: Fix icmp and udp compare different packet always dump bug COLO-compare: Optimize compare_common and compare_tcp COLO-compare: Rename compare function and remove duplicate codes filter-rewriter: skip net_checksum_calculate() while offset = 0 net/colo: fix memory double free error vmxnet3: VMStatify rx/tx q_descr and int_state vmxnet3: Convert ring values to uint32_t's net/colo-compare: Fix memory free error colo-compare: Fix removing fds been watched incorrectly in finalization char: remove the right fd been watched in qemu_chr_fe_set_handlers() colo-compare: kick compare thread to exit after some cleanup in finalization colo-compare: use g_timeout_source_new() to process the stale packets NetRxPkt: Remove code duplication in net_rx_pkt_pull_data() NetRxPkt: Account buffer with ETH header in IOV length NetRxPkt: Do not try to pull more data than present NetRxPkt: Fix memory corruption on VLAN header stripping eth: Extend vlan stripping functions net: Remove useless local var pkt Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/colo.c')
-rw-r--r--net/colo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/colo.c b/net/colo.c
index 6a6eacd2dc..8cc166bc22 100644
--- a/net/colo.c
+++ b/net/colo.c
@@ -147,9 +147,9 @@ void connection_destroy(void *opaque)
Connection *conn = opaque;
g_queue_foreach(&conn->primary_list, packet_destroy, NULL);
- g_queue_free(&conn->primary_list);
+ g_queue_clear(&conn->primary_list);
g_queue_foreach(&conn->secondary_list, packet_destroy, NULL);
- g_queue_free(&conn->secondary_list);
+ g_queue_clear(&conn->secondary_list);
g_slice_free(Connection, conn);
}