qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, jsnow@redhat.com,
	Li Qiang <liq3ea@gmail.com>, Li Qiang <liqiang6-s@360.cn>
Subject: [Qemu-devel] [PULL for-rc1 3/3] ide: ahci: call cleanup function in ahci unit
Date: Wed, 15 Mar 2017 20:52:59 -0400	[thread overview]
Message-ID: <20170316005259.21970-4-jsnow@redhat.com> (raw)
In-Reply-To: <20170316005259.21970-1-jsnow@redhat.com>

From: Li Qiang <liq3ea@gmail.com>

This can avoid memory leak when hotunplug the ahci device.

Signed-off-by: Li Qiang <liqiang6-s@360.cn>
Message-id: 1488449293-80280-4-git-send-email-liqiang6-s@360.cn
Signed-off-by: John Snow <jsnow@redhat.com>
---
 hw/ide/ahci.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 6a17acf..f60826d 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -1485,6 +1485,18 @@ void ahci_realize(AHCIState *s, DeviceState *qdev, AddressSpace *as, int ports)
 
 void ahci_uninit(AHCIState *s)
 {
+    int i, j;
+
+    for (i = 0; i < s->ports; i++) {
+        AHCIDevice *ad = &s->dev[i];
+
+        for (j = 0; j < 2; j++) {
+            IDEState *s = &ad->port.ifs[j];
+
+            ide_exit(s);
+        }
+    }
+
     g_free(s->dev);
 }
 
-- 
2.9.3

  parent reply	other threads:[~2017-03-16  0:53 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-16  0:52 [Qemu-devel] [PULL for-rc1 0/3] Ide patches John Snow
2017-03-16  0:52 ` [Qemu-devel] [PULL for-rc1 1/3] ide: qdev: register ide bus unrealize function John Snow
2017-03-16  0:52 ` [Qemu-devel] [PULL for-rc1 2/3] ide: core: add cleanup function John Snow
2017-03-16  0:52 ` John Snow [this message]
2017-03-16 11:05 ` [Qemu-devel] [PULL for-rc1 0/3] Ide 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=20170316005259.21970-4-jsnow@redhat.com \
    --to=jsnow@redhat.com \
    --cc=liq3ea@gmail.com \
    --cc=liqiang6-s@360.cn \
    --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).