From nobody Tue Feb 10 21:59:50 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1514570681656973.482361472949; Fri, 29 Dec 2017 10:04:41 -0800 (PST) Received: from localhost ([::1]:48919 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUz1B-0005jI-LT for importer@patchew.org; Fri, 29 Dec 2017 13:04:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUynO-00032q-9X for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:50:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eUynL-0005qH-2r for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:50:14 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:43331) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eUynK-0005pj-Uz for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:50:11 -0500 Received: by mail-qk0-x241.google.com with SMTP id j137so35733253qke.10 for ; Fri, 29 Dec 2017 09:50:10 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t41sm24223893qtt.84.2017.12.29.09.50.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Dec 2017 09:50:09 -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=NsCIQIOVlCZU/0/a0VlryyaQpjbomw05JjTR4UIPyWQ=; b=a14NjnQaGba+BYUWhsrE1InddXVW4UyjwcoiMk3JVd9sNedVTchagn2K6xWUcV5IA1 bBLyPWEy0FnWk3B9l2naTaBXmATujKudOfW5ZQciim03gycU2oKqcppEIB9YuQTYUSO/ 7eKBdJX4UrTLYwIdjxA2QAbE4T7KFuqDELPurwzbcTWeS4aOlOLwhejq+i+7+I5J02cx 5Ff9dBH+x92x7/Z1af6dySjLNySiUjwuKJeVmH2oBNO1PdpbDcvX8W4+IpXVuZcxinqD ffyBrZHSwCkLAz2lJqM5lo2X56L8qWy/zzRuegsOWL17w2Y3usLO1aVub39BoU1FzWXT 5ZWg== 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=NsCIQIOVlCZU/0/a0VlryyaQpjbomw05JjTR4UIPyWQ=; b=RvYpejtcTHEXWYr34DTlV8N7aad0cY6BM2jy1oxGV1lUhXVWnvjKS9KMc42HkaVdmX VIKoueHBJ1/CG8Wo6vkb20UMBepTNawtAxPABAVjqhbEASc8ZwDcINzNkRnjQOF5kL96 d77oB9HGCImJWEhBjxGMBF3rS4sigFTMN5UrjfyZ6WcS76zedS1B2JHbvJ3oCzMYswhZ JQsJsyqw22GYQWrdgLk3YgQKM7KL02R41W57dIzw3Y4GK3CGireerj/9RyJOHgaqtnrD F8oLQFu3JB/fd/ESwZontGXdpNK+WMSQKSV+2IQhTHVnKcTf8isxHZBp6F3MIAHFqyi9 Ewmw== X-Gm-Message-State: AKGB3mIDlu272UAmJ976Vgb3LDvAgrZNnCRU9iH2/n1A+rQKxxC0YlTu JEulbOYdwBKtbtN59kwrr9M= X-Google-Smtp-Source: ACJfBotw9t7IwuIZLMkyHkHhHptzyWJC88ZSqkSYWYqIa4n5WOAS4ogMRLZrOpCskpWv6WCl86ivTw== X-Received: by 10.233.214.1 with SMTP id r1mr32388204qkk.118.1514569810423; Fri, 29 Dec 2017 09:50:10 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Eduardo Habkost , Xiaoqiang Zhao , Andrey Smirnov Date: Fri, 29 Dec 2017 14:48:58 -0300 Message-Id: <20171229174933.1781-8-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171229174933.1781-1-f4bug@amsat.org> References: <20171229174933.1781-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:c09::241 Subject: [Qemu-devel] [PATCH v3 07/42] 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: 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 | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index ad5853d527..06a1ec6f91 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -31,6 +31,7 @@ #include "qemu/bitops.h" #include "hw/sd/sdhci.h" #include "sdhci-internal.h" +#include "qapi/error.h" #include "qemu/log.h" =20 /* host controller debug messages */ @@ -1203,15 +1204,17 @@ 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); +} + 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); - - g_free(s->fifo_buffer); - s->fifo_buffer =3D NULL; } =20 static bool sdhci_pending_insert_vmstate_needed(void *opaque) @@ -1312,6 +1315,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 @@ -1365,11 +1370,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