From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Thu, 30 Jun 2016 15:56:42 +0000 (+0200)
Subject: xen/evtchn: use xen_vcpu_id mapping
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=cbbb4682394c45986a34d8c77a02e7a066e30235;p=deliverable%2Flinux.git

xen/evtchn: use xen_vcpu_id mapping

Use the newly introduced xen_vcpu_id mapping to get Xen's idea of vCPU
id for CPU0.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
---

diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c
index 7efd1cb9bb40..e8c7f09d01be 100644
--- a/drivers/xen/evtchn.c
+++ b/drivers/xen/evtchn.c
@@ -55,6 +55,7 @@
 #include <xen/xen.h>
 #include <xen/events.h>
 #include <xen/evtchn.h>
+#include <xen/xen-ops.h>
 #include <asm/xen/hypervisor.h>
 
 struct per_user_data {
@@ -456,7 +457,7 @@ static long evtchn_ioctl(struct file *file,
 			break;
 
 		bind_virq.virq = bind.virq;
-		bind_virq.vcpu = 0;
+		bind_virq.vcpu = xen_vcpu_nr(0);
 		rc = HYPERVISOR_event_channel_op(EVTCHNOP_bind_virq,
 						 &bind_virq);
 		if (rc != 0)