From nobody Fri May 3 10:45:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.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 1642670576598578.8542003614114; Thu, 20 Jan 2022 01:22:56 -0800 (PST) Received: from localhost ([::1]:42504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nATeh-0007vY-Es for importer@patchew.org; Thu, 20 Jan 2022 04:22:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nASve-0006VK-Di for qemu-devel@nongnu.org; Thu, 20 Jan 2022 03:36:22 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:60581) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nASvb-0001eW-1T for qemu-devel@nongnu.org; Thu, 20 Jan 2022 03:36:22 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N1Ofr-1m9Asz2vTH-012lMG; Thu, 20 Jan 2022 09:36:10 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 1/3] exec/memory: Extract address_space_set() from dma_memory_set() Date: Thu, 20 Jan 2022 09:36:05 +0100 Message-Id: <20220120083607.1672319-2-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120083607.1672319-1-laurent@vivier.eu> References: <20220120083607.1672319-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:eJMrIwsDjumB4ebiBDlgTET15Pmnl0LALy6nh2Tp+K4QI0reD3Q gae6hXZhFIL9fM9wrxq3gjbqln1Iz5YNjKJLBYqm3MSuCspDbT56dz2Po+iT4mdXmp9POzQ NHKfWTmz8c/oaEFVn4OmRyVKBXzfJqlQfbUI12HqWJZyTSefgFD3EV/jiHF52wwcZ84Vclc Zxp17nuZXKV1mQ4Q0GkFA== X-UI-Out-Filterresults: notjunk:1;V03:K0:DbXVSvwfV34=:jxBBN/NKT71MNFHjpmGQ+Z SIQrumGOBZKxHelhEwbZex0y3pNLlmHsJVOsPa7OBLgnzkpazhwiYnepfNqFnGZ7dFXtQOsnJ iFlcBVZdGScZdS0W9KJTZXInBTeUkqdRPhakervEm5m1ejPanNGwdtGLmt683GjVspIpNwwzL MXuAhx0usZ4cs4pu7o7UVwdfwanuH2j+6KrqS3NYJ7ndvqmFgoAwl7awATcTYJg1yRClUofdl wVQ/Iik6XFRXsgFazvI5wf9pQq+y1cBIBNnJqeuG/C5ZvU7JiYJEAh3NBy3+rPL9Z1HPZdYqC N0SHZ1PJeqdj8PKfg+InVgjMYGLa9VKsekz0nwzO+Mz1/HknhYL4c6jnzvTafD1TofUwaEmv+ tI6ZXCSAaieqxRajl7pWnSt8D2uN8SejIl9bPqGntI8AAQX0Q0Pt0Lyf1eV/lOthhMpjyK2cF d9p5v/+CqDlSy9ACTKd6vzaRwI64JKIrg/CqEjyaNRDf+MJHw/WKPAYnclQOcbfditdtJoSWC OuTruS/UtFXBnutYPIGn16c4eGOnHuNgXeUrbish8oOddZzDi/Zay04ZQwxOuSofHGgGsNsoZ Rrh1jOnyhpOT5KeqQxaGoMvxIefDGA4SOh+2Ql7yq8wW2BQoZKdKFdvRs/6Auxvv9KKOdSHhO QxcskU5guy+9PDVeGqr8KQrhx/tPKz3X/+BxDdo4yJsyDtNjrAaxtJYg+YsWHGX4eEzk= Received-SPF: pass (zohomail.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; Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Hildenbrand , Richard Henderson , Laurent Vivier , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Garzarella Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1642670578452100001 From: Philippe Mathieu-Daud=C3=A9 dma_memory_set() does a DMA barrier, set the address space with a constant value. The constant value filling code is not specific to DMA and can be used for AddressSpace. Extract it as a new helper: address_space_set(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Laurent Vivier Reviewed-by: Stefano Garzarella Reviewed-by: Richard Henderson [lv: rebase] Signed-off-by: Laurent Vivier Reviewed-by: David Hildenbrand Reviewed-by: Peter Xu Message-Id: <20220115203725.3834712-2-laurent@vivier.eu> --- include/exec/memory.h | 16 ++++++++++++++++ softmmu/dma-helpers.c | 15 +-------------- softmmu/physmem.c | 19 +++++++++++++++++++ 3 files changed, 36 insertions(+), 14 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 63be794a0672..4d5997e6bbae 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -2908,6 +2908,22 @@ address_space_write_cached(MemoryRegionCache *cache,= hwaddr addr, } } =20 +/** + * address_space_set: Fill address space with a constant byte. + * + * Return a MemTxResult indicating whether the operation succeeded + * or failed (eg unassigned memory, device rejected the transaction, + * IOMMU fault). + * + * @as: #AddressSpace to be accessed + * @addr: address within that address space + * @c: constant byte to fill the memory + * @len: the number of bytes to fill with the constant byte + * @attrs: memory transaction attributes + */ +MemTxResult address_space_set(AddressSpace *as, hwaddr addr, + uint8_t c, hwaddr len, MemTxAttrs attrs); + #ifdef NEED_CPU_H /* enum device_endian to MemOp. */ static inline MemOp devend_memop(enum device_endian end) diff --git a/softmmu/dma-helpers.c b/softmmu/dma-helpers.c index 1c6fba6a112e..160095e4ba7c 100644 --- a/softmmu/dma-helpers.c +++ b/softmmu/dma-helpers.c @@ -23,20 +23,7 @@ MemTxResult dma_memory_set(AddressSpace *as, dma_addr_t = addr, { dma_barrier(as, DMA_DIRECTION_FROM_DEVICE); =20 -#define FILLBUF_SIZE 512 - uint8_t fillbuf[FILLBUF_SIZE]; - int l; - MemTxResult error =3D MEMTX_OK; - - memset(fillbuf, c, FILLBUF_SIZE); - while (len > 0) { - l =3D len < FILLBUF_SIZE ? len : FILLBUF_SIZE; - error |=3D address_space_write(as, addr, attrs, fillbuf, l); - len -=3D l; - addr +=3D l; - } - - return error; + return address_space_set(as, addr, c, len, attrs); } =20 void qemu_sglist_init(QEMUSGList *qsg, DeviceState *dev, int alloc_hint, diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 3524c04c2a16..dddf70edf5d2 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -2927,6 +2927,25 @@ MemTxResult address_space_rw(AddressSpace *as, hwadd= r addr, MemTxAttrs attrs, } } =20 +MemTxResult address_space_set(AddressSpace *as, hwaddr addr, + uint8_t c, hwaddr len, MemTxAttrs attrs) +{ +#define FILLBUF_SIZE 512 + uint8_t fillbuf[FILLBUF_SIZE]; + int l; + MemTxResult error =3D MEMTX_OK; + + memset(fillbuf, c, FILLBUF_SIZE); + while (len > 0) { + l =3D len < FILLBUF_SIZE ? len : FILLBUF_SIZE; + error |=3D address_space_write(as, addr, attrs, fillbuf, l); + len -=3D l; + addr +=3D l; + } + + return error; +} + void cpu_physical_memory_rw(hwaddr addr, void *buf, hwaddr len, bool is_write) { --=20 2.34.1 From nobody Fri May 3 10:45:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.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 1642670757209302.67309186633133; Thu, 20 Jan 2022 01:25:57 -0800 (PST) Received: from localhost ([::1]:44702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAThc-0001ET-0I for importer@patchew.org; Thu, 20 Jan 2022 04:25:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nASvc-0006VA-SV for qemu-devel@nongnu.org; Thu, 20 Jan 2022 03:36:22 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:43839) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nASva-0001f0-Rw for qemu-devel@nongnu.org; Thu, 20 Jan 2022 03:36:20 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MGi6k-1n6dA12Uqo-00DqdV; Thu, 20 Jan 2022 09:36:11 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 2/3] hw/elf_ops: clear uninitialized segment space Date: Thu, 20 Jan 2022 09:36:06 +0100 Message-Id: <20220120083607.1672319-3-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120083607.1672319-1-laurent@vivier.eu> References: <20220120083607.1672319-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:oxSlAxUUbMOXEdTjbjigochLRZi6wOTFcGg0J6OPfGNKDwWnDop Y/23BdoF0iaQpCxFFNU30l3/TWxztDD3klOVvsxZrcP7hUv+671s8a4AuCC9p0loA60IEIN lnFw9t8NFB3tfXJfXqNsqCylBOfoO0gROdd4+lu+eCF+5KtrD+khvxZxF4hZ/+SB+zEdf9Q vPzEXjNh8VfMksM9BeYoQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:9N9+Xl8nSiA=:/iXEumih70kVjKCtS+wSbJ w6K3ptZyA3SdPE3+cl4qRfxBjMDTT3t89p1z5kTmjZ4YtnxAM9cA5iyZ5OcZyPT43LOpzjn5h U3NuX+E93twD5X0IxYT4n7QFi708L96DMfgzFb+xa/94hUsLJEavbrvo5IameN/94SC2Ip0hM K9MOy/3H2jcUF8ZwCGVnbCy+lVmhcjhURrLzDPLtL2jmAuWZuzheH38a8bHMNVYBPCSQfZwHQ uWLjSe4XdD6VF3lQN3zzuVeZfB08J82ismZI3tokvlPyeXy0zfIGvx4zVoOTDxOExs5Zz64XR g36Hsu85kDSgxV76exSnbq42lgqRhf2P+WVnYp97WAQkV9qpC4mRLQk6Y0Xu+ikQe3nOw8pyr Quh+6sD6T0qhmuq1rQSc0d1kOC0LaTClrMibZsUhDH3/dGNhthDMRyfmv7u0BWQcsBauDkXFk 3XXmRPbADTNNCKRlEti/hk7LxJbyTP5kEs2ZSseQKW5RNTOBMheKzb/RkhRsSXsOF3F3Cz2iF hRrOxo7sjPOTFvsZCV+dpTtRFLi6e564f0kOJLrepYV5Ozz0MvYjV10c8x3rc2HGBfM3bYhwr uUW2eexXRCFifuN93Rs4Kve8T2okz1eUactnGRYJ01q+Y2NgrDLC8o1Ixci/7GBwuqwcBIxCA ZBxDPpkL7wWdYKlQ9G3KJMw3uU2IqjVeaQ4S2zvWyCO2BPTOas3hKpvHOWHYjkeu1rRA= Received-SPF: pass (zohomail.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; Received-SPF: none client-ip=212.227.126.134; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Hildenbrand , Richard Henderson , Laurent Vivier , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Garzarella Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1642670758010100001 When the mem_size of the segment is bigger than the file_size, and if this space doesn't overlap another segment, it needs to be cleared. This bug is very similar to the one we had for linux-user, 22d113b52f41 ("linux-user: Fix loading of BSS segments"), where .bss section is encoded as an extension of the the data one by setting the segment p_memsz > p_filesz. Signed-off-by: Laurent Vivier [PMD: Use recently added address_space_set()] Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefano Garzarella Reviewed-by: Richard Henderson Message-Id: <20220115203725.3834712-3-laurent@vivier.eu> --- include/hw/elf_ops.h | 13 +++++++++++++ hw/core/loader.c | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h index 995de8495c27..7c3b1d0f6cc5 100644 --- a/include/hw/elf_ops.h +++ b/include/hw/elf_ops.h @@ -555,6 +555,19 @@ static ssize_t glue(load_elf, SZ)(const char *name, in= t fd, if (res !=3D MEMTX_OK) { goto fail; } + /* + * We need to zero'ify the space that is not copied + * from file + */ + if (file_size < mem_size) { + res =3D address_space_set(as ? as : &address_space= _memory, + addr + file_size, 0, + mem_size - file_size, + MEMTXATTRS_UNSPECIFIED); + if (res !=3D MEMTX_OK) { + goto fail; + } + } } } =20 diff --git a/hw/core/loader.c b/hw/core/loader.c index 052a0fd7198b..19edb928e999 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -1164,9 +1164,13 @@ static void rom_reset(void *unused) if (rom->mr) { void *host =3D memory_region_get_ram_ptr(rom->mr); memcpy(host, rom->data, rom->datasize); + memset(host + rom->datasize, 0, rom->romsize - rom->datasize); } else { address_space_write_rom(rom->as, rom->addr, MEMTXATTRS_UNSPECI= FIED, rom->data, rom->datasize); + address_space_set(rom->as, rom->addr + rom->datasize, 0, + rom->romsize - rom->datasize, + MEMTXATTRS_UNSPECIFIED); } if (rom->isrom) { /* rom needs to be written only once */ --=20 2.34.1 From nobody Fri May 3 10:45:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.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 1642672326747749.1093091030673; Thu, 20 Jan 2022 01:52:06 -0800 (PST) Received: from localhost ([::1]:32976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAU6v-0005hA-GR for importer@patchew.org; Thu, 20 Jan 2022 04:52:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nASve-0006VJ-9Z for qemu-devel@nongnu.org; Thu, 20 Jan 2022 03:36:22 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:34099) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nASvb-0001eX-7M for qemu-devel@nongnu.org; Thu, 20 Jan 2022 03:36:21 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MBUuV-1n0rT90sUJ-00Czga; Thu, 20 Jan 2022 09:36:12 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 3/3] m68k: virt: correctly set the initial PC Date: Thu, 20 Jan 2022 09:36:07 +0100 Message-Id: <20220120083607.1672319-4-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120083607.1672319-1-laurent@vivier.eu> References: <20220120083607.1672319-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:mpLr6PiZmsJlecnnqac9h4/jR0Hp12BnwW6zhRCSZId2tiu9idn 48ZqxWgpUm5r30h+dK51XHOguz9ahShBGfKrud7YnajNLCvokLZwYarJ/pWYYZUV9Z5SH7d FqTucM9zRtsonI0kY1vX9Y0lNInTohboQk/vlHKIn1E3vd8+JUigBC5auZYlQJMEPTLnkyh whCEVCoxsJspdYCd1rqCQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:CGJ7NzeoXbE=:yGBWzN9Xxmfu0rVDiZlLg6 XUFHSIgCdY0LsxzI4YQ0cv0EycQN1DoSLgkzmGBvA7nm8LM5cYdwvroIOtyKEqAxJA28F2q7U SO7RsGyW2C3e3MzGrDVwbMvZdoA5oxb5Nxd/AxoPGUo5pwiwBJ7y3qr07UwLtolG8zxPCw2jw GCslYq4z8CIeob2jU5E7UIs3de3cIkGrhuw9y5lcve4tIneBMyWQASznhQp9XDauoWeK2H1UL KuGgsaUkUbxvTVS1n2r/QxgbSANI0vlGjlqXJTBxIAWM0xR0WBcQN8GBmNixhp9oEjqi3uelm Gr76dCnvvr37G5h589oR2IvGfK9V6Nyp6MOvnZX7J51FbHaco7VtSi9mEiAIiGPITdDGCNO4n WZCjmc7y7+OE7aytK1RLHmAfWfn3XpjfsiH3alz+L9EhkSa26yOoG6yyHKLhDnOAbkhS+vwTT OD/GCa6stgNf8kS+LCQ5OWdTYNfCbliRKK6MsF7L3upCOP5w/FoSdpTnhNJctjdomAV1Wt1Gy Vp6bFv336+cF0MtL/U6Z77KQ3k06wjHZUYJ2uWBI4JyhqM7XyU9rs6gjIVbzxlYRRrEkL92jM 5wLTJpXggk+ob97Eq10GyIB57Ro7+bZTM5zn5pEtU/nR1WE3C+SuxdGm3IE8US52tetyph5QC yw0ZjlEtOSS54z73KQ0i74qFM3ljwYMeM28TFmr+JE9FDubzB/X2G2WWkyUYkLTOuBBE= Received-SPF: pass (zohomail.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; Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , David Hildenbrand , Laurent Vivier , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1642672328653100001 Content-Type: text/plain; charset="utf-8" According to QEMU parameter, set initial PC to the entry of the loaded kernel. Signed-off-by: Laurent Vivier Message-Id: <20220115203725.3834712-4-laurent@vivier.eu> --- hw/m68k/virt.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index 78e926a55457..bbaf630bbf20 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -85,14 +85,21 @@ #define VIRT_VIRTIO_MMIO_BASE 0xff010000 /* MMIO: 0xff010000 - 0xff01f= fff */ #define VIRT_VIRTIO_IRQ_BASE PIC_IRQ(2, 1) /* PIC: 2, 3, 4, 5, IRQ: ALL = */ =20 +typedef struct { + M68kCPU *cpu; + hwaddr initial_pc; + hwaddr initial_stack; +} ResetInfo; + static void main_cpu_reset(void *opaque) { - M68kCPU *cpu =3D opaque; + ResetInfo *reset_info =3D opaque; + M68kCPU *cpu =3D reset_info->cpu; CPUState *cs =3D CPU(cpu); =20 cpu_reset(cs); - cpu->env.aregs[7] =3D ldl_phys(cs->as, 0); - cpu->env.pc =3D ldl_phys(cs->as, 4); + cpu->env.aregs[7] =3D reset_info->initial_stack; + cpu->env.pc =3D reset_info->initial_pc; } =20 static void virt_init(MachineState *machine) @@ -113,6 +120,7 @@ static void virt_init(MachineState *machine) SysBusDevice *sysbus; hwaddr io_base; int i; + ResetInfo *reset_info; =20 if (ram_size > 3399672 * KiB) { /* @@ -124,9 +132,13 @@ static void virt_init(MachineState *machine) exit(1); } =20 + reset_info =3D g_malloc0(sizeof(ResetInfo)); + /* init CPUs */ cpu =3D M68K_CPU(cpu_create(machine->cpu_type)); - qemu_register_reset(main_cpu_reset, cpu); + + reset_info->cpu =3D cpu; + qemu_register_reset(main_cpu_reset, reset_info); =20 /* RAM */ memory_region_add_subregion(get_system_memory(), 0, machine->ram); @@ -206,7 +218,7 @@ static void virt_init(MachineState *machine) error_report("could not load kernel '%s'", kernel_filename); exit(1); } - stl_phys(cs->as, 4, elf_entry); /* reset initial PC */ + reset_info->initial_pc =3D elf_entry; parameters_base =3D (high + 1) & ~1; =20 BOOTINFO1(cs->as, parameters_base, BI_MACHTYPE, MACH_VIRT); --=20 2.34.1