shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 01:34:11 +03:00
Code Releases Activity

cpu_x86: Properly drop non-migratable features

Browse Source 
By removing a non-migratable feature in a for loop we would fail to drop
every second non-migratable feature if the features array contained
several of them in a row.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2016-06-28 11:12:41 +02:00
parent dbb14bb0f1
commit 1ac897a15d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cpu/cpu_x86.c
View File

@ -1816,8 +1816,11 @@ x86Decode(virCPUDefPtr cpu,
* Note: this only works as long as no CPU model contains non-migratable
* features directly */
if (flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE) {
for (i = 0; i < cpuModel->nfeatures; i++) {
if (!x86FeatureIsMigratable(cpuModel->features[i].name, map)) {
i = 0;
while (i < cpuModel->nfeatures) {
if (x86FeatureIsMigratable(cpuModel->features[i].name, map)) {
i++;
} else {
VIR_FREE(cpuModel->features[i].name);
VIR_DELETE_ELEMENT_INPLACE(cpuModel->features, i,
cpuModel->nfeatures);
@ -2542,8 +2545,11 @@ x86UpdateHostModel(virCPUDefPtr guest,
/* Remove non-migratable features by default
* Note: this only works as long as no CPU model contains non-migratable
* features directly */
for (i = 0; i < guest->nfeatures; i++) {
if (!x86FeatureIsMigratable(guest->features[i].name, map)) {
i = 0;
while (i < guest->nfeatures) {
if (x86FeatureIsMigratable(guest->features[i].name, map)) {
i++;
} else {
VIR_FREE(guest->features[i].name);
VIR_DELETE_ELEMENT_INPLACE(guest->features, i, guest->nfeatures);
}