From: Jim Fehlig <jfehlig@suse.com>
Date: Wed, 11 Feb 2015 21:54:43 +0000 (-0700)
Subject: libxl: use libxl_ctx passed to libxlConsoleCallback
X-Git-Tag: v1.2.14-rc1~264
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1d159d889248142cbda9ed77aa0d836d5f4b493;p=thirdparty%2Flibvirt.git

libxl: use libxl_ctx passed to libxlConsoleCallback

Instead of using the libxl_ctx in the libxlDomainObjPrivatePtr,
use the ctx passed to the callback.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
---

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index e186c5317c..9af5758969 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -1158,10 +1158,9 @@ libxlDomainFreeMem(libxlDomainObjPrivatePtr priv, libxl_domain_config *d_config)
 }
 
 static void
-libxlConsoleCallback(libxl_ctx *ctx, libxl_event* ev, void *for_callback)
+libxlConsoleCallback(libxl_ctx *ctx, libxl_event *ev, void *for_callback)
 {
     virDomainObjPtr vm = for_callback;
-    libxlDomainObjPrivatePtr priv = vm->privateData;
     size_t i;
 
     virObjectLock(vm);
@@ -1175,7 +1174,7 @@ libxlConsoleCallback(libxl_ctx *ctx, libxl_event* ev, void *for_callback)
             console_type =
                 (chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL ?
                  LIBXL_CONSOLE_TYPE_SERIAL : LIBXL_CONSOLE_TYPE_PV);
-            ret = libxl_console_get_tty(priv->ctx, ev->domid,
+            ret = libxl_console_get_tty(ctx, ev->domid,
                                         chr->target.port, console_type,
                                         &console);
             if (!ret) {