From nobody Wed May 8 13:33:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1488449440103782.9463610412661; Thu, 2 Mar 2017 02:10:40 -0800 (PST) Received: from localhost ([::1]:51357 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjNgz-0004St-R8 for importer@patchew.org; Thu, 02 Mar 2017 05:10:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46772) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjNf1-0003Xc-Dn for qemu-devel@nongnu.org; Thu, 02 Mar 2017 05:08:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cjNf0-0007fh-E5 for qemu-devel@nongnu.org; Thu, 02 Mar 2017 05:08:35 -0500 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:35343) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cjNf0-0007fD-8m for qemu-devel@nongnu.org; Thu, 02 Mar 2017 05:08:34 -0500 Received: by mail-pf0-x244.google.com with SMTP id 67so1971490pfg.2 for ; Thu, 02 Mar 2017 02:08:32 -0800 (PST) Received: from localhost.localdomain.localdomain ([104.192.110.250]) by smtp.gmail.com with ESMTPSA id l22sm15951965pfk.69.2017.03.02.02.08.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Mar 2017 02:08:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+NsoY96FFEd4xPfFIfOdlfSwPuHT+EmJXnebLSvK6yQ=; b=CQUuomZg2zpDVG/+ll/dHBZYjFBwCR2Fk0lUfXzVgHBlZZ+ZRT8pbrOfl+HLgc6gyd P7HsQKjEVM/bP7f2zJPEBunlLZEB/mTFzQrlpYQU9mi3q2auZNnL/u4SHES4W19ceFKW 5xehBwRcI81RrqMlFa9Q6Nr7Byjj/d70sQQS1Qc5IZ9wTlculvDzDysfSYDnvJ+ZJlBo 1Jw7mNPQXZnu+BzgmsfJBcOKSqTHhy7EbM7XtOxPYKT7uijKFrKRBlFAPw7iOme7ORk5 wwLe+XEyw3I07guk9V0mWlzMMk0WzTfzimPiPtIE764R5Erhyd6tI2xX+RoSFAIlkZc2 9o/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+NsoY96FFEd4xPfFIfOdlfSwPuHT+EmJXnebLSvK6yQ=; b=o/bF86mgJgMAzvnjgYW1k/ojBMA+iVYnLnI2BCfoi+nFGevIi+Witk2nfWo/mTHXts 5DZcmaudmH6zLfrRgzQ+lThrpHawUu1yNdZo0ARV/W170TP6TqNQJCaE3ts2ksrc2u5f 0j5uH6LVRY3v7B/AKPFkLhKk1nF5/wf19E3jxdX2NyUf860NBM/fF8xD6arzhZFGLvMs fWXJ2nSluqMEqyhBU65Y83qUZIndl2d5Ycr36ZwfFmJ3UCzAqkgrQ0gn6sNt74T2sk8c wzFeBjG8qXEQXFAMgxvTQzwDRU8fNygel+8JjxxEoiGBShknjORfXbQR9MOj8+OHXxwd 5KRw== X-Gm-Message-State: AMke39nauiSR/+OMfUMOnwBNSF6Lt3Kh+odc4HTIyr/mWdevlBZJjegvTGo1XlJ3liVjlg== X-Received: by 10.99.237.17 with SMTP id d17mr14391050pgi.82.1488449311612; Thu, 02 Mar 2017 02:08:31 -0800 (PST) From: Li Qiang X-Google-Original-From: Li Qiang To: jsnow@redhat.com, qemu-devel@nongnu.org Date: Thu, 2 Mar 2017 02:08:11 -0800 Message-Id: <1488449293-80280-2-git-send-email-liqiang6-s@360.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1488449293-80280-1-git-send-email-liqiang6-s@360.cn> References: <1488449293-80280-1-git-send-email-liqiang6-s@360.cn> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::244 Subject: [Qemu-devel] [PATCH 1/3] ide: qdev: register ide bus unrealize function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, Li Qiang , ppandit@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" we have an idebus unrealize function, but it was being registered as the unrealize function for the IDE Device, so it was not getting invoked on device teardown because nothing is "unrealizing" the IDE devices themselves. Suggested-by: John Snow Signed-off-by: Li Qiang Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/ide/qdev.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index dbaa75c..fbf7aa5 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -31,7 +31,7 @@ /* --------------------------------- */ =20 static char *idebus_get_fw_dev_path(DeviceState *dev); -static void idebus_unrealize(DeviceState *qdev, Error **errp); +static void idebus_unrealize(BusState *qdev, Error **errp); =20 static Property ide_props[] =3D { DEFINE_PROP_UINT32("unit", IDEDevice, unit, -1), @@ -43,14 +43,15 @@ static void ide_bus_class_init(ObjectClass *klass, void= *data) BusClass *k =3D BUS_CLASS(klass); =20 k->get_fw_dev_path =3D idebus_get_fw_dev_path; + k->unrealize =3D idebus_unrealize; } =20 -static void idebus_unrealize(DeviceState *qdev, Error **errp) +static void idebus_unrealize(BusState *bus, Error **errp) { - IDEBus *bus =3D DO_UPCAST(IDEBus, qbus, qdev->parent_bus); + IDEBus *ibus =3D IDE_BUS(bus); =20 - if (bus->vmstate) { - qemu_del_vm_change_state_handler(bus->vmstate); + if (ibus->vmstate) { + qemu_del_vm_change_state_handler(ibus->vmstate); } } =20 @@ -365,7 +366,6 @@ static void ide_device_class_init(ObjectClass *klass, v= oid *data) k->init =3D ide_qdev_init; set_bit(DEVICE_CATEGORY_STORAGE, k->categories); k->bus_type =3D TYPE_IDE_BUS; - k->unrealize =3D idebus_unrealize; k->props =3D ide_props; } =20 --=20 1.8.3.1 From nobody Wed May 8 13:33:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1488449373459439.58468389125073; Thu, 2 Mar 2017 02:09:33 -0800 (PST) Received: from localhost ([::1]:51353 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjNfu-0003hR-1u for importer@patchew.org; Thu, 02 Mar 2017 05:09:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjNfB-0003eT-RR for qemu-devel@nongnu.org; Thu, 02 Mar 2017 05:08:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cjNf6-0007gg-Mu for qemu-devel@nongnu.org; Thu, 02 Mar 2017 05:08:45 -0500 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:35356) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cjNf6-0007gW-Hp for qemu-devel@nongnu.org; Thu, 02 Mar 2017 05:08:40 -0500 Received: by mail-pf0-x241.google.com with SMTP id 67so1971809pfg.2 for ; Thu, 02 Mar 2017 02:08:40 -0800 (PST) Received: from localhost.localdomain.localdomain ([104.192.110.250]) by smtp.gmail.com with ESMTPSA id l22sm15951965pfk.69.2017.03.02.02.08.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Mar 2017 02:08:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RxDU2ztMUMKrY44nBZ5duSg1CZtF58fZWlXo8QURdcI=; b=GFEascf2Yia7Aw+0l0hKVPyjpNZfmelLhi41H8UlZdp1Ml/97K9o2NZipGd4JznSdb XjD+BNgN483RFETXNnUMkLJ62L6ceqX7jShTIOp4KcJJczKj2cI+/m1o6zvhPsky5VQK W9g0hD+9XmQ2iaHnLoCD7sO6HljOaBRGP7L2x8lRwzVNyifu4gakd1KdarfuS7Kw3968 sTjLJhvjAcyGp/+PZ9RLYlM15F83QJgzw7e/ieQNvzlT/SQ5xam++zIY0V4LIXKE+v5G HfJswQ/+0l8nsqyV7mzTbWVxNBkh2gxyauMVw1X3ou5kRHd7e4h9S6X/WudZjuTJmgAV C64Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RxDU2ztMUMKrY44nBZ5duSg1CZtF58fZWlXo8QURdcI=; b=pmFy3av3SlHHNmSLJSe/Dv1anurH9SSAsynfe7kJE8+HXfpgPjTRWL/00iz0n3onsr wgHB0PsEkgSsceVDEM55sZIwbTNS68xmJ7sqtQha9rJf38Z8qM00DkPLwKmyotx2TV7H Y8jo8t48eZxk9fpCFkAAQiPSy2cweVkBlUpKx/AKd2MeML3UB0eioiJ/xN+aSdbdxpFK 4d17BWlwVGwR8JX28slYAw3EcpodBxxBOP79fxSUImzyzKZ1X+qPi9yYT+BR8iJj3EKe eoqnwOY2bym6qTSCW6TlVVuuZP6SHhMR3Az19LQBOPispCNyQAwuD46rblKVhBZ7XcM9 uJgQ== X-Gm-Message-State: AMke39kJrTpythegbk09FyRWZ7UdOPTIsWDbZ7+VvhdKAUAr+b47abeB0nNta6jdgrxvmg== X-Received: by 10.84.209.167 with SMTP id y36mr2897091plh.11.1488449319781; Thu, 02 Mar 2017 02:08:39 -0800 (PST) From: Li Qiang X-Google-Original-From: Li Qiang To: jsnow@redhat.com, qemu-devel@nongnu.org Date: Thu, 2 Mar 2017 02:08:12 -0800 Message-Id: <1488449293-80280-3-git-send-email-liqiang6-s@360.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1488449293-80280-1-git-send-email-liqiang6-s@360.cn> References: <1488449293-80280-1-git-send-email-liqiang6-s@360.cn> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::241 Subject: [Qemu-devel] [PATCH 2/3] ide: core: add cleanup function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, Li Qiang , ppandit@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" As the pci ahci can be hotplug and unplug, in the ahci unrealize function it should free all the resource once allocated in the realized function. This patch add ide_exit to free the resource. Signed-off-by: Li Qiang --- hw/ide/core.c | 8 ++++++++ include/hw/ide/internal.h | 1 + 2 files changed, 9 insertions(+) diff --git a/hw/ide/core.c b/hw/ide/core.c index cfa5de6..e971a94 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2603,6 +2603,14 @@ void ide_init2(IDEBus *bus, qemu_irq irq) bus->dma =3D &ide_dma_nop; } =20 +void ide_exit(IDEState *s) +{ + timer_del(s->sector_write_timer); + timer_free(s->sector_write_timer); + qemu_vfree(s->smart_selftest_data); + qemu_vfree(s->io_buffer); +} + static const MemoryRegionPortio ide_portio_list[] =3D { { 0, 8, 1, .read =3D ide_ioport_read, .write =3D ide_ioport_write }, { 0, 1, 2, .read =3D ide_data_readw, .write =3D ide_data_writew }, diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h index 88dc118..482a951 100644 --- a/include/hw/ide/internal.h +++ b/include/hw/ide/internal.h @@ -607,6 +607,7 @@ int ide_init_drive(IDEState *s, BlockBackend *blk, IDED= riveKind kind, uint32_t cylinders, uint32_t heads, uint32_t secs, int chs_trans); void ide_init2(IDEBus *bus, qemu_irq irq); +void ide_exit(IDEState *s); void ide_init_ioport(IDEBus *bus, ISADevice *isa, int iobase, int iobase2); void ide_register_restart_cb(IDEBus *bus); =20 --=20 1.8.3.1 From nobody Wed May 8 13:33:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1488449463218303.8167271263985; Thu, 2 Mar 2017 02:11:03 -0800 (PST) Received: from localhost ([::1]:51363 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjNhN-0004m9-Ur for importer@patchew.org; Thu, 02 Mar 2017 05:11:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46829) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjNfG-0003jA-5L for qemu-devel@nongnu.org; Thu, 02 Mar 2017 05:08:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cjNfF-0007iT-85 for qemu-devel@nongnu.org; Thu, 02 Mar 2017 05:08:50 -0500 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:35366) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cjNfF-0007iB-2f for qemu-devel@nongnu.org; Thu, 02 Mar 2017 05:08:49 -0500 Received: by mail-pf0-x242.google.com with SMTP id 67so1972093pfg.2 for ; Thu, 02 Mar 2017 02:08:49 -0800 (PST) Received: from localhost.localdomain.localdomain ([104.192.110.250]) by smtp.gmail.com with ESMTPSA id l22sm15951965pfk.69.2017.03.02.02.08.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Mar 2017 02:08:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Osxwj7YPDhQaVrThvDo3bsLH2oEpxuEyahesqk/tcGo=; b=ctsIiN6pdPpdDPQzSMcKsxDqyKoHX2aUMTLFS2NOnwUE+Tf4dFCuxaA9dTe9kaSpYU E9yPXFkKHerAAbnrhP74r2UzVE1StStYBnfJEgbJPIPh93wZsJPds/H2ysfMxdPWrmY0 tIIajc1IRiEhZOm4qNZU3GAWqMvy/8tyk6b6qviZ4AHIRq3kN9VSNS8yfwqZ6LSx+COj swAQpyG4N6SzEctT/oz5RJ5xLgfdfw1dAKoysGxbNDlwJuNcrzWyNw8eoQCwjPvB6Mcx BiImOfcbhhj2GRSN02IGmbd54mfnPm0YFoJZ2ox3yyw9MyFgyetKZ8Tq9XYQjUnKAJOX +udQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Osxwj7YPDhQaVrThvDo3bsLH2oEpxuEyahesqk/tcGo=; b=SjXI+LuyT6sbl7bn4NJbgLPLxSzpuhgaOweyU9sCsxJzePTkGXAN9xVpOIM/eMlAU6 cBpXBVaKQWfmyxYoXPixGlfJoeGZqWHlgSH3PpWOjYXBNxIFB3w9+o5aqr6XFvofNjwy 5brHftAqb4ztwOzFCoz+11qizoxPnXbvsx+ik9z+g9ISApYpzXa+fLqAzAoxW8Lkk98H 31/BZkURYgxABvEOdcxm6jfKPAtS+5TT2hs+L/JHV11PNpDPme8mczeUHwYaTBJdJ+P4 bdVoax8BQD1TEJeUKXAJKAlDccqmE5utsP/S0W9/p1OaffRLYy3zvpIM9TMA4uwOdP7Y pjMg== X-Gm-Message-State: AMke39msewsDzrVQFgQ9k0xX4lyv//nHonVmuNnXnrj6iwrPU26hDIx8iPaNVe89GfsHyw== X-Received: by 10.84.231.205 with SMTP id g13mr17468443pln.30.1488449328294; Thu, 02 Mar 2017 02:08:48 -0800 (PST) From: Li Qiang X-Google-Original-From: Li Qiang To: jsnow@redhat.com, qemu-devel@nongnu.org Date: Thu, 2 Mar 2017 02:08:13 -0800 Message-Id: <1488449293-80280-4-git-send-email-liqiang6-s@360.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1488449293-80280-1-git-send-email-liqiang6-s@360.cn> References: <1488449293-80280-1-git-send-email-liqiang6-s@360.cn> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [PATCH 3/3] ide: ahci: call cleanup function in ahci unit X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, Li Qiang , ppandit@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This can avoid memory leak when hotunplug the ahci device. Signed-off-by: Li Qiang --- 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, A= ddressSpace *as, int ports) =20 void ahci_uninit(AHCIState *s) { + int i, j; + + for (i =3D 0; i < s->ports; i++) { + AHCIDevice *ad =3D &s->dev[i]; + + for (j =3D 0; j < 2; j++) { + IDEState *s =3D &ad->port.ifs[j]; + + ide_exit(s); + } + } + g_free(s->dev); } =20 --=20 1.8.3.1