1:33 a.m.
Currently, virQEMUCapsUpdateCPUDeprecatedFeatures only allows for
disabling deprecated features. This locks the deprecated_features
attribute to only do something if set to 'off'.
Let's add a virCPUFeaturePolicy to the function's parameters which will
allow the caller to decide what happens to these features.
Add a test with guest XML using deprecated_features='on' to ensure the
API is working properly.
Signed-off-by: Collin Walling <walling(a)linux.ibm.com>
---
src/qemu/qemu_capabilities.c | 6 ++--
src/qemu/qemu_capabilities.h | 3 +-
src/qemu/qemu_driver.c | 3 +-
src/qemu/qemu_process.c | 10 ++++--
...l-deprecated-features-on.s390x-latest.args | 32 +++++++++++++++++++
...el-deprecated-features-on.s390x-latest.xml | 25 +++++++++++++++
.../cpu-model-deprecated-features-on.xml | 15 +++++++++
tests/qemuxmlconftest.c | 1 +
8 files changed, 88 insertions(+), 7 deletions(-)
create mode 100644
tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-latest.args
create mode 100644
tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-latest.xml
create mode 100644 tests/qemuxmlconfdata/cpu-model-deprecated-features-on.xml
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index b600dd38b8..275f2f1e0b 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3347,7 +3347,8 @@ virQEMUCapsGetCPUFeatures(virQEMUCaps *qemuCaps,
void
virQEMUCapsUpdateCPUDeprecatedFeatures(virQEMUCaps *qemuCaps,
virDomainVirtType virtType,
- virCPUDef *cpu)
+ virCPUDef *cpu,
+ virCPUFeaturePolicy policy)
{
qemuMonitorCPUModelInfo *modelInfo;
size_t i;
@@ -3358,8 +3359,7 @@ virQEMUCapsUpdateCPUDeprecatedFeatures(virQEMUCaps *qemuCaps,
return;
for (i = 0; i < g_strv_length(modelInfo->deprecated_props); i++) {
- virCPUDefUpdateFeature(cpu, modelInfo->deprecated_props[i],
- VIR_CPU_FEATURE_DISABLE);
+ virCPUDefUpdateFeature(cpu, modelInfo->deprecated_props[i], policy);
}
}
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index df33212a34..50d3f7226c 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -779,7 +779,8 @@ int virQEMUCapsGetCPUFeatures(virQEMUCaps *qemuCaps,
char ***features);
void virQEMUCapsUpdateCPUDeprecatedFeatures(virQEMUCaps *qemuCaps,
virDomainVirtType virtType,
- virCPUDef *cpu);
+ virCPUDef *cpu,
+ virCPUFeaturePolicy policy);
virDomainVirtType virQEMUCapsGetVirtType(virQEMUCaps *qemuCaps);
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 893fa0c66c..0638fea59c 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -16716,7 +16716,8 @@ qemuConnectGetDomainCapabilities(virConnectPtr conn,
if (flags & VIR_CONNECT_GET_DOMAIN_CAPABILITIES_DISABLE_DEPRECATED_FEATURES) {
virQEMUCapsUpdateCPUDeprecatedFeatures(qemuCaps, virttype,
- domCaps->cpu.hostModel);
+ domCaps->cpu.hostModel,
+ VIR_CPU_FEATURE_DISABLE);
}
return virDomainCapsFormat(domCaps);
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 04e5c005a0..e4f8cb8c01 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -6595,8 +6595,14 @@ qemuProcessUpdateGuestCPU(virDomainDef *def,
return -1;
}
- if (def->cpu->deprecated_feats == VIR_TRISTATE_SWITCH_OFF) {
- virQEMUCapsUpdateCPUDeprecatedFeatures(qemuCaps, def->virtType, def->cpu);
+ if (def->cpu->deprecated_feats) {
+
+ virCPUFeaturePolicy policy = VIR_CPU_FEATURE_REQUIRE;
+ if (def->cpu->deprecated_feats == VIR_TRISTATE_SWITCH_OFF)
+ policy = VIR_CPU_FEATURE_DISABLE;
+
+ virQEMUCapsUpdateCPUDeprecatedFeatures(qemuCaps, def->virtType,
+ def->cpu, policy);
}
return 0;
diff --git a/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-latest.args
b/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-latest.args
new file mode 100644
index 0000000000..8cdb2a2ac2
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-latest.args
@@ -0,0 +1,32 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-guest \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
+/usr/bin/qemu-system-s390x \
+-name guest=guest,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}'
\
+-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \
+-accel kvm \
+-cpu
gen16a-base,nnpa=on,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,mepoch=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,pai=on,paie=on,mepochptff=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,appv=on,apqi=on,apft=on,els=on,iep=on,appvi=on,apqci=on,cte=on,ais=on,bpb=on,ctop=on,gs=on,ppa15=on,zpci=on,rdp=on,sea_esop2=on,beareh=on,te=on,cmm=on,vxpdeh2=on
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 22782664-6b93-46bf-9595-317220dd2d1c \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-latest.xml
b/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-latest.xml
new file mode 100644
index 0000000000..3bea664f40
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-latest.xml
@@ -0,0 +1,25 @@
+<domain type='kvm'>
+ <name>guest</name>
+ <uuid>22782664-6b93-46bf-9595-317220dd2d1c</uuid>
+ <memory unit='KiB'>219100</memory>
+ <currentMemory unit='KiB'>219100</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <cpu mode='host-model' check='partial'
deprecated_features='on'/>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-s390x</emulator>
+ <controller type='pci' index='0' model='pci-root'/>
+ <audio id='1' type='none'/>
+ <memballoon model='virtio'>
+ <address type='ccw' cssid='0xfe' ssid='0x0'
devno='0x0000'/>
+ </memballoon>
+ <panic model='s390'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.xml
b/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.xml
new file mode 100644
index 0000000000..a5b11a41df
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.xml
@@ -0,0 +1,15 @@
+<domain type='kvm'>
+ <name>guest</name>
+ <uuid>22782664-6b93-46bf-9595-317220dd2d1c</uuid>
+ <memory unit='KiB'>219100</memory>
+ <currentMemory unit='KiB'>219100</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
+ </os>
+ <cpu mode='host-model' check='partial'
deprecated_features='on'/>
+ <clock offset='utc'/>
+ <devices>
+ <emulator>/usr/bin/qemu-system-s390x</emulator>
+ </devices>
+</domain>
diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 7fe51ba4f8..5615a7b130 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -2282,6 +2282,7 @@ mymain(void)
DO_TEST_CAPS_ARCH_VER_FAILURE("cpu-model-deprecated-features-off",
"s390x", "8.2.0");
DO_TEST_CAPS_ARCH_LATEST("cpu-model-deprecated-features-off",
"s390x");
+ DO_TEST_CAPS_ARCH_LATEST("cpu-model-deprecated-features-on",
"s390x");
DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-Haswell", "x86_64",
ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-Haswell2", "x86_64",
ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
--
2.47.1