system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-07 00:50:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86/xen: replace xen_cpuid_base with hv_base

Browse source 
Where possible, replace the usage of xen_cpuid_base for hv_base in preparation
for removing xen_cpuid_base.

No functional change intended.

Sponsored by: Cloud Software Group
Reviewed by: markj
Differential revision: https://reviews.freebsd.org/D43935
This commit is contained in:
Roger Pau Monné 2024-02-02 12:04:50 +01:00
parent 027b66d64b
commit f0cf86c075
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/x86/xen/hvm.c
View file

@ -147,7 +147,7 @@ hypervisor_version(void)
uint32_t regs[4];
int major, minor;
do_cpuid(xen_cpuid_base + 1, regs);
do_cpuid(hv_base + 1, regs);
major = regs[0] >> 16;
minor = regs[0] & 0xffff;
@ -595,8 +595,8 @@ xen_hvm_cpu_init(void)
* Set vCPU ID. If available fetch the ID from CPUID, if not just use
* the ACPI ID.
*/
KASSERT(xen_cpuid_base != 0, ("Invalid base Xen CPUID leaf"));
cpuid_count(xen_cpuid_base + 4, 0, regs);
KASSERT(hv_base != 0, ("Invalid base Xen CPUID leaf"));
cpuid_count(hv_base + 4, 0, regs);
KASSERT((regs[0] & XEN_HVM_CPUID_VCPU_ID_PRESENT) ||
!xen_pv_domain(),
("Xen PV domain without vcpu_id in cpuid"));
@ -626,8 +626,8 @@ xen_has_iommu_maps(void)
{
uint32_t regs[4];
KASSERT(xen_cpuid_base != 0, ("Invalid base Xen CPUID leaf"));
cpuid_count(xen_cpuid_base + 4, 0, regs);
KASSERT(hv_base != 0, ("Invalid base Xen CPUID leaf"));
cpuid_count(hv_base + 4, 0, regs);
return (regs[0] & XEN_HVM_CPUID_IOMMU_MAPPINGS);
}

4
sys/x86/xen/xen_apic.c
View file

@ -343,8 +343,8 @@ xen_setup_cpus(void)
* that's faster than using event channels because it avoids the VM
* exit.
*/
KASSERT(xen_cpuid_base != 0, ("Invalid base Xen CPUID leaf"));
cpuid_count(xen_cpuid_base + 4, 0, regs);
KASSERT(hv_base != 0, ("Invalid base Xen CPUID leaf"));
cpuid_count(hv_base + 4, 0, regs);
if ((x2apic_mode && (regs[0] & XEN_HVM_CPUID_X2APIC_VIRT)) ||
(!x2apic_mode && (regs[0] & XEN_HVM_CPUID_APIC_ACCESS_VIRT)))
return;