| Message ID | 20180215042900.16078-6-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw: use the BYTE-based definitions when useful | expand |
On 15.02.2018 05:28, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/mips/mips_r4k.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c > index 830ee7732c..5a74c44b9a 100644 > --- a/hw/mips/mips_r4k.c > +++ b/hw/mips/mips_r4k.c > @@ -79,8 +79,9 @@ typedef struct ResetData { > > static int64_t load_kernel(void) > { > + const size_t params_size = 264; > int64_t entry, kernel_high; > - long kernel_size, initrd_size, params_size; > + long kernel_size, initrd_size; > ram_addr_t initrd_offset; > uint32_t *params_buf; > int big_endian; > @@ -128,7 +129,6 @@ static int64_t load_kernel(void) > } > > /* Store command line. */ > - params_size = 264; > params_buf = g_malloc(params_size); > > params_buf[0] = tswap32(ram_size); > @@ -144,7 +144,6 @@ static int64_t load_kernel(void) > > rom_add_blob_fixed("params", params_buf, params_size, > (16 << 20) - 264); > - > g_free(params_buf); > return entry; > } The last hunk is an unnecessary white-space change. Did you maybe rather wanted to replace the 264 in the preceding line instead? Thomas
Hi Thomas, On 02/15/2018 03:19 AM, Thomas Huth wrote: > On 15.02.2018 05:28, Philippe Mathieu-Daudé wrote: >> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >> --- >> hw/mips/mips_r4k.c | 5 ++--- >> 1 file changed, 2 insertions(+), 3 deletions(-) >> >> diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c >> index 830ee7732c..5a74c44b9a 100644 >> --- a/hw/mips/mips_r4k.c >> +++ b/hw/mips/mips_r4k.c >> @@ -79,8 +79,9 @@ typedef struct ResetData { >> >> static int64_t load_kernel(void) >> { >> + const size_t params_size = 264; >> int64_t entry, kernel_high; >> - long kernel_size, initrd_size, params_size; >> + long kernel_size, initrd_size; >> ram_addr_t initrd_offset; >> uint32_t *params_buf; >> int big_endian; >> @@ -128,7 +129,6 @@ static int64_t load_kernel(void) >> } >> >> /* Store command line. */ >> - params_size = 264; >> params_buf = g_malloc(params_size); >> >> params_buf[0] = tswap32(ram_size); >> @@ -144,7 +144,6 @@ static int64_t load_kernel(void) >> >> rom_add_blob_fixed("params", params_buf, params_size, >> (16 << 20) - 264); >> - >> g_free(params_buf); >> return entry; >> } > > The last hunk is an unnecessary white-space change. Did you maybe rather > wanted to replace the 264 in the preceding line instead? Yes :( Since this change was a bit different than the rest, I extracted from the next patch "hw/mips: use the BYTE-based definitions" but missed. Thanks for reviewing, Phil. > > Thomas >
diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 830ee7732c..5a74c44b9a 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -79,8 +79,9 @@ typedef struct ResetData { static int64_t load_kernel(void) { + const size_t params_size = 264; int64_t entry, kernel_high; - long kernel_size, initrd_size, params_size; + long kernel_size, initrd_size; ram_addr_t initrd_offset; uint32_t *params_buf; int big_endian; @@ -128,7 +129,6 @@ static int64_t load_kernel(void) } /* Store command line. */ - params_size = 264; params_buf = g_malloc(params_size); params_buf[0] = tswap32(ram_size); @@ -144,7 +144,6 @@ static int64_t load_kernel(void) rom_add_blob_fixed("params", params_buf, params_size, (16 << 20) - 264); - g_free(params_buf); return entry; }
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/mips/mips_r4k.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)