qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Gonglei <arei.gonglei@huawei.com>,
	Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PULL for-2.4 1/9] rocker: fix memory leak
Date: Tue,  7 Jul 2015 13:38:17 +0100	[thread overview]
Message-ID: <1436272705-28499-2-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1436272705-28499-1-git-send-email-stefanha@redhat.com>

From: Gonglei <arei.gonglei@huawei.com>

Meanwhile, using g_new0 instead of g_malloc0,
refer to commit 5839e53.

Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Message-id: 1435213450-6700-1-git-send-email-arei.gonglei@huawei.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/net/rocker/rocker.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
index 4d25842..7e06015 100644
--- a/hw/net/rocker/rocker.c
+++ b/hw/net/rocker/rocker.c
@@ -96,7 +96,7 @@ World *rocker_get_world(Rocker *r, enum rocker_world_type type)
 
 RockerSwitch *qmp_query_rocker(const char *name, Error **errp)
 {
-    RockerSwitch *rocker = g_malloc0(sizeof(*rocker));
+    RockerSwitch *rocker;
     Rocker *r;
 
     r = rocker_find(name);
@@ -106,6 +106,7 @@ RockerSwitch *qmp_query_rocker(const char *name, Error **errp)
         return NULL;
     }
 
+    rocker = g_new0(RockerSwitch, 1);
     rocker->name = g_strdup(r->name);
     rocker->id = r->switch_id;
     rocker->ports = r->fp_ports;
-- 
2.4.3

  reply	other threads:[~2015-07-07 12:38 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-07 12:38 [Qemu-devel] [PULL for-2.4 0/9] Net patches Stefan Hajnoczi
2015-07-07 12:38 ` Stefan Hajnoczi [this message]
2015-07-07 12:38 ` [Qemu-devel] [PULL for-2.4 2/9] e1000: flush packets when link comes up Stefan Hajnoczi
2015-07-07 12:38 ` [Qemu-devel] [PULL for-2.4 3/9] vmxnet3: Fix incorrect small packet padding Stefan Hajnoczi
2015-07-07 12:38 ` [Qemu-devel] [PULL for-2.4 4/9] rocker: don't queue receive pkts when port is disabled Stefan Hajnoczi
2015-07-07 12:38 ` [Qemu-devel] [PULL for-2.4 5/9] rocker: fix misplaced break statement Stefan Hajnoczi
2015-07-07 12:38 ` [Qemu-devel] [PULL for-2.4 6/9] rocker: fix missing break statements Stefan Hajnoczi
2015-07-07 12:38 ` [Qemu-devel] [PULL for-2.4 7/9] rocker: return -1 when dropping packet on ingress Stefan Hajnoczi
2015-07-07 12:38 ` [Qemu-devel] [PULL for-2.4 8/9] rocker: mark copy-to-cpu pkts as forwarding offloaded Stefan Hajnoczi
2015-07-07 12:38 ` [Qemu-devel] [PULL for-2.4 9/9] rocker: tests: don't need to specify master/self when setting vlans Stefan Hajnoczi
2015-07-07 15:57 ` [Qemu-devel] [PULL for-2.4 0/9] Net patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1436272705-28499-2-git-send-email-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=arei.gonglei@huawei.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).