Index: /trunk/include/VBox/VMMDev.h
===================================================================
--- /trunk/include/VBox/VMMDev.h (revision 35886)
+++ /trunk/include/VBox/VMMDev.h (revision 35887)
@@ -4,5 +4,5 @@
/*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
*
* This file is part of VirtualBox Open Source Edition (OSE), as
@@ -670,4 +670,5 @@
/**
* Guest status facility.
+ * This needs to be kept in sync with AdditionsFacility of the Main API!
*/
typedef enum
@@ -676,5 +677,5 @@
VBoxGuestStatusFacility_VBoxGuestDriver = 20,
VBoxGuestStatusFacility_VBoxService = 100,
- VBoxGuestStatusFacility_VBoxTray = 101,
+ VBoxGuestStatusFacility_VBoxTrayClient = 101, /* VBoxTray (Windows), VBoxClient (Linux, Unix). */
VBoxGuestStatusFacility_All = 999,
VBoxGuestStatusFacility_SizeHack = 0x7fffffff
@@ -682,4 +683,5 @@
AssertCompileSize(VBoxGuestStatusFacility, 4);
+
/**
* The current guest status of a facility.
@@ -689,4 +691,5 @@
VBoxGuestStatusCurrent_Disabled = 0,
VBoxGuestStatusCurrent_Inactive = 1,
+ VBoxGuestStatusCurrent_Paused = 2,
VBoxGuestStatusCurrent_PreInit = 20,
VBoxGuestStatusCurrent_Init = 30,
@@ -694,4 +697,5 @@
VBoxGuestStatusCurrent_Terminating = 100,
VBoxGuestStatusCurrent_Terminated = 101,
+ VBoxGuestStatusCurrent_Unknown = 999,
VBoxGuestStatusCurrent_SizeHack = 0x7fffffff
} VBoxGuestStatusCurrent;
Index: /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxHelpers.cpp
===================================================================
--- /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxHelpers.cpp (revision 35886)
+++ /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxHelpers.cpp (revision 35887)
@@ -30,5 +30,5 @@
int hlpReportStatus(VBoxGuestStatusCurrent statusCurrent)
{
- int rc = VbglR3ReportAdditionsStatus(VBoxGuestStatusFacility_VBoxTray,
+ int rc = VbglR3ReportAdditionsStatus(VBoxGuestStatusFacility_VBoxTrayClient,
statusCurrent,
0 /* Flags */);
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (revision 35886)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (revision 35887)
@@ -110,5 +110,4 @@
t.u8Hour, t.u8Minute, t.u8Second);
}
-
const char *stateToName(MachineState_T machineState, bool fShort)
@@ -787,7 +786,7 @@
}
- /* get the maximum amount of NICS */
+ /* get the maximum amount of NICS */
ULONG maxNICs = getMaxNics(virtualBox, machine);
-
+
for (ULONG currentNIC = 0; currentNIC < maxNICs; currentNIC++)
{
@@ -2005,4 +2004,14 @@
RTPrintf("Guest:\n\n");
+ ULONG guestVal;
+ rc = machine->COMGETTER(MemoryBalloonSize)(&guestVal);
+ if (SUCCEEDED(rc))
+ {
+ if (details == VMINFO_MACHINEREADABLE)
+ RTPrintf("GuestMemoryBalloon=%d\n", guestVal);
+ else
+ RTPrintf("Configured memory balloon size: %d MB\n", guestVal);
+ }
+
if (console)
{
@@ -2043,17 +2052,52 @@
RTPrintf("Additions version: %lS\n\n", guestString.raw());
}
- }
- }
- }
-
- ULONG guestVal;
- rc = machine->COMGETTER(MemoryBalloonSize)(&guestVal);
- if (SUCCEEDED(rc))
- {
- if (details == VMINFO_MACHINEREADABLE)
- RTPrintf("GuestMemoryBalloon=%d\n", guestVal);
- else
- RTPrintf("Configured memory balloon size: %d MB\n", guestVal);
- }
+
+ if (details != VMINFO_MACHINEREADABLE)
+ RTPrintf("\nGuest Components:\n\n");
+
+ /* Print information about important Guest Additions parts: */
+ /** @todo Add a makeFacilityStatusStr() to translate facility states into a human readable string! */
+ AdditionsFacilityStatus faStatus;
+ LONGLONG lLastUpdatedMS = 0;
+ char szLastUpdated[32];
+ rc = guest->GetFacilityStatus(AdditionsFacilityType_VBoxGuestDriver, &lLastUpdatedMS, &faStatus);
+ if (SUCCEEDED(rc))
+ {
+ makeTimeStr(szLastUpdated, sizeof(szLastUpdated), lLastUpdatedMS);
+ if (details == VMINFO_MACHINEREADABLE)
+ RTPrintf("GuestAdditionsFacilityStatusGuestDriver=%u,%ld\n",
+ faStatus, lLastUpdatedMS);
+ else
+ RTPrintf("Guest driver: %u (last update: %s)\n",
+ faStatus, szLastUpdated);
+ }
+
+ rc = guest->GetFacilityStatus(AdditionsFacilityType_VBoxService, &lLastUpdatedMS, &faStatus);
+ if (SUCCEEDED(rc))
+ {
+ makeTimeStr(szLastUpdated, sizeof(szLastUpdated), lLastUpdatedMS);
+ if (details == VMINFO_MACHINEREADABLE)
+ RTPrintf("GuestAdditionsFacilityStatusVBoxService=%u,%ld\n",
+ faStatus, lLastUpdatedMS);
+ else
+ RTPrintf("VBoxService: %u (last update: %s)\n",
+ faStatus, szLastUpdated);
+ }
+
+ rc = guest->GetFacilityStatus(AdditionsFacilityType_VBoxTrayClient, &lLastUpdatedMS, &faStatus);
+ if (SUCCEEDED(rc))
+ {
+ makeTimeStr(szLastUpdated, sizeof(szLastUpdated), lLastUpdatedMS);
+ if (details == VMINFO_MACHINEREADABLE)
+ RTPrintf("GuestAdditionsFacilityStatusVBoxTrayClient=%u,%ld\n",
+ faStatus, lLastUpdatedMS);
+ else
+ RTPrintf("VBoxTray / VBoxClient: %u (last update: %s)\n",
+ faStatus, szLastUpdated);
+ }
+ }
+ }
+ }
+
if (details != VMINFO_MACHINEREADABLE)
RTPrintf("\n");
Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl
===================================================================
--- /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 35886)
+++ /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 35887)
@@ -7879,4 +7879,66 @@
+
+ Guest Additions facility IDs.
+
+
+
+ No/invalid facility.
+
+
+ VBoxGuest base driver.
+
+
+ VBoxService.
+
+
+ VBoxTray (Windows) / VBoxClient (Non-Windows).
+
+
+ All facilities selected.
+
+
+
+
+
+ Guest Additions facility states.
+
+
+
+ Facility is disabled.
+
+
+ Facility is enabled but inactive.
+
+
+ Facility has been paused.
+
+
+ Facility is preparing to initialize.
+
+
+ Facility is initializing.
+
+
+ Facility is up and running.
+
+
+ Facility is shutting down.
+
+
+ Facility successfully shut down.
+
+
+ Facility status is unknown.
+
+
+
+
@@ -8111,4 +8173,19 @@
Total amount of shared memory in the hypervisor
+
+
+
+
+
+ Get the current status of a Guest Additions facility.
+
+
+ Facility to check status for.
+
+
+ Timestamp (in ms) of last status update of this facility seen by the host.
+
+
+ The current (latest) facility status.
Index: /trunk/src/VBox/Main/include/GuestImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/GuestImpl.h (revision 35886)
+++ /trunk/src/VBox/Main/include/GuestImpl.h (revision 35887)
@@ -4,5 +4,5 @@
/*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
*
* This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20,4 +20,5 @@
#include "VirtualBoxBase.h"
#include
+#include
#include
@@ -88,4 +89,5 @@
// IGuest methods
+ STDMETHOD(GetFacilityStatus)(AdditionsFacilityType aType, LONGLONG *aTimestamp, AdditionsFacilityStatus *aStatus);
STDMETHOD(GetAdditionsStatus)(AdditionsRunLevelType_T aLevel, BOOL *aActive);
STDMETHOD(SetCredentials)(IN_BSTR aUserName, IN_BSTR aPassword,
@@ -129,11 +131,11 @@
private:
-
- // Internal tasks
+#ifdef VBOX_WITH_GUEST_CONTROL
+ // Internal tasks.
struct TaskGuest; /* Worker thread helper. */
-#ifdef VBOX_WITH_GUEST_CONTROL
HRESULT taskCopyFile(TaskGuest *aTask);
HRESULT taskUpdateGuestAdditions(TaskGuest *aTask);
+ // Internal callback context handling.
struct CallbackContext
{
@@ -183,4 +185,12 @@
# endif
+ struct FacilityData
+ {
+ RTTIMESPEC tsLastUpdated;
+ AdditionsFacilityStatus_T curStatus;
+ };
+ typedef std::map< AdditionsFacilityType_T, FacilityData > FacilityMap;
+ typedef std::map< AdditionsFacilityType_T, FacilityData >::iterator FacilityMapIter;
+
struct Data
{
@@ -190,4 +200,6 @@
Bstr mOSTypeId;
+
+ FacilityMap mFacilityMap;
AdditionsRunLevelType_T mAdditionsRunLevel;
Bstr mAdditionsVersion;
Index: /trunk/src/VBox/Main/src-client/GuestImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestImpl.cpp (revision 35886)
+++ /trunk/src/VBox/Main/src-client/GuestImpl.cpp (revision 35887)
@@ -5,5 +5,5 @@
/*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
*
* This file is part of VirtualBox Open Source Edition (OSE), as
@@ -438,4 +438,41 @@
}
+/**
+ * Returns the status of a specified Guest Additions facility.
+ *
+ * @return aStatus Current status of specified facility.
+ * @param aType Facility to get the status from.
+ * @param aTimestamp Timestamp of last facility status update in ms (optional).
+ */
+STDMETHODIMP Guest::GetFacilityStatus(AdditionsFacilityType aType, LONGLONG *aTimestamp, AdditionsFacilityStatus *aStatus)
+{
+ AutoCaller autoCaller(this);
+ if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+ CheckComArgNotNull(aStatus);
+ /* Not checking for aTimestamp is intentional; it's optional. */
+
+ FacilityMapIter it = mData.mFacilityMap.find(aType);
+ if (it != mData.mFacilityMap.end())
+ {
+ *aStatus = it->second.curStatus;
+ if (aTimestamp)
+ *aTimestamp = RTTimeSpecGetMilli(&it->second.tsLastUpdated);
+ }
+ else
+ {
+ /*
+ * Do not fail here -- could be that the facility never has been brought up (yet) but
+ * the host wants to have its status anyway. So just tell we don't know at this point.
+ */
+ *aStatus = AdditionsFacilityStatus_Unknown;
+ if (aTimestamp)
+ *aTimestamp = RTTimeMilliTS();
+ }
+ return S_OK;
+}
+
STDMETHODIMP Guest::GetAdditionsStatus(AdditionsRunLevelType_T aLevel, BOOL *aActive)
{
@@ -600,7 +637,10 @@
AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+ /*
+ * Set overall additions run level.
+ */
+
+ /* First check for disabled status. */
uint32_t uCurFacility = Facility + (Status == VBoxGuestStatusCurrent_Active ? 0 : -1);
-
- /* First check for disabled status. */
if ( Facility < VBoxGuestStatusFacility_VBoxGuestDriver
|| ( Facility == VBoxGuestStatusFacility_All
@@ -613,5 +653,5 @@
mData.mAdditionsRunLevel = AdditionsRunLevelType_None;
}
- else if (uCurFacility >= VBoxGuestStatusFacility_VBoxTray)
+ else if (uCurFacility >= VBoxGuestStatusFacility_VBoxTrayClient)
{
mData.mAdditionsRunLevel = AdditionsRunLevelType_Desktop;
@@ -627,4 +667,20 @@
else /* Should never happen! */
AssertMsgFailed(("Invalid facility status/run level detected! uCurFacility=%ld\n", uCurFacility));
+
+ /*
+ * Set a specific facility status.
+ */
+ if (Facility)
+ {
+ Assert(Facility < UINT32_MAX);
+ FacilityData *pData = &mData.mFacilityMap[(AdditionsFacilityType_T)Facility];
+ AssertPtr(pData);
+
+ RTTimeNow(&pData->tsLastUpdated);
+ pData->curStatus = (AdditionsFacilityStatus_T)Status;
+
+ LogFlowFunc(("Setting guest facility %u = %u (%u)\n",
+ Facility, pData->curStatus, pData->tsLastUpdated));
+ }
}