From nobody Mon Feb 9 22:38:22 2026 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.zohomail.com; dkim=fail; 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 15131954908711012.9162126903177; Wed, 13 Dec 2017 12:04:50 -0800 (PST) Received: from localhost ([::1]:37375 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePDGr-0006dD-QH for importer@patchew.org; Wed, 13 Dec 2017 15:04:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePDC3-00034p-OM for qemu-devel@nongnu.org; Wed, 13 Dec 2017 14:59:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePDBy-0005eq-Pk for qemu-devel@nongnu.org; Wed, 13 Dec 2017 14:59:51 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:45715) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePDBy-0005eb-LY for qemu-devel@nongnu.org; Wed, 13 Dec 2017 14:59:46 -0500 Received: by mail-qt0-x242.google.com with SMTP id g10so5180863qtj.12 for ; Wed, 13 Dec 2017 11:59:46 -0800 (PST) Received: from x1.local ([138.117.48.211]) by smtp.gmail.com with ESMTPSA id o5sm1518876qtc.72.2017.12.13.11.59.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 11:59:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3eUkrGvN9AFd9t/Cbfdf6Qq8RzJ5cOvweYFPaf+ecvk=; b=HsIvPFrN9QnBE6G4TwrZtBtDfZUJT1V6U82nUVzQqUmatd6pzwCkp7YEpeTXLDBkkk QIPJKK+ghHyZu/h9FuxnWHYKcmYLCvd3H0nZuz9B061Bszr6MQz8RcnZUTv8Redw+bYa z+ebkYBql/1UHzJK1il+N3V5PiDLZHBrXVkVh5TOTaSVc1sQeEvyM2yv6gUenxK7zarV D9EfYdf7yXLhPVp3a2i3je7Ed2CEowTw/zfHGymw0IrYSm2A9CEfR8pA7o46GDdVeh2G fHcP2SUC5niE2Hgee1uMmjereD6EFp2U7njPSr1/x9UycPySQGZ4lNkXctf7Q8e+mDmW v37A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=3eUkrGvN9AFd9t/Cbfdf6Qq8RzJ5cOvweYFPaf+ecvk=; b=h7HvhOKrBbPJ+LsALtGP9NfDqKzzwUsi27KcWXVg8ZLQvsAbhxGqZUDFQBgePeuMBz eoo7/fbNbKvrIpbIotPn5ren/iJnev8AkbrN3Pb+DmpYHOtmu4cXaz7YBqoM5mF43pOp pzV3MEWnp8GAdspwMUhZxX79flXR6S8HSnSMWsknRpqlJzOklXp4b/mcFGEJW4j7jWTy 9+zYPVwL5u7lP1Ca389xyTPuefrcGBiugjPqkEq2W6LhE0/1y2O5kEMDD/MwECGKf8+W hjq/mQeALqynL80gGp3ja9qG4E0MZUKCIpBnX0mlaMw0C97z/aqF+9guNqHdgJGQBOeI mOKw== X-Gm-Message-State: AKGB3mKjCyWRMqcpbS9QwoSer7BwHPEw2JlpsD7QnJNLIbNowkxZEhia aYgCYbZ5ObqKH/OSkg9CbpA= X-Google-Smtp-Source: ACJfBotHbxnSze8gRkvbP+D39aE90HqeED6jOK9yIu3a/VzD2f8UO0AQcY1mWOnwaj7XtPxI9IFTEw== X-Received: by 10.200.24.221 with SMTP id o29mr13007908qtk.281.1513195186076; Wed, 13 Dec 2017 11:59:46 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Prasad J Pandit , Peter Maydell , Andrew Baumann , Andrey Smirnov , Andrey Yurovsky Date: Wed, 13 Dec 2017 16:58:47 -0300 Message-Id: <20171213195852.30439-10-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171213195852.30439-1-f4bug@amsat.org> References: <20171213195852.30439-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH 09/14] sdhci: refactor common sysbus/pci unrealize() into sdhci_unrealizefn() 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: Sai Pavan Boddu , Peter Crosthwaite , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sdhci.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 893be0e606..044e3d62f1 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -31,6 +31,7 @@ #include "hw/sd/sdhci.h" #include "sdhci-internal.h" #include "sd-internal.h" +#include "qapi/error.h" #include "qemu/log.h" =20 /* host controller debug messages */ @@ -1191,17 +1192,21 @@ static void sdhci_realizefn(SDHCIState *s, Error **= errp) SDHC_REGISTERS_MAP_SIZE); } =20 +static void sdhci_unrealizefn(SDHCIState *s, Error **errp) +{ + g_free(s->fifo_buffer); + s->fifo_buffer =3D NULL; +} + static void sdhci_uninitfn(SDHCIState *s) { timer_del(s->insert_timer); timer_free(s->insert_timer); timer_del(s->transfer_timer); timer_free(s->transfer_timer); + qemu_free_irq(s->eject_cb); qemu_free_irq(s->ro_cb); - - g_free(s->fifo_buffer); - s->fifo_buffer =3D NULL; } =20 static bool sdhci_pending_insert_vmstate_needed(void *opaque) @@ -1302,6 +1307,8 @@ static void sdhci_pci_realize(PCIDevice *dev, Error *= *errp) static void sdhci_pci_exit(PCIDevice *dev) { SDHCIState *s =3D PCI_SDHCI(dev); + + sdhci_unrealizefn(s, &error_abort); sdhci_uninitfn(s); } =20 @@ -1355,11 +1362,19 @@ static void sdhci_sysbus_realize(DeviceState *dev, = Error ** errp) sysbus_init_mmio(sbd, &s->iomem); } =20 +static void sdhci_sysbus_unrealize(DeviceState *dev, Error **errp) +{ + SDHCIState *s =3D SYSBUS_SDHCI(dev); + + sdhci_unrealizefn(s, errp); +} + static void sdhci_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->realize =3D sdhci_sysbus_realize; + dc->unrealize =3D sdhci_sysbus_unrealize; =20 sdhci_class_init(klass, data); } --=20 2.15.1