diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 6fffd68d62bb90e9d402ff095c51490d2f3823a0..a9d2d4045f120e587b2b2a63d459a39d21ef62f6 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -578,19 +578,14 @@ static void virLXCControllerClientCloseHook(virNetServerClientPtr client) static void virLXCControllerClientPrivateFree(void *data) { - VIR_FREE(data); + virLXCControllerPtr ctrl = data; + VIR_DEBUG("Got private data free %p", ctrl); } static void *virLXCControllerClientPrivateNew(virNetServerClientPtr client, void *opaque) { virLXCControllerPtr ctrl = opaque; - int *dummy; - - if (VIR_ALLOC(dummy) < 0) { - virReportOOMError(); - return NULL; - } virNetServerClientSetCloseHook(client, virLXCControllerClientCloseHook); VIR_DEBUG("Got new client %p", client); @@ -600,7 +595,7 @@ static void *virLXCControllerClientPrivateNew(virNetServerClientPtr client, virLXCControllerEventSendInit(ctrl, ctrl->initpid); ctrl->firstClient = false; - return dummy; + return ctrl; } @@ -1327,7 +1322,7 @@ virLXCControllerEventSendExit(virLXCControllerPtr ctrl, { virLXCProtocolExitEventMsg msg; - VIR_DEBUG("Exit status %d", exitstatus); + VIR_DEBUG("Exit status %d (client=%p)", exitstatus, ctrl->client); memset(&msg, 0, sizeof(msg)); switch (exitstatus) { case 0: