| Message ID | 1420523839-11672-3-git-send-email-zhaoshenglong@huawei.com |
|---|---|
| State | New |
| Headers | show |
On 6 January 2015 at 05:57, Shannon Zhao <zhaoshenglong@huawei.com> wrote: > To support memory NUMA, don't add memory node in creat_fdt. > But add it in a new function which takes into accout NUMA > topology. > > Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com> > --- > hw/arm/virt.c | 2 -- > 1 files changed, 0 insertions(+), 2 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index fdafa79..505cd29 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -190,8 +190,6 @@ static void create_fdt(VirtBoardInfo *vbi) > * to fill in necessary properties later > */ > qemu_fdt_add_subnode(fdt, "/chosen"); > - qemu_fdt_add_subnode(fdt, "/memory"); > - qemu_fdt_setprop_string(fdt, "/memory", "device_type", "memory"); > > /* Clock node, for the benefit of the UART. The kernel device tree > * binding documentation claims the PL011 node clock properties are This patch will break bisection of all platforms using device tree; you need to keep things working at all points in your patch series, not just at the end when all the patches are applied. thanks -- PMM
On 2015/1/6 17:55, Peter Maydell wrote: > On 6 January 2015 at 05:57, Shannon Zhao <zhaoshenglong@huawei.com> wrote: >> To support memory NUMA, don't add memory node in creat_fdt. >> But add it in a new function which takes into accout NUMA >> topology. >> >> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com> >> --- >> hw/arm/virt.c | 2 -- >> 1 files changed, 0 insertions(+), 2 deletions(-) >> >> diff --git a/hw/arm/virt.c b/hw/arm/virt.c >> index fdafa79..505cd29 100644 >> --- a/hw/arm/virt.c >> +++ b/hw/arm/virt.c >> @@ -190,8 +190,6 @@ static void create_fdt(VirtBoardInfo *vbi) >> * to fill in necessary properties later >> */ >> qemu_fdt_add_subnode(fdt, "/chosen"); >> - qemu_fdt_add_subnode(fdt, "/memory"); >> - qemu_fdt_setprop_string(fdt, "/memory", "device_type", "memory"); >> >> /* Clock node, for the benefit of the UART. The kernel device tree >> * binding documentation claims the PL011 node clock properties are > > This patch will break bisection of all platforms using device tree; > you need to keep things working at all points in your patch series, > not just at the end when all the patches are applied. > Hi Peter, Thanks for your remind. I'll make the patch 2 and 3 together in next version. Thanks, Shannon
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index fdafa79..505cd29 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -190,8 +190,6 @@ static void create_fdt(VirtBoardInfo *vbi) * to fill in necessary properties later */ qemu_fdt_add_subnode(fdt, "/chosen"); - qemu_fdt_add_subnode(fdt, "/memory"); - qemu_fdt_setprop_string(fdt, "/memory", "device_type", "memory"); /* Clock node, for the benefit of the UART. The kernel device tree * binding documentation claims the PL011 node clock properties are
To support memory NUMA, don't add memory node in creat_fdt. But add it in a new function which takes into accout NUMA topology. Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com> --- hw/arm/virt.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)