On Mon, Mar 03, 2014 at 05:10:20PM -0700, Eric Blake wrote: > On 02/19/2014 12:54 AM, Hu Tao wrote: > > From: Paolo Bonzini <pbonz...@redhat.com> > > > > This option provides the infrastructure for binding guest NUMA nodes > > to host NUMA nodes. For example: > > > > -object memory-ram,size=1024M,policy=membind,host-nodes=0,id=ram-node0 \ > > -numa node,nodeid=0,cpus=0,memdev=ram-node0 \ > > -object > > memory-ram,size=1024M,policy=interleave,host-nodes=1-3,id=ram-node1 \ > > -numa node,nodeid=1,cpus=1,memdev=ram-node1 > > > > The option replaces "-numa mem". > > > > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > > > > Conflicts: > > include/sysemu/sysemu.h > > numa.c > > Until this patch is taken upstream, a 'Conflicts:' section in your > commit message doesn't make sense. That is useful for downstream or > stable branch backports, but doesn't belong on the mainline branch.
I think this was introduced during rebase. Will fix. Thanks.
