33c33
< __FBSDID("$FreeBSD: head/sys/x86/xen/xen_intr.c 255726 2013-09-20 05:06:03Z gibbs $");
---
> __FBSDID("$FreeBSD: head/sys/x86/xen/xen_intr.c 256073 2013-10-05 23:11:01Z gibbs $");
614c614
< int acpi_id = pcpu_find(cpu)->pc_acpi_id;
---
> int vcpu_id = pcpu_find(cpu)->pc_vcpu_id;
616c616
< struct evtchn_bind_ipi bind_ipi = { .vcpu = acpi_id };
---
> struct evtchn_bind_ipi bind_ipi = { .vcpu = vcpu_id };
643c643
< int acpi_id = pcpu_find(cpu)->pc_acpi_id;
---
> int vcpu_id = pcpu_find(cpu)->pc_vcpu_id;
646c646
< .vcpu = acpi_id };
---
> .vcpu = vcpu_id };
799c799
< u_int to_cpu, acpi_id;
---
> u_int to_cpu, vcpu_id;
808c808
< acpi_id = pcpu_find(to_cpu)->pc_acpi_id;
---
> vcpu_id = pcpu_find(to_cpu)->pc_vcpu_id;
833c833
< bind_vcpu.vcpu = acpi_id;
---
> bind_vcpu.vcpu = vcpu_id;
1066c1066
< int acpi_id = pcpu_find(cpu)->pc_acpi_id;
---
> int vcpu_id = pcpu_find(cpu)->pc_vcpu_id;
1068c1068
< struct evtchn_bind_virq bind_virq = { .virq = virq, .vcpu = acpi_id };
---
> struct evtchn_bind_virq bind_virq = { .virq = virq, .vcpu = vcpu_id };
1129c1129
< int acpi_id = pcpu_find(cpu)->pc_acpi_id;
---
> int vcpu_id = pcpu_find(cpu)->pc_vcpu_id;
1131c1131
< struct evtchn_bind_ipi bind_ipi = { .vcpu = acpi_id };
---
> struct evtchn_bind_ipi bind_ipi = { .vcpu = vcpu_id };