hw/riscv: sifive_e: Add 'const' to sifive_e_memmap[]

[PATCH] hw/riscv: sifive_e: Add 'const' to sifive_e_memmap[]

Posted by Bin Meng 3 years, 1 month ago

This was accidentally dropped before. Add it back.

Reported-by: Emmanuel Blot <eblot.ml@gmail.com>
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 hw/riscv/sifive_e.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c
index f939bcf9ea..82096b3e5a 100644
--- a/hw/riscv/sifive_e.c
+++ b/hw/riscv/sifive_e.c
@@ -50,7 +50,7 @@
 #include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"
 
-static MemMapEntry sifive_e_memmap[] = {
+static const MemMapEntry sifive_e_memmap[] = {
     [SIFIVE_E_DEV_DEBUG] =    {        0x0,     0x1000 },
     [SIFIVE_E_DEV_MROM] =     {     0x1000,     0x2000 },
     [SIFIVE_E_DEV_OTP] =      {    0x20000,     0x2000 },
-- 
2.25.1

Re: [PATCH] hw/riscv: sifive_e: Add 'const' to sifive_e_memmap[]

Posted by Philippe Mathieu-Daudé 3 years, 1 month ago

On 3/31/21 12:36 PM, Bin Meng wrote:
> This was accidentally dropped before. Add it back.
> 

Fixes: 732612856a8 ("hw/riscv: Drop 'struct MemmapEntry'")

> Reported-by: Emmanuel Blot <eblot.ml@gmail.com>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
> 
>  hw/riscv/sifive_e.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c
> index f939bcf9ea..82096b3e5a 100644
> --- a/hw/riscv/sifive_e.c
> +++ b/hw/riscv/sifive_e.c
> @@ -50,7 +50,7 @@
>  #include "sysemu/sysemu.h"
>  #include "exec/address-spaces.h"
>  
> -static MemMapEntry sifive_e_memmap[] = {
> +static const MemMapEntry sifive_e_memmap[] = {
>      [SIFIVE_E_DEV_DEBUG] =    {        0x0,     0x1000 },
>      [SIFIVE_E_DEV_MROM] =     {     0x1000,     0x2000 },
>      [SIFIVE_E_DEV_OTP] =      {    0x20000,     0x2000 },
>

Re: [PATCH] hw/riscv: sifive_e: Add 'const' to sifive_e_memmap[]

Posted by Alistair Francis 3 years, 1 month ago

On Wed, Mar 31, 2021 at 6:36 AM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> This was accidentally dropped before. Add it back.
>
> Reported-by: Emmanuel Blot <eblot.ml@gmail.com>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>
>  hw/riscv/sifive_e.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c
> index f939bcf9ea..82096b3e5a 100644
> --- a/hw/riscv/sifive_e.c
> +++ b/hw/riscv/sifive_e.c
> @@ -50,7 +50,7 @@
>  #include "sysemu/sysemu.h"
>  #include "exec/address-spaces.h"
>
> -static MemMapEntry sifive_e_memmap[] = {
> +static const MemMapEntry sifive_e_memmap[] = {
>      [SIFIVE_E_DEV_DEBUG] =    {        0x0,     0x1000 },
>      [SIFIVE_E_DEV_MROM] =     {     0x1000,     0x2000 },
>      [SIFIVE_E_DEV_OTP] =      {    0x20000,     0x2000 },
> --
> 2.25.1
>
>

Re: [PATCH] hw/riscv: sifive_e: Add 'const' to sifive_e_memmap[]

Posted by Alistair Francis 3 years, 1 month ago

On Wed, Mar 31, 2021 at 6:36 AM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> This was accidentally dropped before. Add it back.
>
> Reported-by: Emmanuel Blot <eblot.ml@gmail.com>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

Thanks!

Applied to riscv-to-apply.next

Alistair

> ---
>
>  hw/riscv/sifive_e.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c
> index f939bcf9ea..82096b3e5a 100644
> --- a/hw/riscv/sifive_e.c
> +++ b/hw/riscv/sifive_e.c
> @@ -50,7 +50,7 @@
>  #include "sysemu/sysemu.h"
>  #include "exec/address-spaces.h"
>
> -static MemMapEntry sifive_e_memmap[] = {
> +static const MemMapEntry sifive_e_memmap[] = {
>      [SIFIVE_E_DEV_DEBUG] =    {        0x0,     0x1000 },
>      [SIFIVE_E_DEV_MROM] =     {     0x1000,     0x2000 },
>      [SIFIVE_E_DEV_OTP] =      {    0x20000,     0x2000 },
> --
> 2.25.1
>
>