From nobody Mon Feb 9 02:43:16 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547564782860259.1824075508066; Tue, 15 Jan 2019 07:06:22 -0800 (PST) Received: from localhost ([127.0.0.1]:45226 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjQIG-0006CC-QU for importer@patchew.org; Tue, 15 Jan 2019 10:06:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjPq2-0000ex-5O for qemu-devel@nongnu.org; Tue, 15 Jan 2019 09:37:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjPq1-0006bw-EE for qemu-devel@nongnu.org; Tue, 15 Jan 2019 09:37:10 -0500 Received: from smtp39.i.mail.ru ([94.100.177.99]:47222) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gjPq0-0006aI-NI for qemu-devel@nongnu.org; Tue, 15 Jan 2019 09:37:09 -0500 Received: by smtp39.i.mail.ru with esmtpa (envelope-from ) id 1gjPpv-0002WB-PY; Tue, 15 Jan 2019 17:37:04 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail2; h=Message-Id:Date:Subject:Cc:To:From; bh=6NCVMYEc4JOTzLZufpvg+O8AXh/QJSE3SLnvO/nk3FY=; b=bEzNppblk+NHTjnIguqaSdTzUfp4zylzqX2QMse2fYfsB73/nJ0hz4yp7ozyAkL/ulDxHebGPT91xkfuadgQCq6RQgNm56Oyq7k7PgHTjucRhMd5Atm0W2J9OLX9YwdMPMgdl3i5DzwTsOlKTXh4jgc19XY1Qeae5WCrZgHIffY=; To: qemu-devel@nongnu.org Date: Tue, 15 Jan 2019 17:36:50 +0300 Message-Id: <20190115143650.15725-1-jusual@mail.ru> X-Mailer: git-send-email 2.17.1 Authentication-Results: smtp39.i.mail.ru; auth=pass smtp.auth=jusual@mail.ru smtp.mailfrom=jusual@mail.ru X-77F55803: E14BCC6235C710295A78504BD2AC2941382F125FEC086B48B4C287860157B8B55872A1FD6812A4EA7C680D6C7621AAEF X-7FA49CB5: 0D63561A33F958A5E20F56FCA9C834CE15A820E9719C64450D3D52047DE74F2B8941B15DA834481FA18204E546F3947CCE135D2742255B35F6B57BC7E64490618DEB871D839B7333395957E7521B51C2545D4CF71C94A83E9FA2833FD35BB23D27C277FBC8AE2E8B2E71C9CEE48A59EEA471835C12D1D977C4224003CC8364767815B9869FA544D8D32BA5DBAC0009BE9E8FC8737B5C22498B372E35CF5A2D2DD32BA5DBAC0009BE395957E7521B51C24DA2F55E57A558BE49FD398EE364050F599709FD55CB46A6AD7EC71F1DB88427C4224003CC836476C0CAF46E325F83A522CA9DD8327EE4931B544F03EFBC4D57106E95987218D72304CE9C7CC8E29150731C566533BA786A40A5AABA2AD371193C9F3DD0FB1AF5EB1248E41960EB3BA62623479134186CDE6BA297DBC24807EABDAD6C7F3747799A X-Mailru-Sender: 3BB5BBD9428867237E53306ADD3EC0B44112423210EB71181185FB6416421CF10477E5A05C1CC2A27C4160E8B47E48163DDE9B364B0DF2898CB68AF7A628805D594FB4C9F0DBF412AE208404248635DF X-Mras: OK X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 94.100.177.99 Subject: [Qemu-devel] [PATCH] hw/core/generic-loader: Fix PC overwriting 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: , From: Julia Suvorova via Qemu-devel Reply-To: Julia Suvorova Cc: Peter Maydell , Alistair Francis , Julia Suvorova Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If the memory is set using a file, and PC is specified on the command line, it will be overwritten with the value 'entry'. This is not only illogical, but also incorrect, because the load_ * functions do not take into account the specifics of the ARM-M PC. Signed-off-by: Julia Suvorova --- hw/core/generic-loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c index fbae05fb3b..fc81fd8e14 100644 --- a/hw/core/generic-loader.c +++ b/hw/core/generic-loader.c @@ -152,7 +152,7 @@ static void generic_loader_realize(DeviceState *dev, Er= ror **errp) if (size < 0 || s->force_raw) { /* Default to the maximum size being the machine's ram size */ size =3D load_image_targphys_as(s->file, s->addr, ram_size, as= ); - } else { + } else if (!s->addr) { s->addr =3D entry; } =20 --=20 2.17.1