From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:c345:0:0:0:0:0 with SMTP id t66csp8665916lff; Thu, 16 Jan 2020 09:28:58 -0800 (PST) X-Google-Smtp-Source: APXvYqw1Vf8etXdmyHsFcxIxLPJFbBacNKFOnaBIGPQ3Ajw/KKcPbzIfveDQX1DuRqLFMbz7rzru X-Received: by 2002:aa7:da52:: with SMTP id w18mr37602081eds.92.1579195738422; Thu, 16 Jan 2020 09:28:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579195738; cv=none; d=google.com; s=arc-20160816; b=rKbaEBGbrYTHwuwJ3yTB+eecZ/lpnCFpg633knO1QhA0HHx23Qp2blaUwOaF6O3H5s EIst0nctHXXyWzzYslG5968W5MpVn7jgKiS6fN+s5WzOIxToJbZlg2mdXie0z14AHut6 D6yYxDdgHbRCqTgY3F8QLUAbfBHPu9qhS8SynGRH7QwGFzUgLsoS29fIlhiXZ6cfbpr+ jGb8NMLYb3f6U98d9xTmZR63iwEory56JUYQhV4+viFMRjIkKHQWuchSSWvTy4YMH8v1 h0qsWS3s/YWiJPSZQYvYjU9b3z+jN0PV1NOZB+BC+ScEDj71GGZ41iu2l9ewQkf82Rw2 lA8w== 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:content-transfer-encoding :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=8r6vKouu1XQ5cUrQGHdc87L4Vg/2yU0zGmekPp7zaw4=; b=kDXasNhkUl3bLyWZ1qLBEa/COEnp3AqJf4qNrnxka5e+sWH9x92rcRN3TzQEGiAy// fhS3xBBvcDvjMnckheX5HoMlCJnIbGUMJ6AG4eH/Uri4rDkqosD++0g+BJSorjOGoKWv 6cB4ImKuHaYOKDeWyjF3lO+sGmCtKqCcDpkpHHLPa8Gq3XI2oEAIG0iERaNG8axdwDwp nSPYex+FuYEthZUSWLgtCf6rWEccPmzEryOQx1KMnW6a3DrrTEWQWTmRf3m+nWe1kG28 DXXD7K6BLOrwMqmeRuXobMFp2WOHcACjc3twYo1h08zzdnfSXx9+z9WeIIYBW/411mGF aRiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=RcbMMt05; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=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 bf23si13332964edb.505.2020.01.16.09.28.58 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Jan 2020 09:28:58 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=RcbMMt05; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:45788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1is8wz-0000Py-5f for alex.bennee@linaro.org; Thu, 16 Jan 2020 12:28:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57466) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1is8wh-0000PS-73 for qemu-arm@nongnu.org; Thu, 16 Jan 2020 12:28:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1is8wc-00055i-Uq for qemu-arm@nongnu.org; Thu, 16 Jan 2020 12:28:38 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:54369 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1is8wc-00054t-R4 for qemu-arm@nongnu.org; Thu, 16 Jan 2020 12:28:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579195713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8r6vKouu1XQ5cUrQGHdc87L4Vg/2yU0zGmekPp7zaw4=; b=RcbMMt05WjmFBe7DllHa38vPqvJivvanjMfceNbT5QVb8EWlkfkFwCn9hjtcixRXxBDIS4 cTEk7S6p9OtLAWMPpsIiPPkkhI22n556HwdhYxkG8X4QIBmpVEYOwH3HXTv9UGaaYk1lwl QIGNl8wQC9QnNHAfsBLLP0d7Le1jBBM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-291-g4e7CGdqOu2r6nw8Zze9QQ-1; Thu, 16 Jan 2020 12:28:29 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2486D8017CC; Thu, 16 Jan 2020 17:28:28 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id C603A7DB4F; Thu, 16 Jan 2020 17:28:26 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH v3 18/86] arm:kzm: drop RAM size fixup Date: Thu, 16 Jan 2020 18:26:04 +0100 Message-Id: <1579195564-95459-1-git-send-email-imammedo@redhat.com> In-Reply-To: <87sgkgv6dh.wl-Peter.Chubb@data61.csiro.au> References: <87sgkgv6dh.wl-Peter.Chubb@data61.csiro.au> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: g4e7CGdqOu2r6nw8Zze9QQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter.Chubb@data61.csiro.au, peter.maydell@linaro.org, qemu-arm@nongnu.org, peter.chubb@nicta.com.au Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: MgYNUUdpJVFy If the user provided too large a RAM size, the code used to complain and trim it to the max size. Now tht RAM is allocated by generic code, that's no longer possible, so generate an error and exit instead. Signed-off-by: Igor Mammedov --- v3: * rephrase commit message in nicer way ("Chubb, Peter (Data61, Kensington NSW)" ) * reword error message and use size_to_str() to pretty print suggested siz= e ("Chubb, Peter (Data61, Kensington NSW)" ) CC: peter.chubb@nicta.com.au CC: peter.maydell@linaro.org CC: qemu-arm@nongnu.org --- hw/arm/kzm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index 1d5ef28..94cbac1 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -25,6 +25,7 @@ #include "hw/char/serial.h" #include "sysemu/qtest.h" #include "sysemu/sysemu.h" +#include "qemu/cutils.h" =20 /* Memory map for Kzm Emulation Baseboard: * 0x00000000-0x7fffffff See i.MX31 SOC for support @@ -78,10 +79,10 @@ static void kzm_init(MachineState *machine) =20 /* Check the amount of memory is compatible with the SOC */ if (machine->ram_size > (FSL_IMX31_SDRAM0_SIZE + FSL_IMX31_SDRAM1_SIZE= )) { - warn_report("RAM size " RAM_ADDR_FMT " above max supported, " - "reduced to %x", machine->ram_size, - FSL_IMX31_SDRAM0_SIZE + FSL_IMX31_SDRAM1_SIZE); - machine->ram_size =3D FSL_IMX31_SDRAM0_SIZE + FSL_IMX31_SDRAM1_SIZ= E; + char *sz =3D size_to_str(FSL_IMX31_SDRAM0_SIZE + FSL_IMX31_SDRAM1_= SIZE); + error_report("RAM size more than %s is not supported", sz); + g_free(sz); + exit(EXIT_FAILURE); } =20 memory_region_allocate_system_memory(&s->ram, NULL, "kzm.ram", --=20 2.7.4