From: VMware, Inc <> Date: Mon, 20 Dec 2010 21:40:01 +0000 (-0800) Subject: Make VMCI logging use SYSLOG importance levels X-Git-Tag: 2010.12.19-339835~65 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e07d4f8b7eefbb2c1db8b17e2327f5948d065347;p=thirdparty%2Fopen-vm-tools.git Make VMCI logging use SYSLOG importance levels This change converts the VMCI logging macros to using the following three importance levels; debug, info and warning. Signed-off-by: Marcelo Vanzin --- diff --git a/open-vm-tools/modules/linux/vmci/vmciDatagram.c b/open-vm-tools/modules/linux/vmci/vmciDatagram.c index 86d942da3..6832813b7 100644 --- a/open-vm-tools/modules/linux/vmci/vmciDatagram.c +++ b/open-vm-tools/modules/linux/vmci/vmciDatagram.c @@ -40,6 +40,8 @@ # error "Platform not support by VMCI datagram API." #endif // linux +#define LGPFX "VMCIDatagram: " + #include "vmci_kernel_if.h" #include "vm_basic_types.h" #include "vm_assert.h" @@ -449,8 +451,8 @@ VMCIDatagram_CreateHnd(VMCIId resourceID, // IN wkMsg.wellKnownID = resourceID; result = VMCI_SendDatagram((VMCIDatagram *)&wkMsg); if (result < VMCI_SUCCESS) { - VMCI_LOG(("Failed to reserve wellknown id %d, error %d.\n", - resourceID, result)); + VMCI_DEBUG_LOG(4, (LGPFX"Failed to reserve wellknown id %d, " + "error %d.\n", resourceID, result)); return result; } @@ -488,7 +490,7 @@ VMCIDatagram_CreateHnd(VMCIId resourceID, // IN result = DatagramHashAddEntry(entry, contextID); if (result != VMCI_SUCCESS) { - VMCI_LOG(("Failed to add new entry, err 0x%x.\n", result)); + VMCI_DEBUG_LOG(4, (LGPFX"Failed to add new entry, err 0x%x.\n", result)); VMCI_DestroyEvent(&entry->destroyEvent); VMCI_FreeKernelMem(entry, sizeof *entry); return result; @@ -576,8 +578,8 @@ VMCIDatagram_DestroyHnd(VMCIHandle handle) // IN wkMsg.wellKnownID = entry->handle.resource; result = VMCI_SendDatagram((VMCIDatagram *)&wkMsg); if (result < VMCI_SUCCESS) { - VMCI_LOG(("Failed to remove well-known mapping for resource %d.\n", - entry->handle.resource)); + VMCI_WARNING((LGPFX"Failed to remove well-known mapping for " + "resource %d.\n", entry->handle.resource)); } } @@ -614,20 +616,21 @@ VMCIDatagram_Send(VMCIDatagram *msg) // IN VMCIId contextId; if (msg == NULL) { - VMCI_LOG(("Invalid datagram.\n")); + VMCI_DEBUG_LOG(4, (LGPFX"Invalid datagram.\n")); return VMCI_ERROR_INVALID_ARGS; } if (VMCI_DG_SIZE(msg) > VMCI_MAX_DG_SIZE) { - VMCI_LOG(("Payload size %"FMT64"u too big to send.\n", msg->payloadSize)); + VMCI_DEBUG_LOG(4, (LGPFX"Payload size %"FMT64"u too big to send.\n", + msg->payloadSize)); return VMCI_ERROR_INVALID_ARGS; } /* Check srcHandle exists otherwise fail. */ entry = DatagramHashGetEntry(msg->src); if (entry == NULL) { - VMCI_LOG(("Couldn't find handle 0x%x:0x%x.\n", - msg->src.context, msg->src.resource)); + VMCI_DEBUG_LOG(4, (LGPFX"Couldn't find handle 0x%x:0x%x.\n", + msg->src.context, msg->src.resource)); return VMCI_ERROR_INVALID_ARGS; } @@ -704,15 +707,15 @@ VMCIDatagram_Dispatch(VMCIId contextID, // IN: unused entry = DatagramHashGetEntryAnyCid(msg->dst); if (entry == NULL) { - VMCI_LOG(("destination handle 0x%x:0x%x doesn't exist.\n", - msg->dst.context, msg->dst.resource)); + VMCI_DEBUG_LOG(4, (LGPFX"destination handle 0x%x:0x%x doesn't exist.\n", + msg->dst.context, msg->dst.resource)); return VMCI_ERROR_NO_HANDLE; } if (!entry->recvCB) { - VMCI_LOG(("no handle callback for handle 0x%x:0x%x payload of " - "size %"FMT64"d.\n", - msg->dst.context, msg->dst.resource, msg->payloadSize)); + VMCI_WARNING((LGPFX"no handle callback for handle 0x%x:0x%x payload of " + "size %"FMT64"d.\n", msg->dst.context, msg->dst.resource, + msg->payloadSize)); goto out; } @@ -833,8 +836,8 @@ DatagramProcessNotify(void *clientData, // IN: dgm = VMCI_AllocKernelMem(dgmSize, VMCI_MEMORY_NONPAGED | VMCI_MEMORY_ATOMIC); if (!dgm) { - VMCI_LOG(("VMCI: Failed to allocate datagram of size %d bytes.\n", - (uint32)dgmSize)); + VMCI_WARNING((LGPFX"Failed to allocate datagram of size %d bytes.\n", + (uint32)dgmSize)); return VMCI_ERROR_NO_MEM; } memcpy(dgm, msg, dgmSize); @@ -844,7 +847,7 @@ DatagramProcessNotify(void *clientData, // IN: VMCI_MEMORY_NONPAGED | VMCI_MEMORY_ATOMIC); if (dqEntry == NULL) { VMCI_FreeKernelMem(dgm, dgmSize); - VMCI_LOG(("VMCI: Failed to allocate memory for process datagram.\n")); + VMCI_WARNING((LGPFX"Failed to allocate memory for process datagram.\n")); return VMCI_ERROR_NO_MEM; } dqEntry->dg = dgm; @@ -854,7 +857,7 @@ DatagramProcessNotify(void *clientData, // IN: VMCI_ReleaseLock_BH(&dgmProc->datagramQueueLock, flags); VMCI_FreeKernelMem(dgm, dgmSize); VMCI_FreeKernelMem(dqEntry, sizeof *dqEntry); - VMCI_LOG(("VMCI: Datagram process receive queue is full.\n")); + VMCI_LOG((LGPFX"Datagram process receive queue is full.\n")); return VMCI_ERROR_NO_RESOURCES; } @@ -876,8 +879,8 @@ DatagramProcessNotify(void *clientData, // IN: VMCI_ReleaseLock_BH(&dgmProc->datagramQueueLock, flags); #endif - DEBUG_ONLY(VMCI_LOG(("VMCI: Sent datagram with resource id %d and size %u.\n", - msg->dst.resource, (uint32)dgmSize));) + VMCI_DEBUG_LOG(10, (LGPFX"Sent datagram with resource id %d and size %u.\n", + msg->dst.resource, (uint32)dgmSize)); /* dqEntry and dgm are freed when user reads call.. */ return VMCI_SUCCESS; @@ -1035,16 +1038,17 @@ VMCIDatagramProcess_ReadCall(VMCIDatagramProcess *dgmProc, // IN: if (dgmProc->pendingDatagrams == 0) { VMCIHost_ClearCall(&dgmProc->host); VMCI_ReleaseLock_BH(&dgmProc->datagramQueueLock, flags); - VMCI_LOG(("VMCI: No datagrams pending.\n")); + VMCI_DEBUG_LOG(4, (LGPFX"No datagrams pending.\n")); return VMCI_ERROR_NO_MORE_DATAGRAMS; } #else while (dgmProc->pendingDatagrams == 0) { VMCIHost_ClearCall(&dgmProc->host); - if (!VMCIHost_WaitForCallLocked(&dgmProc->host, &dgmProc->datagramQueueLock, + if (!VMCIHost_WaitForCallLocked(&dgmProc->host, + &dgmProc->datagramQueueLock, &flags, TRUE)) { VMCI_ReleaseLock_BH(&dgmProc->datagramQueueLock, flags); - VMCI_LOG(("VMCI: Blocking read of datagram interrupted.\n")); + VMCI_DEBUG_LOG(4, (LGPFX"Blocking read of datagram interrupted.\n")); return VMCI_ERROR_NO_MORE_DATAGRAMS; } } @@ -1059,7 +1063,7 @@ VMCIDatagramProcess_ReadCall(VMCIDatagramProcess *dgmProc, // IN: /* Check the size of the userland buffer. */ if (maxSize < VMCI_DG_SIZE(dqEntry->dg)) { VMCI_ReleaseLock_BH(&dgmProc->datagramQueueLock, flags); - VMCI_LOG(("VMCI: Caller's buffer is too small.\n")); + VMCI_DEBUG_LOG(4, (LGPFX"Caller's buffer is too small.\n")); return VMCI_ERROR_NO_MEM; } diff --git a/open-vm-tools/modules/linux/vmci/vmciEvent.c b/open-vm-tools/modules/linux/vmci/vmciEvent.c index ad580b4c3..1870fccaa 100644 --- a/open-vm-tools/modules/linux/vmci/vmciEvent.c +++ b/open-vm-tools/modules/linux/vmci/vmciEvent.c @@ -45,8 +45,9 @@ #endif #include "circList.h" /* Must come after vmciVmkInt.h. */ -#define EVENT_MAGIC 0xEABE0000 +#define LGPFX "VMCIEvent: " +#define EVENT_MAGIC 0xEABE0000 typedef struct VMCISubscription { VMCIId id; @@ -509,8 +510,8 @@ VMCIEventRegisterSubscription(VMCISubscription *sub, // IN ASSERT(sub); if (!VMCI_EVENT_VALID(event) || callback == NULL) { - VMCILOG(("VMCIEvent: Failed to subscribe to event %d cb %p data %p.\n", - event, callback, callbackData)); + VMCI_DEBUG_LOG(4, (LGPFX"Failed to subscribe to event %d cb %p data %p.\n", + event, callback, callbackData)); return VMCI_ERROR_INVALID_ARGS; } @@ -654,7 +655,7 @@ VMCIEvent_Subscribe(VMCI_Event event, // IN VMCISubscription *s = NULL; if (subscriptionID == NULL) { - VMCILOG(("VMCIEvent: Invalid arguments.\n")); + VMCI_DEBUG_LOG(4, (LGPFX"Invalid arguments.\n")); return VMCI_ERROR_INVALID_ARGS; } diff --git a/open-vm-tools/modules/linux/vmci/vmciInt.h b/open-vm-tools/modules/linux/vmci/vmciInt.h index f03218014..6f5604ac4 100644 --- a/open-vm-tools/modules/linux/vmci/vmciInt.h +++ b/open-vm-tools/modules/linux/vmci/vmciInt.h @@ -26,13 +26,20 @@ #include "vmci_call_defs.h" #include "vmciProcess.h" +#define DODEBUGLOG(...) printk(KERN_DEBUG __VA_ARGS__) #define DOLOG(...) printk(KERN_INFO __VA_ARGS__) +#define DOWARNING(...) printk(KERN_WARNING __VA_ARGS__) + +#ifdef VMCI_DEBUG +# define VMCI_DEBUG_LOG(_level, _args) DODEBUGLOG _args +#else +# define VMCI_DEBUG_LOG(_level, _args) +#endif // VMCI_DEBUG #define VMCI_LOG(_args) DOLOG _args -/* XXX We need to make this consistant between the guest and the host. */ -#define VMCILOG(_args) DOLOG _args +#define VMCI_WARNING(_args) DOWARNING _args -/* - * Called by common code, hence the different naming convention. +/* + * Called by common code, hence the different naming convention. * XXX Should be in vmci.h. */ int VMCI_SendDatagram(VMCIDatagram *dg); diff --git a/open-vm-tools/modules/linux/vmci/vmciNotifications.c b/open-vm-tools/modules/linux/vmci/vmciNotifications.c index 12df706e4..81975712e 100644 --- a/open-vm-tools/modules/linux/vmci/vmciNotifications.c +++ b/open-vm-tools/modules/linux/vmci/vmciNotifications.c @@ -39,6 +39,8 @@ #include "vmciUtil.h" #include "circList.h" +#define LGPFX "VMCINotifications: " + #if !defined(SOLARIS) && !defined(__APPLE__) /* @@ -257,10 +259,10 @@ VMCINotifications_Hibernate(Bool enterHibernate) // IN cur = LIST_CONTAINER(iter, VMCINotifyHashEntry, idxListItem); result = LinkNotificationHypercall(cur->handle, cur->doorbell, cur->idx); if (result != VMCI_SUCCESS && result != VMCI_ERROR_DUPLICATE_ENTRY) { - VMCI_LOG(("Failed to reregister doorbell handle 0x%x:0x%x of " - "resource %s to index (error: %d).\n", - cur->handle.context, cur->handle.resource, - cur->doorbell ? "doorbell" : "queue pair", result)); + VMCI_WARNING((LGPFX"Failed to reregister doorbell handle 0x%x:0x%x " + "of resource %s to index (error: %d).\n", + cur->handle.context, cur->handle.resource, + cur->doorbell ? "doorbell" : "queue pair", result)); } } } @@ -844,9 +846,10 @@ VMCINotificationRegister(VMCIHandle *handle, // IN result = LinkNotificationHypercall(entry->handle, doorbell, entry->idx); if (result != VMCI_SUCCESS) { - VMCI_LOG(("Failed to link handle 0x%x:0x%x of resource %s to index " - "(error: %d).\n", entry->handle.context, entry->handle.resource, - entry->doorbell ? "doorbell" : "queue pair", result)); + VMCI_DEBUG_LOG(4, (LGPFX"Failed to link handle 0x%x:0x%x of resource %s " + "to index (error: %d).\n", + entry->handle.context, entry->handle.resource, + entry->doorbell ? "doorbell" : "queue pair", result)); VMCINotifyHashRemoveEntry(entry->handle, entry->doorbell); VMCI_DestroyEvent(&entry->destroyEvent); VMCI_FreeKernelMem(entry, sizeof *entry); @@ -912,9 +915,10 @@ VMCINotificationUnregister(VMCIHandle handle, // IN * just print a warning and return success. */ - VMCI_LOG(("Unlink of %s handle 0x%x:0x%x unknown by hypervisor " - "(error: %d).\n", doorbell ? "doorbell" : "queuepair", - handle.context, handle.resource, result)); + VMCI_DEBUG_LOG(4, (LGPFX"Unlink of %s handle 0x%x:0x%x unknown by " + "hypervisor (error: %d).\n", + doorbell ? "doorbell" : "queuepair", + handle.context, handle.resource, result)); } return VMCI_SUCCESS; } @@ -952,8 +956,9 @@ VMCI_RegisterNotificationBitmap(PPN bitmapPPN) // IN result = VMCI_SendDatagram((VMCIDatagram *)&bitmapSetMsg); if (result != VMCI_SUCCESS) { - VMCI_LOG(("VMCINotifications: Failed to register PPN %u as notification " - "bitmap (error: %d).\n", bitmapPPN, result)); + VMCI_DEBUG_LOG(4, (LGPFX"VMCINotifications: Failed to register PPN %u as " + "notification bitmap (error: %d).\n", + bitmapPPN, result)); return FALSE; } return TRUE; diff --git a/open-vm-tools/modules/linux/vmci/vmciQueuePair.c b/open-vm-tools/modules/linux/vmci/vmciQueuePair.c index 5f54eb31b..e7af9ee65 100644 --- a/open-vm-tools/modules/linux/vmci/vmciQueuePair.c +++ b/open-vm-tools/modules/linux/vmci/vmciQueuePair.c @@ -703,7 +703,8 @@ VMCIQueuePairAllocHelper(VMCIHandle *handle, // IN/OUT: if (queuePairEntry->flags & VMCI_QPFLAG_LOCAL) { /* Local attach case. */ if (queuePairEntry->refCount > 1) { - VMCI_LOG((LGPFX "Error attempting to attach more than once.\n")); + VMCI_DEBUG_LOG(4, (LGPFX"Error attempting to attach more than " + "once.\n")); result = VMCI_ERROR_UNAVAILABLE; goto errorKeepEntry; } @@ -711,7 +712,8 @@ VMCIQueuePairAllocHelper(VMCIHandle *handle, // IN/OUT: if (queuePairEntry->produceSize != consumeSize || queuePairEntry->consumeSize != produceSize || queuePairEntry->flags != (flags & ~VMCI_QPFLAG_ATTACH_ONLY)) { - VMCI_LOG((LGPFX "Error mismatched queue pair in local attach.\n")); + VMCI_DEBUG_LOG(4, (LGPFX"Error mismatched queue pair in local " + "attach.\n")); result = VMCI_ERROR_QUEUEPAIR_MISMATCH; goto errorKeepEntry; } @@ -734,14 +736,14 @@ VMCIQueuePairAllocHelper(VMCIHandle *handle, // IN/OUT: myProduceQ = VMCI_AllocQueue(produceSize); if (!myProduceQ) { - VMCI_LOG((LGPFX "Error allocating pages for produce queue.\n")); + VMCI_WARNING((LGPFX"Error allocating pages for produce queue.\n")); result = VMCI_ERROR_NO_MEM; goto error; } myConsumeQ = VMCI_AllocQueue(consumeSize); if (!myConsumeQ) { - VMCI_LOG((LGPFX "Error allocating pages for consume queue.\n")); + VMCI_WARNING((LGPFX"Error allocating pages for consume queue.\n")); result = VMCI_ERROR_NO_MEM; goto error; } @@ -750,7 +752,7 @@ VMCIQueuePairAllocHelper(VMCIHandle *handle, // IN/OUT: produceSize, consumeSize, myProduceQ, myConsumeQ); if (!queuePairEntry) { - VMCI_LOG((LGPFX "Error allocating memory in %s.\n", __FUNCTION__)); + VMCI_WARNING((LGPFX"Error allocating memory in %s.\n", __FUNCTION__)); result = VMCI_ERROR_NO_MEM; goto error; } @@ -758,7 +760,7 @@ VMCIQueuePairAllocHelper(VMCIHandle *handle, // IN/OUT: result = VMCI_AllocPPNSet(myProduceQ, numProducePages, myConsumeQ, numConsumePages, &queuePairEntry->ppnSet); if (result < VMCI_SUCCESS) { - VMCI_LOG((LGPFX "VMCI_AllocPPNSet failed.\n")); + VMCI_WARNING((LGPFX"VMCI_AllocPPNSet failed.\n")); goto error; } @@ -791,8 +793,8 @@ VMCIQueuePairAllocHelper(VMCIHandle *handle, // IN/OUT: } else { result = VMCIQueuePairAlloc_HyperCall(queuePairEntry); if (result < VMCI_SUCCESS) { - VMCI_LOG((LGPFX "VMCIQueuePairAlloc_HyperCall result = %d.\n", - result)); + VMCI_WARNING((LGPFX"VMCIQueuePairAlloc_HyperCall result = %d.\n", + result)); goto error; } } @@ -1063,18 +1065,20 @@ VMCIQueuePair_Hibernate(Bool enterHibernation) result = VMCI_ConvertToLocalQueue(consQ, prodQ, entry->consumeSize, TRUE, &oldConsQ); if (result != VMCI_SUCCESS) { - VMCI_LOG((LGPFX "Hibernate failed to create local consume queue " - "from handle %x:%x (error: %d)\n", - entry->handle.context, entry->handle.resource, result)); + VMCI_WARNING((LGPFX"Hibernate failed to create local consume " + "queue from handle %x:%x (error: %d)\n", + entry->handle.context, entry->handle.resource, + result)); VMCI_ReleaseQueueMutex(prodQ); continue; } result = VMCI_ConvertToLocalQueue(prodQ, consQ, entry->produceSize, FALSE, &oldProdQ); if (result != VMCI_SUCCESS) { - VMCI_LOG((LGPFX "Hibernate failed to create local produce queue " - "from handle %x:%x (error: %d)\n", - entry->handle.context, entry->handle.resource, result)); + VMCI_WARNING((LGPFX"Hibernate failed to create local produce " + "queue from handle %x:%x (error: %d)\n", + entry->handle.context, entry->handle.resource, + result)); VMCI_RevertToNonLocalQueue(consQ, oldConsQ, entry->consumeSize); VMCI_ReleaseQueueMutex(prodQ); continue; @@ -1090,8 +1094,9 @@ VMCIQueuePair_Hibernate(Bool enterHibernation) result = VMCIQueuePairDetachHyperCall(entry->handle); if (result < VMCI_SUCCESS) { - VMCI_LOG((LGPFX "Hibernate failed to detach from handle %x:%x\n", - entry->handle.context, entry->handle.resource)); + VMCI_WARNING((LGPFX"Hibernate failed to detach from handle " + "%x:%x\n", + entry->handle.context, entry->handle.resource)); VMCI_RevertToNonLocalQueue(consQ, oldConsQ, entry->consumeSize); VMCI_RevertToNonLocalQueue(prodQ, oldProdQ, entry->produceSize); VMCI_ReleaseQueueMutex(prodQ); diff --git a/open-vm-tools/modules/linux/vmci/vmciUtil.c b/open-vm-tools/modules/linux/vmci/vmciUtil.c index 2024f5c7b..e07dc4e3f 100644 --- a/open-vm-tools/modules/linux/vmci/vmciUtil.c +++ b/open-vm-tools/modules/linux/vmci/vmciUtil.c @@ -94,8 +94,8 @@ VMCIUtil_Init(void) if (VMCIEvent_Subscribe(VMCI_EVENT_CTX_ID_UPDATE, VMCI_FLAG_EVENT_NONE, VMCIUtilCidUpdate, NULL, &ctxUpdateSubID) < VMCI_SUCCESS) { - VMCI_LOG(("VMCIUtil: Failed to subscribe to event %d.\n", - VMCI_EVENT_CTX_ID_UPDATE)); + VMCI_WARNING((LGPFX"Failed to subscribe to event %d.\n", + VMCI_EVENT_CTX_ID_UPDATE)); } } @@ -120,8 +120,9 @@ void VMCIUtil_Exit(void) { if (VMCIEvent_Unsubscribe(ctxUpdateSubID) < VMCI_SUCCESS) { - VMCI_LOG(("VMCIUtil: Failed to unsubscribe to event %d with subscriber " - "id %d.\n", VMCI_EVENT_CTX_ID_UPDATE, ctxUpdateSubID)); + VMCI_WARNING((LGPFX"Failed to unsubscribe to event %d with " + "subscriber id %d.\n", VMCI_EVENT_CTX_ID_UPDATE, + ctxUpdateSubID)); } } @@ -150,14 +151,14 @@ VMCIUtilCidUpdate(VMCIId subID, // IN: VMCIEventPayload_Context *evPayload = VMCIEventDataPayload(eventData); if (subID != ctxUpdateSubID) { - VMCI_LOG(("VMCIUtil: Invalid subscriber id. %d.\n", subID)); + VMCI_WARNING((LGPFX"Invalid subscriber id. %d.\n", subID)); return; } if (eventData == NULL || evPayload->contextID == VMCI_INVALID_ID) { - VMCI_LOG(("VMCIUtil: Invalid event data.\n")); + VMCI_WARNING((LGPFX"Invalid event data.\n")); return; } - VMCI_LOG(("VMCIUtil: Updating context id from 0x%x to 0x%x on event %d.\n", + VMCI_LOG((LGPFX"Updating context id from 0x%x to 0x%x on event %d.\n", Atomic_Read(&vmContextID), evPayload->contextID, eventData->event)); @@ -196,7 +197,7 @@ VMCIUtil_CheckHostCapabilities(void) VMCIDatagram *checkMsg = VMCI_AllocKernelMem(msgSize, VMCI_MEMORY_NONPAGED); if (checkMsg == NULL) { - VMCI_LOG((LGPFX"Check host: Insufficient memory.\n")); + VMCI_WARNING((LGPFX"Check host: Insufficient memory.\n")); return FALSE; } @@ -495,8 +496,8 @@ VMCI_ReadDatagramsFromPort(VMCIIoHandle ioHandle, // IN result = VMCIDatagram_Dispatch(dg->src.context, dg); } if (result < VMCI_SUCCESS) { - VMCI_LOG(("Datagram with resource %d failed with err %x.\n", - dg->dst.resource, result)); + VMCI_DEBUG_LOG(4, (LGPFX"Datagram with resource %d failed with " + "err %x.\n", dg->dst.resource, result)); } /* On to the next datagram. */ @@ -508,8 +509,8 @@ VMCI_ReadDatagramsFromPort(VMCIIoHandle ioHandle, // IN * Datagram doesn't fit in datagram buffer of maximal size. We drop it. */ - VMCI_LOG(("Failed to receive datagram of size %u.\n", - dgInSize)); + VMCI_DEBUG_LOG(4, (LGPFX"Failed to receive datagram of size %u.\n", + dgInSize)); bytesToSkip = dgInSize - remainingBytes; if (currentDgInBufferSize != dgInBufferSize) { diff --git a/open-vm-tools/modules/linux/vmci/vmci_version.h b/open-vm-tools/modules/linux/vmci/vmci_version.h index 3a4dcd79d..9758b43a6 100644 --- a/open-vm-tools/modules/linux/vmci/vmci_version.h +++ b/open-vm-tools/modules/linux/vmci/vmci_version.h @@ -25,8 +25,8 @@ #ifndef _VMCI_VERSION_H_ #define _VMCI_VERSION_H_ -#define VMCI_DRIVER_VERSION 1.0.24.0 -#define VMCI_DRIVER_VERSION_COMMAS 1,0,24,0 -#define VMCI_DRIVER_VERSION_STRING "1.0.24.0" +#define VMCI_DRIVER_VERSION 1.0.25.0 +#define VMCI_DRIVER_VERSION_COMMAS 1,0,25,0 +#define VMCI_DRIVER_VERSION_STRING "1.0.25.0" #endif /* _VMCI_VERSION_H_ */