From nobody Sat May 18 22:31:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) client-ip=209.85.221.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1603101112; cv=none; d=zohomail.com; s=zohoarc; b=I3MNm7Xb8hL5a5YpygA/c6pL5QofrhVn3wYJd5t8rN8kAokZ2xyZhmBsQ4T1KVY+AHXxoji8D60uFLWAKlO4Ixa+BwbTSXgXWN0rtbGndTaicB6Br5SDNUuNFJX2t2Mr3I47zKPchbpA8a2Ev+ud0B4cRWAl4cxfNGpsnxh6icg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603101112; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=wgZScEWYKTpXPaYbK3zydk54RFmHl/X/t15IeTCJRI8=; b=lnSi1NjATkirmDgA6QhCRCUsA3cTDsGZEKnphkOFf6vvMLJwaoNdSmpDcd2LTmvrHn6y87Jnq1kYzPpv9flfe0Wim+NfLIUMxO6VZgkVEhGmi7A/CqSemtjhZn1DHZaqBlbA5nOFhV2I48QZ9nmDQawTgfNOT7qB9dc9EDcAuxk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mx.zohomail.com with SMTPS id 160310111201462.65225168085021; Mon, 19 Oct 2020 02:51:52 -0700 (PDT) Received: by mail-wr1-f65.google.com with SMTP id j7so6549342wrt.9 for ; Mon, 19 Oct 2020 02:51:51 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (36.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.36]) by smtp.gmail.com with ESMTPSA id t19sm16560535wmi.26.2020.10.19.02.51.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Oct 2020 02:51:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wgZScEWYKTpXPaYbK3zydk54RFmHl/X/t15IeTCJRI8=; b=lKtrtm9n3lWzzlfifUOD61dnSul5OX0l+d8EiLEpBlUSICBCLBXbtbkDKQvkfsR7YI /ML4uNued4yo8sOLM4gqZAJQH67342v+d3NZqsLPE7W9tnvLTzhukxzWF3L4LM75uHF4 L0Esx8CQF85NBi6lGALa0FSC+OJhsJjia2YJK8M7mK0uut7cQJIlDj/Xn++jf3A6HMsa 56ld6A2mr48zasF6RnIJ/qjJTT1b6HDNHfCcR5DNaiJkRGbJZ+u2jFhW7tEBZY8XnbOW DlBvaQm3YJrDxSc8a+J8n53BohsojY2y96jKOuL3lBdxb3uqjVLETcXFaQLv5FLyh8xt //mw== 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 :mime-version:content-transfer-encoding; bh=wgZScEWYKTpXPaYbK3zydk54RFmHl/X/t15IeTCJRI8=; b=hx/8C8m2if0rNjx9x6QgiuljZeKJ/Jd9g0XPkhEdUT3wXbl8b/XISrIelzvvxJNXij IiQXFqIpEi3ji2idmoIj5aNfYMcrbt7Z2N8AUIafw1sfB4VJe+OJM3dP90LbDEhZRwAy 478kW+M67vPTTeJQ7SYLGcCwY11V92lAKlZaXwlO/7osl0M9xTgcDAQPoxVt0gbYbUdu 5zQ0yp5VVkCzls2pHDSGYJK1+io+jvt9OrrManQyEOv/IQHr+2Tj4JKvSEp4LHI90IoM bSPP+ESMVwiIJLu/tpJnpzFpGyvq9s5SXJh0FRoAcvTGe/Wn6HUmA1/+Oub5EPsB8Fq7 F1Gw== X-Gm-Message-State: AOAM533s7T6fdqlGTlyxWB+1+qQuuZEWUwufVxIL3FJYuc77dFBrIomn KLjqCI/dJ3utgn3lG4UqFxE= X-Google-Smtp-Source: ABdhPJxYcXq6cA525LLgHoX8hLgk8XlgOomhChZ92Pbomu8KzyjZL8ggl71xu1kyjTIeOBF4f4h/wg== X-Received: by 2002:adf:e54b:: with SMTP id z11mr19803289wrm.128.1603101110100; Mon, 19 Oct 2020 02:51:50 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrew Jones , Igor Mammedov , qemu-arm@nongnu.org, Peter Maydell , Richard Henderson , Thomas Huth , Andrzej Zaborowski , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH] hw/arm/nseries: Fix loading kernel image on n8x0 machines Date: Mon, 19 Oct 2020 11:51:48 +0200 Message-Id: <20201019095148.1602119-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Commit 7998beb9c2e removed the ram_size initialization in the arm_boot_info structure, however it is used by arm_load_kernel(). Initialize the field to fix: $ qemu-system-arm -M n800 -append 'console=3DttyS1' \ -kernel meego-arm-n8x0-1.0.80.20100712.1431-vmlinuz-2.6.35~rc4-129.1-n8= x0 qemu-system-arm: kernel 'meego-arm-n8x0-1.0.80.20100712.1431-vmlinuz-2.6.= 35~rc4-129.1-n8x0' is too large to fit in RAM (kernel size 1964608, RAM siz= e 0) Noticed while running the test introduced in commit 050a82f0c5b ("tests/acceptance: Add a test for the N800 and N810 arm machines"). Fixes: 7998beb9c2e ("arm/nseries: use memdev for RAM") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Tested-by: Thomas Huth --- hw/arm/nseries.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index e48092ca047..76fd7fe9854 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -1318,6 +1318,7 @@ static void n8x0_init(MachineState *machine, g_free(sz); exit(EXIT_FAILURE); } + binfo->ram_size =3D machine->ram_size; =20 memory_region_add_subregion(get_system_memory(), OMAP2_Q2_BASE, machine->ram); --=20 2.26.2