From: Anthony PERARD <anthony.perard@citrix.com>
Date: Fri, 14 Jun 2013 13:43:05 +0000 (+0100)
Subject: xen: Fix vcpus initialisation.
X-Git-Tag: qemu-xen-4.3.0~1^2~1
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f573cdfa7afa92ebb66b2ba066b4f08bd22fc84b;p=qemu-upstream-4.5-testing.git

xen: Fix vcpus initialisation.

Each vcpu needs a call to xc_evtchn_bind_interdomain in QEMU, even those
that are unplug at QEMU initialisation.

Without this patch, any hot-plugged CPU will be "Stuck ??" when Linux
will try to use them.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---

diff --git a/xen-all.c b/xen-all.c
index daf43b99d..15be8edc8 100644
--- a/xen-all.c
+++ b/xen-all.c
@@ -632,13 +632,13 @@ static ioreq_t *cpu_get_ioreq(XenIOState *state)
     }
 
     if (port != -1) {
-        for (i = 0; i < smp_cpus; i++) {
+        for (i = 0; i < max_cpus; i++) {
             if (state->ioreq_local_port[i] == port) {
                 break;
             }
         }
 
-        if (i == smp_cpus) {
+        if (i == max_cpus) {
             hw_error("Fatal error while trying to get io event!\n");
         }
 
@@ -1123,10 +1123,10 @@ int xen_hvm_init(void)
         hw_error("map buffered IO page returned error %d", errno);
     }
 
-    state->ioreq_local_port = g_malloc0(smp_cpus * sizeof (evtchn_port_t));
+    state->ioreq_local_port = g_malloc0(max_cpus * sizeof (evtchn_port_t));
 
     /* FIXME: how about if we overflow the page here? */
-    for (i = 0; i < smp_cpus; i++) {
+    for (i = 0; i < max_cpus; i++) {
         rc = xc_evtchn_bind_interdomain(state->xce_handle, xen_domid,
                                         xen_vcpu_eport(state->shared_page, i));
         if (rc == -1) {