From patchwork Tue Mar 19 16:35:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 160581 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp4088956jad; Tue, 19 Mar 2019 09:40:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqyJ5aKquCyVRpGsQsClVx0zOe6MHFhl5z1qJjUNwyDdKIhLyyvYPAAyhzeNZ4g84W1N3tTf X-Received: by 2002:adf:ea04:: with SMTP id q4mr7096450wrm.97.1553013625690; Tue, 19 Mar 2019 09:40:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553013625; cv=none; d=google.com; s=arc-20160816; b=rpMFc+hNclBKqM0elvis1Y6ZEQ+Xc+IMqi2oaly0WyxkRWqNeE9CfkI+3uPCRLDtBd /KqPRG4kK0PT3zzeH44DbhS+Z1S9446osR2LTowuInsDvtWIz8GJTDLsuPpX5kFztrkm lF7gzJUf9JbMLlHOmyBU2epzk2chORuvaViwwxa3SqfTaesr3sVKwM8L5ZEuZk4cfGLo DVYkchofMOfqYS2wT+OHCNC1ZGUmJYF9jcKYevABOfrpPrEltiE3aBSbOYPknryACliP /OO3oSCDiDL11Bs/HIc3kDxU5Niu0H5w18D5M0s6ndMkg4ckkgp8+jF36Erdo0chSVyQ 368A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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; bh=ZABv4PFttYO4Bw7u+wzXFupkQz9IVJmb/OqUMLsukvo=; b=JcmZpRxCLtLVIBLtEIUvvaaG5KO3sVhbkXmtD0QpsEtJCLJndc7Vqe7+uqYlDYUq3M oNQ5O9g3G9bZxiaHrNSYXGzibuvHmC3JNLcF+vNKHbn1bmdtmlgGOq05IqGsp0H711rQ 3gPPTc35IYcz6h0ew2+asz9xW7xFCT074lw6MQdRPua+ZITjEn4ILzEOXSaAitdmqVZl T8VsOmGYMW6oEW6C5nXAu5GE7uYQaVAzz//yJn51rtdMLmMT2jgZecx0ltOBwm3fOgzP 9a4nKgH8t7RM/AI44gAnb2NRqeFsdi/8I/I3ixuLfVyVY5684C2jhjAKd6CNqEAlZKOy w1nw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j63si1871338wmb.172.2019.03.19.09.40.25 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Mar 2019 09:40:25 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([127.0.0.1]:60089 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6Hmq-00072g-LN for patch@linaro.org; Tue, 19 Mar 2019 12:40:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6Hic-0003vY-Hg for qemu-devel@nongnu.org; Tue, 19 Mar 2019 12:36:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6Hib-0006XQ-6v for qemu-devel@nongnu.org; Tue, 19 Mar 2019 12:36:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34080) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6HiX-0006Ro-VT; Tue, 19 Mar 2019 12:35:58 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1D6978762E; Tue, 19 Mar 2019 16:35:57 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-132.ams2.redhat.com [10.36.116.132]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 88D0D28545; Tue, 19 Mar 2019 16:35:53 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0888B113861C; Tue, 19 Mar 2019 17:35:52 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 19 Mar 2019 17:35:51 +0100 Message-Id: <20190319163551.32499-3-armbru@redhat.com> In-Reply-To: <20190319163551.32499-1-armbru@redhat.com> References: <20190319163551.32499-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 19 Mar 2019 16:35:57 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v8 2/2] pflash: Bury disabled code to limit device sizes 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: kwolf@redhat.com, qemu-block@nongnu.org, alex.bennee@linaro.org, philmd@redhat.com, mreitz@redhat.com, lersek@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée We disabled code to limit device sizes to 8, 16, 32 or 64MiB more than a decade ago in commit 95d1f3edd5e and c8b153d7949, v0.9.1. Bury. Signed-off-by: Alex Bennée Reviewed-by: Laszlo Ersek [Extracted from a larger patch, extended to pflash_cfi02.c] Signed-off-by: Markus Armbruster --- hw/block/pflash_cfi01.c | 7 ------- hw/block/pflash_cfi02.c | 6 ------ 2 files changed, 13 deletions(-) -- 2.17.2 diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 9937739a82..16dfae14b8 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -731,13 +731,6 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp) } device_len = sector_len_per_device * blocks_per_device; - /* XXX: to be fixed */ -#if 0 - if (total_len != (8 * 1024 * 1024) && total_len != (16 * 1024 * 1024) && - total_len != (32 * 1024 * 1024) && total_len != (64 * 1024 * 1024)) - return NULL; -#endif - memory_region_init_rom_device( &pfl->mem, OBJECT(dev), &pflash_cfi01_ops, diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 9b934305fa..f2c6201f81 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -551,12 +551,6 @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp) } chip_len = pfl->sector_len * pfl->nb_blocs; - /* XXX: to be fixed */ -#if 0 - if (total_len != (8 * 1024 * 1024) && total_len != (16 * 1024 * 1024) && - total_len != (32 * 1024 * 1024) && total_len != (64 * 1024 * 1024)) - return NULL; -#endif memory_region_init_rom_device(&pfl->orig_mem, OBJECT(pfl), pfl->be ? &pflash_cfi02_ops_be : &pflash_cfi02_ops_le,