]> xenbits.xensource.com Git - qemu-upstream-4.5-testing.git/commitdiff
xen: Fix vcpu initialization.
authorAnthony PERARD <anthony.perard@citrix.com>
Wed, 25 Sep 2013 16:41:48 +0000 (16:41 +0000)
committerAnthony PERARD <anthony.perard@citrix.com>
Wed, 2 Oct 2013 16:17:35 +0000 (17:17 +0100)
Each vcpu need a evtchn binded in qemu, even those that are
offline at QEMU initialisation.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
(cherry picked from commit 1cd25a889687ab199944b98c1bdc59216ea81487)

xen-all.c

index e1d06943b047616f893ddf4c88495710ce392be2..3b480b7b5f276b9de283738b8e808efaa662b5ba 100644 (file)
--- a/xen-all.c
+++ b/xen-all.c
@@ -613,13 +613,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");
         }
 
@@ -1106,10 +1106,10 @@ int xen_hvm_init(MemoryRegion **ram_memory)
         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) {