On Tue, Jun 10, 2014 at 07:15:20PM +0800, 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=bind,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 node,mem=".
>
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
> Signed-off-by: Hu Tao <hu...@cn.fujitsu.com>
>
> Conflicts:
> numa.c
> qemu-options.hx
Don't keep the Conflicts option around next time pls.
I dropped this for now.
> ---
> qemu-options.hx | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/qemu-options.hx b/qemu-options.hx
> index 5375a93..73b6f1f 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -95,9 +95,11 @@ specifies the maximum number of hotpluggable CPUs.
> ETEXI
>
> DEF("numa", HAS_ARG, QEMU_OPTION_numa,
> - "-numa node[,mem=size][,memdev=id][,cpus=cpu[-cpu]][,nodeid=node]\n",
> QEMU_ARCH_ALL)
> + "-numa node[,mem=size][,cpus=cpu[-cpu]][,nodeid=node]\n"
> + "-numa node[,memdev=id][,cpus=cpu[-cpu]][,nodeid=node]\n", QEMU_ARCH_ALL)
> STEXI
> -@item -numa
> node[,mem=@var{size}][,memdev=@var{id}][,cpus=@var{cpu[-cpu]}][,nodeid=@var{node}]
> +@item -numa node[,mem=@var{size}][,cpus=@var{cpu[-cpu]}][,nodeid=@var{node}]
> +@item -numa node[,memdev=@var{id}][,cpus=@var{cpu[-cpu]}][,nodeid=@var{node}]
> @findex -numa
> Simulate a multi node NUMA system. If @samp{mem}, @samp{memdev}
> and @samp{cpus} are omitted, resources are split equally. Also, note
> --
> 1.9.3
