Message ID | 20181214144214.1260-20-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | c0983085d127b1efb287337de26679c051abda07 |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2171894ljp; Fri, 14 Dec 2018 07:02:06 -0800 (PST) X-Google-Smtp-Source: AFSGD/Vah636wnszZOhQUDTWa9w3zs2Z5Z7aapW/KZN4zTtYOXTLknLdo3HqPf1P2RR5bRkth6LW X-Received: by 2002:a0c:9144:: with SMTP id q62mr3060042qvq.87.1544799725965; Fri, 14 Dec 2018 07:02:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544799725; cv=none; d=google.com; s=arc-20160816; b=yyLjFLeA9+2LXUMFdRZDhzLMReCgbNuQyxX55QCDCBofxlrjEI/EMhs1qluefoVl7G KZR4wHeUHBKVtIPFWgdZzSL1DQNP50xl64fq8VYQNt3UZmBy8RMHr96+P82u2DQXA8SV qnwoQ30d0Rw6j1eCdKEjpNHSCoQma2OxhsG2R0FM6LQDZyzyygtw4zVyRdSrsZD70tP0 RV2W7HLj6R2fXaHPVxiJ2Q8lQjvg4kYaXbXcoezf6EoGRBwfZEtzJSsb8Zxa8FksEPQx SBzsc9rzJDJmRiheFCvjYTy1gyZEhladLYi3Vd+x1xbucadl6lY7FMd/Kzu4tzd3L5Vv eNLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=2GPyWqSYkAEFqDz7mP26xlhA8vIsr5qfNrs56IHVHVM=; b=Gf0w1QSMdavjFmsvj1aJ2V4B5nSEMyc/ETnOGkwSDx3zuYHatgM4MymeNvZsuIq3I2 Dfn5QwsI/0a0jcAFY7aZZSXYBf7wJIS8Kay2uoZ7tC6ymqAPxtvluODnskzMSSALAPhb nWvh7UgAa89bReW4Jt9ODG75qz0n0WtvSmNFDDNPN6IS7Z8LJftiL7ghj6NS17dv4ZpG F841M4BbMXlY78tucdEY+HmDJCfq1lu50WdIWuiH1/iN3lFYWtMCNiw+TW3iiWEIBYzH sFvSWvLnXIknlHz0vuvCYVDE8bGel0C6D5eRWSuBbIsuiZ8blQvsFZkKEfJ6YxKA2N8i 43FQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dSRxZ5PJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o5si1213951qkc.148.2018.12.14.07.02.05 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 14 Dec 2018 07:02:05 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dSRxZ5PJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33987 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1gXoya-0001nh-R9 for patch@linaro.org; Fri, 14 Dec 2018 10:02:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1gXofr-0000EK-NK for qemu-devel@nongnu.org; Fri, 14 Dec 2018 09:42:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1gXofq-0004XI-OR for qemu-devel@nongnu.org; Fri, 14 Dec 2018 09:42:43 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:36867) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1gXofq-0004UL-G0 for qemu-devel@nongnu.org; Fri, 14 Dec 2018 09:42:42 -0500 Received: by mail-wm1-x332.google.com with SMTP id g67so6030163wmd.2 for <qemu-devel@nongnu.org>; Fri, 14 Dec 2018 06:42:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=2GPyWqSYkAEFqDz7mP26xlhA8vIsr5qfNrs56IHVHVM=; b=dSRxZ5PJTZmn9S3pZHWaAHTbZ9UAMGNNg12i5slmdsHg19vxvUqXvXrFBp4CSeCZJz F3FVLHKX+D8XgvVitbtDQy738+1SXrf8BRZG/orHNAaGdUY8VBEZeQJu9+MukamKIojR Pcnls72vh877CoRjbYcz17I3mAwuDdz750ZGA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2GPyWqSYkAEFqDz7mP26xlhA8vIsr5qfNrs56IHVHVM=; b=DwxMNAIMuBtNcBnS28EJdC2/Tkv53iIB6aBrdQ/AVvEGcXAfZJGISl8HMCj+ZsY+t9 uUBg+1trpPgOsQRS0N31H+vD/9bdNjU5VKafAiB8roCu9rA8ZVud/O4GQ+iHoNymMJ6P G10IGf9tahYenkM3q+0FVwhbDr6LkCGh5qp4btwPWIeXh+hPRau7NiBKZUW+NITT6wjV Aaw3yrKfHjc+ISylczGgV74/Ag2uxu5miZDgIlROFNiAmK0lUbRQVXjLqaARMzoMibFn RBGhGhK2SiW/vCQRaC5yHhikkc5ZiS730LPe944C4Uyc4yqsQkfzTJoHInOB2O1OEMbX axcQ== X-Gm-Message-State: AA+aEWYOhv0hiQjDboSwrigcLczec2F3H1jbVDlZssGgzj/8RDHy8N4R xB4dQvomGLFyetevoqGClCPMVwgb2Kg= X-Received: by 2002:a7b:c8d7:: with SMTP id f23mr3373900wml.121.1544798559109; Fri, 14 Dec 2018 06:42:39 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id m6sm3263204wrv.24.2018.12.14.06.42.38 for <qemu-devel@nongnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Dec 2018 06:42:38 -0800 (PST) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Fri, 14 Dec 2018 14:42:11 +0000 Message-Id: <20181214144214.1260-20-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181214144214.1260-1-peter.maydell@linaro.org> References: <20181214144214.1260-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::332 Subject: [Qemu-devel] [PULL 19/22] hw/sd/sdhci: Don't leak memory region in sdhci_sysbus_realize() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
misc queue
|
expand
|
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 81bbf032794..83f1574ffdc 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1371,7 +1371,7 @@ static void sdhci_common_realize(SDHCIState *s, Error **errp) s->buf_maxsz = sdhci_get_fifolen(s); s->fifo_buffer = g_malloc0(s->buf_maxsz); - memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci", + memory_region_init_io(&s->iomem, OBJECT(s), s->io_ops, s, "sdhci", SDHC_REGISTERS_MAP_SIZE); } @@ -1565,9 +1565,6 @@ static void sdhci_sysbus_realize(DeviceState *dev, Error ** errp) sysbus_init_irq(sbd, &s->irq); - memory_region_init_io(&s->iomem, OBJECT(s), s->io_ops, s, "sdhci", - SDHC_REGISTERS_MAP_SIZE); - sysbus_init_mmio(sbd, &s->iomem); }