| Message ID | 1793576616012e06e68cd9e0215eb907ff2ef12b.1541627403.git.alistair.francis@wdc.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [for,3.1,v1,1/1] hw/riscv/virt: Free the test device tree node name | expand |
On Wed, 07 Nov 2018 13:51:45 PST (-0800), Alistair Francis wrote: > Signed-off-by: Alistair Francis <alistair.francis@wdc.com> > --- > hw/riscv/virt.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index 4a137a503c..2b38f89070 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -240,6 +240,7 @@ static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, > qemu_fdt_setprop_cells(fdt, nodename, "reg", > 0x0, memmap[VIRT_TEST].base, > 0x0, memmap[VIRT_TEST].size); > + g_free(nodename); > > nodename = g_strdup_printf("/uart@%lx", > (long)memmap[VIRT_UART0].base); > -- > 2.19.1 Thanks. I got a bit behind this week so I didn't send the pre-PR, but I indent to send a PR tomorrow. That PR currently only contains this patch.
On Wed, Nov 7, 2018 at 6:38 PM Palmer Dabbelt <palmer@sifive.com> wrote: > > On Wed, 07 Nov 2018 13:51:45 PST (-0800), Alistair Francis wrote: > > Signed-off-by: Alistair Francis <alistair.francis@wdc.com> > > --- > > hw/riscv/virt.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > > index 4a137a503c..2b38f89070 100644 > > --- a/hw/riscv/virt.c > > +++ b/hw/riscv/virt.c > > @@ -240,6 +240,7 @@ static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, > > qemu_fdt_setprop_cells(fdt, nodename, "reg", > > 0x0, memmap[VIRT_TEST].base, > > 0x0, memmap[VIRT_TEST].size); > > + g_free(nodename); > > > > nodename = g_strdup_printf("/uart@%lx", > > (long)memmap[VIRT_UART0].base); > > -- > > 2.19.1 > > Thanks. I got a bit behind this week so I didn't send the pre-PR, but I indent > to send a PR tomorrow. That PR currently only contains this patch. There should be two patches. One for spike and one for the virt machine. Alistair
On Thu, 08 Nov 2018 10:37:28 PST (-0800), alistair23@gmail.com wrote: > On Wed, Nov 7, 2018 at 6:38 PM Palmer Dabbelt <palmer@sifive.com> wrote: >> >> On Wed, 07 Nov 2018 13:51:45 PST (-0800), Alistair Francis wrote: >> > Signed-off-by: Alistair Francis <alistair.francis@wdc.com> >> > --- >> > hw/riscv/virt.c | 1 + >> > 1 file changed, 1 insertion(+) >> > >> > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c >> > index 4a137a503c..2b38f89070 100644 >> > --- a/hw/riscv/virt.c >> > +++ b/hw/riscv/virt.c >> > @@ -240,6 +240,7 @@ static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, >> > qemu_fdt_setprop_cells(fdt, nodename, "reg", >> > 0x0, memmap[VIRT_TEST].base, >> > 0x0, memmap[VIRT_TEST].size); >> > + g_free(nodename); >> > >> > nodename = g_strdup_printf("/uart@%lx", >> > (long)memmap[VIRT_UART0].base); >> > -- >> > 2.19.1 >> >> Thanks. I got a bit behind this week so I didn't send the pre-PR, but I indent >> to send a PR tomorrow. That PR currently only contains this patch. > > There should be two patches. One for spike and one for the virt machine. Oh, sorry about that -- I thought they were the same patch! Peter: let me know if you want me to submit a new copy of this PR with both patches or a follow-on PR. Sorry for the noise!
On Wed, Nov 7, 2018 at 1:52 PM Alistair Francis <Alistair.Francis@wdc.com> wrote: > Signed-off-by: Alistair Francis <alistair.francis@wdc.com> > --- > hw/riscv/virt.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index 4a137a503c..2b38f89070 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -240,6 +240,7 @@ static void *create_fdt(RISCVVirtState *s, const > struct MemmapEntry *memmap, > qemu_fdt_setprop_cells(fdt, nodename, "reg", > 0x0, memmap[VIRT_TEST].base, > 0x0, memmap[VIRT_TEST].size); > + g_free(nodename); > > nodename = g_strdup_printf("/uart@%lx", > (long)memmap[VIRT_UART0].base); > -- > 2.19.1 > Reviewed-by: Palmer Dabbelt <palmer@sifive.com>
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 4a137a503c..2b38f89070 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -240,6 +240,7 @@ static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, qemu_fdt_setprop_cells(fdt, nodename, "reg", 0x0, memmap[VIRT_TEST].base, 0x0, memmap[VIRT_TEST].size); + g_free(nodename); nodename = g_strdup_printf("/uart@%lx", (long)memmap[VIRT_UART0].base);
Signed-off-by: Alistair Francis <alistair.francis@wdc.com> --- hw/riscv/virt.c | 1 + 1 file changed, 1 insertion(+)