External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 07:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

libxl: capabilities: assume Xen version >= 4.7

Browse Source 
Remove the code handling old Xen's hwcap words,
as well as the comment describing it.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Jim Fehlig <jfehlig@suse.com>
This commit is contained in:
Ján Tomko 2021-09-05 20:48:26 +02:00
parent 3376179092
commit a8328f5222
1 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/libxl/libxl_capabilities.c
View File

@ -90,41 +90,33 @@ libxlCapsAddCPUID(virCPUData *data, virCPUx86CPUID *cpuid, ssize_t ncaps)
* across all supported versions of the libxl driver until libxl exposes a * across all supported versions of the libxl driver until libxl exposes a
* stable representation of these capabilities. Fortunately not a lot of * stable representation of these capabilities. Fortunately not a lot of
* variation happened so it's still trivial to keep track of these leafs * variation happened so it's still trivial to keep track of these leafs
* to describe host CPU in libvirt capabilities. v0 stands for Xen 4.4 * to describe host CPU in libvirt capabilities.
* up to 4.6, while v1 is meant for Xen 4.7, as depicted in the table below:
* *
* | v0 (Xen 4.4 - 4.6) | v1 (Xen >= 4.7) | * | Xen >= 4.7 |
* --------------------------------------------- * ------------------------
* word 0 | CPUID.00000001.EDX | CPUID.00000001.EDX | * word 0 | CPUID.00000001.EDX |
* word 1 | CPUID.80000001.EDX | CPUID.00000001.ECX | * word 1 | CPUID.00000001.ECX |
* word 2 | CPUID.80860001 | CPUID.80000001.EDX | * word 2 | CPUID.80000001.EDX |
* word 3 | - Linux - | CPUID.80000001.ECX | * word 3 | CPUID.80000001.ECX |
* word 4 | CPUID.00000001.ECX | CPUID.0000000D:1.EAX | * word 4 | CPUID.0000000D:1.EAX |
* word 5 | CPUID.C0000001 | CPUID.00000007:0.EBX | * word 5 | CPUID.00000007:0.EBX |
* word 6 | CPUID.80000001.ECX | CPUID.00000007:0.ECX | * word 6 | CPUID.00000007:0.ECX |
* word 7 | CPUID.00000007.EBX | CPUID.80000007.EDX | * word 7 | CPUID.80000007.EDX |
* word 8 | - Non existent - | CPUID.80000008.EBX | * word 8 | CPUID.80000008.EBX |
* *
*/ */
static virCPUData * static virCPUData *
libxlCapsNodeData(virCPUDef *cpu, libxl_hwcap hwcap, libxlCapsNodeData(virCPUDef *cpu, libxl_hwcap hwcap,
enum libxlHwcapVersion version) enum libxlHwcapVersion version G_GNUC_UNUSED)
{ {
ssize_t ncaps; ssize_t ncaps;
virCPUData *cpudata = NULL; virCPUData *cpudata = NULL;
virCPUx86CPUID cpuid[] = { virCPUx86CPUID cpuid[] = {
{ .eax_in = 0x00000001, { .eax_in = 0x00000001, .edx = hwcap[0] },
.edx = hwcap[0] }, { .eax_in = 0x00000001, .ecx = hwcap[1] },
{ .eax_in = 0x00000001, { .eax_in = 0x80000001, .edx = hwcap[2] },
.ecx = (version > LIBXL_HWCAP_V0 ? hwcap[1] : hwcap[4]) }, { .eax_in = 0x80000001, .ecx = hwcap[3] },
{ .eax_in = 0x80000001, { .eax_in = 0x00000007, .ebx = hwcap[5] },
.edx = (version > LIBXL_HWCAP_V0 ? hwcap[2] : hwcap[1]) },
{ .eax_in = 0x80000001,
.ecx = (version > LIBXL_HWCAP_V0 ? hwcap[3] : hwcap[6]) },
{ .eax_in = 0x00000007,
.ebx = (version > LIBXL_HWCAP_V0 ? hwcap[5] : hwcap[7]) },
};
virCPUx86CPUID cpuid_ver1[] = {
{ .eax_in = 0x0000000D, .ecx_in = 1U, .eax = hwcap[4] }, { .eax_in = 0x0000000D, .ecx_in = 1U, .eax = hwcap[4] },
{ .eax_in = 0x00000007, .ecx_in = 0U, .ecx = hwcap[6] }, { .eax_in = 0x00000007, .ecx_in = 0U, .ecx = hwcap[6] },
{ .eax_in = 0x80000007, .ecx_in = 0U, .edx = hwcap[7] }, { .eax_in = 0x80000007, .ecx_in = 0U, .edx = hwcap[7] },
@ -137,11 +129,6 @@ libxlCapsNodeData(virCPUDef *cpu, libxl_hwcap hwcap,
if (libxlCapsAddCPUID(cpudata, cpuid, ncaps) < 0) if (libxlCapsAddCPUID(cpudata, cpuid, ncaps) < 0)
goto error; goto error;
ncaps = G_N_ELEMENTS(cpuid_ver1);
if (version > LIBXL_HWCAP_V0 &&
libxlCapsAddCPUID(cpudata, cpuid_ver1, ncaps) < 0)
goto error;
return cpudata; return cpudata;
error: error:
@ -156,7 +143,7 @@ libxlCapsNodeData(virCPUDef *cpu, libxl_hwcap hwcap,
*/ */
static int static int
libxlCapsInitCPU(virCaps *caps, libxl_physinfo *phy_info, libxlCapsInitCPU(virCaps *caps, libxl_physinfo *phy_info,
enum libxlHwcapVersion version) enum libxlHwcapVersion version G_GNUC_UNUSED)
{ {
virCPUData *data = NULL; virCPUData *data = NULL;
virCPUDef *cpu = NULL; virCPUDef *cpu = NULL;
@ -175,8 +162,7 @@ libxlCapsInitCPU(virCaps *caps, libxl_physinfo *phy_info,
virCapabilitiesAddHostFeature(caps, "pae") < 0) virCapabilitiesAddHostFeature(caps, "pae") < 0)
goto error; goto error;
host_lm = (phy_info->hw_cap[version > LIBXL_HWCAP_V0 ? 2 : 1] host_lm = (phy_info->hw_cap[2] & LIBXL_X86_FEATURE_LM_MASK);
& LIBXL_X86_FEATURE_LM_MASK);
if (host_lm) if (host_lm)
cpu->arch = VIR_ARCH_X86_64; cpu->arch = VIR_ARCH_X86_64;
else else