External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: capabilities: Move setting of PPC specific flags to virQEMUCapsInitQMPBasicArch

Browse Source 
QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT and
QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT are now always asserted on PPC
machine types, move them to virQEMUCapsInitQMPBasicArch.

It's now always set for AARCH64, move it into the function setting basic
caps for the emulator.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa 2021-03-30 17:15:06 +02:00
parent b613404be4
commit fcd9bfcf13
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/qemu/qemu_capabilities.c
View File

@ -5070,6 +5070,10 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
case VIR_ARCH_PPC64:
case VIR_ARCH_PPC64LE:
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT);
break;
case VIR_ARCH_ALPHA:
case VIR_ARCH_PPC:
case VIR_ARCH_PPCEMB:
@ -5129,15 +5133,6 @@ virQEMUCapsInitQMPVersionCaps(virQEMUCaps *qemuCaps)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NUMA_DIST);
if (ARCH_IS_PPC64(qemuCaps->arch)) {
/* HPT resizing is supported since QEMU 2.10 on ppc64; unfortunately
* there's no sane way to probe for it */
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
/* no way to query max-cpu-compat */
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT);
}
/* -enable-fips is deprecated in QEMU 5.2.0, and QEMU
* should be built with gcrypt to achieve FIPS compliance
* automatically / implicitly

4
tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
View File

@ -10,8 +10,8 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
-S \
-machine pseries,accel=kvm,usb=off,dump-guest-core=off \
-cpu host,compat=power9 \
-machine pseries,accel=kvm,usb=off,dump-guest-core=off,max-cpu-compat=power9 \
-cpu host \
-m 256 \
-realtime mlock=off \
-smp 4,sockets=4,cores=1,threads=1 \

4
tests/qemuxml2argvdata/pseries-cpu-compat.args
View File

@ -10,8 +10,8 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
-S \
-machine pseries,accel=kvm,usb=off,dump-guest-core=off \
-cpu host,compat=power7 \
-machine pseries,accel=kvm,usb=off,dump-guest-core=off,max-cpu-compat=power7 \
-cpu host \
-m 256 \
-realtime mlock=off \
-smp 4,sockets=4,cores=1,threads=1 \