diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-09-09 12:08:52 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-09-09 12:08:52 +0300 |
| commit | ea571d06d8e39187663f255d62b886bf01371667 (patch) | |
| tree | 2662790614ecc0e6bdc9541aa2550388f9a7e34e /qemu-options.hx | |
| parent | Merge commit 'fd83e9b9dc7adac8244c613e0a51baa4610bb46d' into upstream-merge (diff) | |
| parent | Support for multiple -monitor devices (diff) | |
| download | qemu-kvm-ea571d06d8e39187663f255d62b886bf01371667.tar.gz qemu-kvm-ea571d06d8e39187663f255d62b886bf01371667.tar.bz2 qemu-kvm-ea571d06d8e39187663f255d62b886bf01371667.zip | |
Merge commit 'ddd9bbd93bb2c12ade72dff1790d6d292aac073f' into upstream-merge
* commit 'ddd9bbd93bb2c12ade72dff1790d6d292aac073f':
Support for multiple -monitor devices
net: Fix send queue ordering
do not issue ioctl from within the io thread
Delay sighandler_setup()
Remove typedef for bool from eepro100.c
add documentation for multi-core features
piix3: use new vmstate infrastructure
i440fx: use new vmstate infrastructure
VMState: Fix sub-structs versioning
Update SaveVM versions
pci_irq_levels[] belong to PIIX3State
Save irq_state into PCII440FXState
Conflicts:
vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index c1ec97681..f2e602ab4 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -39,15 +39,23 @@ Select CPU model (-cpu ? for list and additional feature selection) ETEXI DEF("smp", HAS_ARG, QEMU_OPTION_smp, - "-smp n[,maxcpus=cpus]\n" + "-smp n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets]\n" " set the number of CPUs to 'n' [default=1]\n" " maxcpus= maximum number of total cpus, including\n" - " offline CPUs for hotplug etc.\n") + " offline CPUs for hotplug etc.\n" + " cores= number of CPU cores on one socket\n" + " threads= number of threads on one CPU core\n" + " sockets= number of discrete sockets in the system\n") STEXI -@item -smp @var{n} +@item -smp @var{n}[,cores=@var{cores}][,threads=@var{threads}][,sockets=@var{sockets}][,maxcpus=@var{maxcpus}] Simulate an SMP system with @var{n} CPUs. On the PC target, up to 255 CPUs are supported. On Sparc32 target, Linux limits the number of usable CPUs to 4. +For the PC target, the number of @var{cores} per socket, the number +of @var{threads} per cores and the total number of @var{sockets} can be +specified. Missing values will be computed. If any on the three values is +given, the total number of CPUs @var{n} can be omitted. @var{maxcpus} +specifies the maximum number of hotpluggable CPUs. ETEXI DEF("numa", HAS_ARG, QEMU_OPTION_numa, |