mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 17:34:18 +03:00
qemu: add support for specifying CPU "dies" topology parameter
QEMU since 4.1.0 supports the "dies" parameter for -smp Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com> Reviewed-by: Jiri Denemark <jdenemar@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
2ce9474c2a
commit
4cf8dd0c57
@ -553,6 +553,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
|
||||
"blockdev-file-dynamic-auto-read-only",
|
||||
"savevm-monitor-nodes",
|
||||
"drive-nvme",
|
||||
"smp-dies",
|
||||
);
|
||||
|
||||
|
||||
@ -2985,6 +2986,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
|
||||
{ "sandbox", "elevateprivileges", QEMU_CAPS_SECCOMP_BLACKLIST },
|
||||
{ "chardev", "fd", QEMU_CAPS_CHARDEV_FD_PASS },
|
||||
{ "overcommit", NULL, QEMU_CAPS_OVERCOMMIT },
|
||||
{ "smp-opts", "dies", QEMU_CAPS_SMP_DIES },
|
||||
};
|
||||
|
||||
static int
|
||||
|
@ -534,6 +534,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
|
||||
QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC, /* the auto-read-only property of block backends for files is dynamic */
|
||||
QEMU_CAPS_SAVEVM_MONITOR_NODES, /* 'savevm' handles monitor-owned nodes properly */
|
||||
QEMU_CAPS_DRIVE_NVME, /* -drive file.driver=nvme */
|
||||
QEMU_CAPS_SMP_DIES, /* -smp dies= */
|
||||
|
||||
QEMU_CAPS_LAST /* this must always be the last item */
|
||||
} virQEMUCapsFlags;
|
||||
|
@ -7084,7 +7084,8 @@ qemuBuildTSEGCommandLine(virCommandPtr cmd,
|
||||
|
||||
static int
|
||||
qemuBuildSmpCommandLine(virCommandPtr cmd,
|
||||
virDomainDefPtr def)
|
||||
virDomainDefPtr def,
|
||||
virQEMUCapsPtr qemuCaps)
|
||||
{
|
||||
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
|
||||
unsigned int maxvcpus = virDomainDefGetVcpusMax(def);
|
||||
@ -7109,12 +7110,14 @@ qemuBuildSmpCommandLine(virCommandPtr cmd,
|
||||
/* sockets, cores, and threads are either all zero
|
||||
* or all non-zero, thus checking one of them is enough */
|
||||
if (def->cpu && def->cpu->sockets) {
|
||||
if (def->cpu->dies != 1) {
|
||||
if (def->cpu->dies != 1 && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_DIES)) {
|
||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
||||
_("Only 1 die per socket is supported"));
|
||||
return -1;
|
||||
}
|
||||
virBufferAsprintf(&buf, ",sockets=%u", def->cpu->sockets);
|
||||
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_DIES))
|
||||
virBufferAsprintf(&buf, ",dies=%u", def->cpu->dies);
|
||||
virBufferAsprintf(&buf, ",cores=%u", def->cpu->cores);
|
||||
virBufferAsprintf(&buf, ",threads=%u", def->cpu->threads);
|
||||
} else {
|
||||
@ -9802,7 +9805,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
|
||||
if (qemuBuildMemCommandLine(cmd, cfg, def, qemuCaps, priv) < 0)
|
||||
return NULL;
|
||||
|
||||
if (qemuBuildSmpCommandLine(cmd, def) < 0)
|
||||
if (qemuBuildSmpCommandLine(cmd, def, qemuCaps) < 0)
|
||||
return NULL;
|
||||
|
||||
if (qemuBuildIOThreadCommandLine(cmd, def) < 0)
|
||||
|
@ -215,6 +215,7 @@
|
||||
<flag name='ramfb'/>
|
||||
<flag name='blockdev-file-dynamic-auto-read-only'/>
|
||||
<flag name='drive-nvme'/>
|
||||
<flag name='smp-dies'/>
|
||||
<version>4001000</version>
|
||||
<kvmVersion>0</kvmVersion>
|
||||
<microcodeVersion>43100241</microcodeVersion>
|
||||
|
@ -175,6 +175,7 @@
|
||||
<flag name='blockdev-file-dynamic-auto-read-only'/>
|
||||
<flag name='savevm-monitor-nodes'/>
|
||||
<flag name='drive-nvme'/>
|
||||
<flag name='smp-dies'/>
|
||||
<version>4001050</version>
|
||||
<kvmVersion>0</kvmVersion>
|
||||
<microcodeVersion>61700242</microcodeVersion>
|
||||
|
@ -176,6 +176,7 @@
|
||||
<flag name='machine.pseries.cap-ccf-assist'/>
|
||||
<flag name='blockdev-file-dynamic-auto-read-only'/>
|
||||
<flag name='drive-nvme'/>
|
||||
<flag name='smp-dies'/>
|
||||
<version>4001050</version>
|
||||
<kvmVersion>0</kvmVersion>
|
||||
<microcodeVersion>42900242</microcodeVersion>
|
||||
|
@ -135,6 +135,7 @@
|
||||
<flag name='query-cpu-model-comparison'/>
|
||||
<flag name='blockdev-file-dynamic-auto-read-only'/>
|
||||
<flag name='drive-nvme'/>
|
||||
<flag name='smp-dies'/>
|
||||
<version>4001050</version>
|
||||
<kvmVersion>0</kvmVersion>
|
||||
<microcodeVersion>39100242</microcodeVersion>
|
||||
|
@ -218,6 +218,7 @@
|
||||
<flag name='blockdev-file-dynamic-auto-read-only'/>
|
||||
<flag name='savevm-monitor-nodes'/>
|
||||
<flag name='drive-nvme'/>
|
||||
<flag name='smp-dies'/>
|
||||
<version>4002000</version>
|
||||
<kvmVersion>0</kvmVersion>
|
||||
<microcodeVersion>43100242</microcodeVersion>
|
||||
|
@ -15,7 +15,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
|
||||
-machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
|
||||
-m size=1048576k,slots=16,maxmem=1099511627776k \
|
||||
-overcommit mem-lock=off \
|
||||
-smp 2,sockets=2,cores=1,threads=1 \
|
||||
-smp 2,sockets=2,dies=1,cores=1,threads=1 \
|
||||
-object memory-backend-file,id=ram-node0,prealloc=yes,\
|
||||
mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,size=1073741824 \
|
||||
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
|
||||
|
@ -16,7 +16,7 @@ file=/tmp/lib/domain--1-instance-00000092/master-key.aes \
|
||||
-m 14336 \
|
||||
-mem-prealloc \
|
||||
-overcommit mem-lock=off \
|
||||
-smp 8,sockets=1,cores=8,threads=1 \
|
||||
-smp 8,sockets=1,dies=1,cores=8,threads=1 \
|
||||
-object memory-backend-memfd,id=ram-node0,hugetlb=yes,hugetlbsize=2097152,\
|
||||
share=yes,size=15032385536,host-nodes=3,policy=preferred \
|
||||
-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
|
||||
|
@ -16,7 +16,7 @@ file=/tmp/lib/domain--1-instance-00000092/master-key.aes \
|
||||
-m 14336 \
|
||||
-mem-prealloc \
|
||||
-overcommit mem-lock=off \
|
||||
-smp 8,sockets=1,cores=8,threads=1 \
|
||||
-smp 8,sockets=1,dies=1,cores=8,threads=1 \
|
||||
-object memory-backend-memfd,id=ram-node0,hugetlb=yes,hugetlbsize=2097152,\
|
||||
share=yes,size=15032385536,host-nodes=3,policy=preferred \
|
||||
-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
|
||||
|
@ -15,7 +15,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
|
||||
-machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
|
||||
-m size=219136k,slots=16,maxmem=1099511627776k \
|
||||
-overcommit mem-lock=off \
|
||||
-smp 2,sockets=2,cores=1,threads=1 \
|
||||
-smp 2,sockets=2,dies=1,cores=1,threads=1 \
|
||||
-numa node,nodeid=0,cpus=0-1,mem=214 \
|
||||
-object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\
|
||||
share=no,size=536870912 \
|
||||
|
@ -15,7 +15,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
|
||||
-machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
|
||||
-m size=219136k,slots=16,maxmem=1099511627776k \
|
||||
-overcommit mem-lock=off \
|
||||
-smp 2,sockets=2,cores=1,threads=1 \
|
||||
-smp 2,sockets=2,dies=1,cores=1,threads=1 \
|
||||
-numa node,nodeid=0,cpus=0-1,mem=214 \
|
||||
-object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\
|
||||
share=no,size=536870912,align=2097152 \
|
||||
|
@ -15,7 +15,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
|
||||
-machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
|
||||
-m size=219136k,slots=16,maxmem=1099511627776k \
|
||||
-overcommit mem-lock=off \
|
||||
-smp 2,sockets=2,cores=1,threads=1 \
|
||||
-smp 2,sockets=2,dies=1,cores=1,threads=1 \
|
||||
-numa node,nodeid=0,cpus=0-1,mem=214 \
|
||||
-object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\
|
||||
share=no,size=536870912 \
|
||||
|
@ -15,7 +15,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
|
||||
-machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
|
||||
-m size=219136k,slots=16,maxmem=1099511627776k \
|
||||
-overcommit mem-lock=off \
|
||||
-smp 2,sockets=2,cores=1,threads=1 \
|
||||
-smp 2,sockets=2,dies=1,cores=1,threads=1 \
|
||||
-numa node,nodeid=0,cpus=0-1,mem=214 \
|
||||
-object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\
|
||||
share=no,size=536870912,pmem=on \
|
||||
|
@ -15,7 +15,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
|
||||
-machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
|
||||
-m size=219136k,slots=16,maxmem=1099511627776k \
|
||||
-overcommit mem-lock=off \
|
||||
-smp 2,sockets=2,cores=1,threads=1 \
|
||||
-smp 2,sockets=2,dies=1,cores=1,threads=1 \
|
||||
-numa node,nodeid=0,cpus=0-1,mem=214 \
|
||||
-object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\
|
||||
share=no,size=536870912 \
|
||||
|
@ -15,7 +15,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
|
||||
-machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
|
||||
-m size=1048576k,slots=16,maxmem=1099511627776k \
|
||||
-overcommit mem-lock=off \
|
||||
-smp 2,sockets=2,cores=1,threads=1 \
|
||||
-smp 2,sockets=2,dies=1,cores=1,threads=1 \
|
||||
-numa node,nodeid=0,cpus=0-1,mem=1024 \
|
||||
-object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\
|
||||
size=536870912 \
|
||||
|
29
tests/qemuxml2argvdata/smp-dies.args
Normal file
29
tests/qemuxml2argvdata/smp-dies.args
Normal file
@ -0,0 +1,29 @@
|
||||
LC_ALL=C \
|
||||
PATH=/bin \
|
||||
HOME=/tmp/lib/domain--1-QEMUGuest1 \
|
||||
USER=test \
|
||||
LOGNAME=test \
|
||||
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
|
||||
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
|
||||
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
|
||||
QEMU_AUDIO_DRV=none \
|
||||
/usr/bin/qemu-system-i386 \
|
||||
-name QEMUGuest1 \
|
||||
-S \
|
||||
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
|
||||
-m 214 \
|
||||
-realtime mlock=off \
|
||||
-smp 1,maxcpus=4,sockets=2,dies=2,cores=1,threads=1 \
|
||||
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
|
||||
-display none \
|
||||
-no-user-config \
|
||||
-nodefaults \
|
||||
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
|
||||
server,nowait \
|
||||
-mon chardev=charmonitor,id=monitor,mode=control \
|
||||
-rtc base=utc \
|
||||
-no-shutdown \
|
||||
-no-acpi \
|
||||
-usb \
|
||||
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
|
||||
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1
|
33
tests/qemuxml2argvdata/smp-dies.xml
Normal file
33
tests/qemuxml2argvdata/smp-dies.xml
Normal file
@ -0,0 +1,33 @@
|
||||
<domain type='qemu'>
|
||||
<name>QEMUGuest1</name>
|
||||
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
||||
<memory unit='KiB'>219136</memory>
|
||||
<currentMemory unit='KiB'>219136</currentMemory>
|
||||
<vcpu placement='static' current='1'>4</vcpu>
|
||||
<os>
|
||||
<type arch='i686' machine='pc'>hvm</type>
|
||||
<boot dev='hd'/>
|
||||
</os>
|
||||
<cpu>
|
||||
<topology sockets='2' dies='2' cores='1' threads='1'/>
|
||||
</cpu>
|
||||
<clock offset='utc'/>
|
||||
<on_poweroff>destroy</on_poweroff>
|
||||
<on_reboot>restart</on_reboot>
|
||||
<on_crash>destroy</on_crash>
|
||||
<devices>
|
||||
<emulator>/usr/bin/qemu-system-i386</emulator>
|
||||
<disk type='block' device='disk'>
|
||||
<driver name='qemu' type='raw'/>
|
||||
<source dev='/dev/HostVG/QEMUGuest1'/>
|
||||
<target dev='hda' bus='ide'/>
|
||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||
</disk>
|
||||
<controller type='usb' index='0'/>
|
||||
<controller type='ide' index='0'/>
|
||||
<controller type='pci' index='0' model='pci-root'/>
|
||||
<input type='mouse' bus='ps2'/>
|
||||
<input type='keyboard' bus='ps2'/>
|
||||
<memballoon model='none'/>
|
||||
</devices>
|
||||
</domain>
|
@ -1689,6 +1689,7 @@ mymain(void)
|
||||
DO_TEST("qemu-ns-alt", NONE);
|
||||
|
||||
DO_TEST("smp", NONE);
|
||||
DO_TEST("smp-dies", QEMU_CAPS_SMP_DIES);
|
||||
|
||||
DO_TEST("iothreads", QEMU_CAPS_OBJECT_IOTHREAD);
|
||||
DO_TEST("iothreads-ids", QEMU_CAPS_OBJECT_IOTHREAD);
|
||||
|
Loading…
Reference in New Issue
Block a user