shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-30 18:50:18 +03:00
Code Releases Activity

Merge branch 'fix-waitpkg-direct' into 'master'

Browse Source 
cpu: Fix waitpkg feature dependency for migration

See merge request libvirt/libvirt!472
This commit is contained in:
Yossi Ovadia 2025-03-24 15:32:43 +00:00
commit 88581726c7
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/cpu/cpu_x86.c
View File

@ -3499,12 +3499,25 @@ static int
virCPUx86DataAddFeature(virCPUData *cpuData,
const char *name)
{
virCPUx86Feature *feature;
virCPUx86DataItem cpuid_waitpkg_item = CPUID_EMPTY;
virCPUx86Map *map;
virCPUx86Feature *feature;
if (!(map = virCPUx86GetMap()))
return -1;
if (STREQ(name, "waitpkg")) {
/* The waitpkg feature requires CPUID.07H:ECX.waitpkg [bit 5] */
VIR_DEBUG("Adding CPU dependency for waitpkg feature");
/* Define the CPU feature bit needed for waitpkg */
cpuid_waitpkg_item.type = VIR_CPU_X86_DATA_CPUID;
cpuid_waitpkg_item.data.cpuid.eax_in = 0x00000007;
cpuid_waitpkg_item.data.cpuid.ecx_in = 0x00000000;
cpuid_waitpkg_item.data.cpuid.ecx = 0x00000020; /* Bit 5 in ECX */
virCPUx86DataAdd(cpuData, &cpuid_waitpkg_item);
}
/* ignore unknown features */
if (!(feature = x86FeatureFind(map, name)) &&
!(feature = x86FeatureFindInternal(name)))
@ -3768,7 +3781,6 @@ virCPUx86GetCanonicalModel(const char *modelName)
return model->canonical->name;
}
struct cpuArchDriver cpuDriverX86 = {
.name = "x86",
.arch = archs,