diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-12-20 22:04:13 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-12-20 22:04:13 +0000 |
| commit | 328b3b6c44c17d94df115ed1851f54a0bd59a471 (patch) | |
| tree | 28dedada7f73445670281448e03a8c7dcb952c3e /net/queue.c | |
| parent | c4e7c17a8ecb41cdbb81374a128161c614ba1f1e (diff) | |
| parent | 20302e71a5b654d7b4d0d61c7384e9dd8d112971 (diff) | |
| download | focaccia-qemu-328b3b6c44c17d94df115ed1851f54a0bd59a471.tar.gz focaccia-qemu-328b3b6c44c17d94df115ed1851f54a0bd59a471.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
# gpg: Signature made Fri 19 Dec 2014 13:18:18 GMT using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" * remotes/stefanha/tags/net-pull-request: e1000: defer packets until BM enabled net: Use g_new() & friends where that makes obvious sense net: Fuse g_malloc(); memset() into g_new0() net: don't use set/get_pointer() in set/get_netdev() tap: fix vcpu long time io blocking on tap Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/queue.c')
| -rw-r--r-- | net/queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/queue.c b/net/queue.c index f948318718..ebbe2bb93b 100644 --- a/net/queue.c +++ b/net/queue.c @@ -62,7 +62,7 @@ NetQueue *qemu_new_net_queue(void *opaque) { NetQueue *queue; - queue = g_malloc0(sizeof(NetQueue)); + queue = g_new0(NetQueue, 1); queue->opaque = opaque; queue->nq_maxlen = 10000; |