Page MenuHomeFreeBSD
Files F146262567

D43935.id134835.diff
No OneTemporary
Actions

D43935.id134835.diff
View Options

diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c
--- a/sys/x86/xen/hvm.c
+++ b/sys/x86/xen/hvm.c
@@ -147,7 +147,7 @@
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 @@
* 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 @@
{
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);
}
diff --git a/sys/x86/xen/xen_apic.c b/sys/x86/xen/xen_apic.c
--- a/sys/x86/xen/xen_apic.c
+++ b/sys/x86/xen/xen_apic.c
@@ -343,8 +343,8 @@
* 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;

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 2, 5:18 AM (18 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29143476
Default Alt Text
D43935.id134835.diff (1 KB)

Event Timeline