VirtualBox

Changeset 93410 in vbox


Ignore:
Timestamp:
Jan 24, 2022 2:45:10 PM (3 years ago)
Author:
vboxsync
Message:

Main: Generate enum value to string conversion functions for the API. Use these for logging instead of the Global::stringify* ones as they are untranslated, the Global:: ones are for use in error message when translated enum value names are desired (questionable).

Location:
trunk/src/VBox/Main
Files:
1 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Main/Config.kmk

    r93115 r93410  
    4040VBOX_AUTOGEN_EVENT_CPP  = $(PATH_TARGET)/Main/VBoxEvents.cpp
    4141
     42# Enum stringify functions.
     43VBOX_AUTOGEN_STRINGIFY_ENUMS_H    = $(PATH_TARGET)/Main/StringifyEnums.h
     44VBOX_AUTOGEN_STRINGIFY_ENUMS_CPP  = $(PATH_TARGET)/Main/StringifyEnums.cpp
     45

  • trunk/src/VBox/Main/Makefile.kmk

    r93312 r93410  
    576576        $(VBOX_XML_SCHEMADEFS_H) \
    577577        $(VBOX_AUTOGEN_EVENT_H) \
     578        $(VBOX_AUTOGEN_STRINGIFY_ENUMS_H) \
    578579        $(VBOX_MAIN_APIWRAPPER_GEN_HDRS)
    579580
    … …  
    674675        $(VBOX_XML_SCHEMADEFS_CPP) \
    675676        $(VBOX_AUTOGEN_EVENT_CPP) \
     677        $(VBOX_AUTOGEN_STRINGIFY_ENUMS_CPP) \
    676678        $(if $(VBOX_WITH_XPCOM),src-server/xpcom/server.cpp,)
    677679
    … …  
    867869# Generate some event stuff for VBoxSVC and VBoxC.
    868870#
     871
     872# Events
    869873$(call KB_FN_AUTO_CMD_DEPS,$(VBOX_AUTOGEN_EVENT_H).ts)
    870874$(VBOX_AUTOGEN_EVENT_H).ts +| $(VBOX_AUTOGEN_EVENT_H): $(VBOX_PATH_MAIN_SRC)/idl/comimpl.xsl $(VBOX_XIDL_FILE) | $$(dir $$@)
    … …  
    882886
    883887OTHER_CLEAN += $(VBOX_AUTOGEN_EVENT_H).ts $(VBOX_AUTOGEN_EVENT_H) $(VBOX_AUTOGEN_EVENT_CPP).ts $(VBOX_AUTOGEN_EVENT_CPP)
     888
     889# Enum stringifiers
     890$(call KB_FN_AUTO_CMD_DEPS,$(VBOX_AUTOGEN_STRINGIFY_ENUMS_H).ts)
     891$(VBOX_AUTOGEN_STRINGIFY_ENUMS_H).ts +| $(VBOX_AUTOGEN_STRINGIFY_ENUMS_H): $(VBOX_PATH_MAIN_SRC)/idl/stringify-enums.xsl $(VBOX_XIDL_FILE) | $$(dir $$@)
     892        $(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
     893        $(call MSG_TOOL,xsltproc,autogen enum stringifiers,$<,$@)
     894        $(QUIET)$(VBOX_XSLTPROC) --stringparam G_kind header -o "$@" "$(VBOX_PATH_MAIN_SRC)/idl/stringify-enums.xsl" "$(VBOX_XIDL_FILE)"
     895        $(QUIET)$(CP) --changed -fv -- "$@" "$(VBOX_AUTOGEN_STRINGIFY_ENUMS_H)"
     896
     897$(call KB_FN_AUTO_CMD_DEPS,$(VBOX_AUTOGEN_STRINGIFY_ENUMS_CPP).ts)
     898$(VBOX_AUTOGEN_STRINGIFY_ENUMS_CPP).ts +| $(VBOX_AUTOGEN_STRINGIFY_ENUMS_CPP): $(VBOX_PATH_MAIN_SRC)/idl/stringify-enums.xsl $(VBOX_XIDL_FILE) | $$(dir $$@)
     899        $(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
     900        $(call MSG_TOOL,xsltproc,autogen enum stringifiers,$<,$@)
     901        $(QUIET)$(VBOX_XSLTPROC) --stringparam G_kind source -o "$@" "$(VBOX_PATH_MAIN_SRC)/idl/stringify-enums.xsl" "$(VBOX_XIDL_FILE)"
     902        $(QUIET)$(CP) --changed -fv -- "$@" "$(VBOX_AUTOGEN_STRINGIFY_ENUMS_CPP)"
     903
     904OTHER_CLEAN += $(VBOX_AUTOGEN_STRINGIFY_ENUMS_H).ts $(VBOX_AUTOGEN_STRINGIFY_ENUMS_H) $(VBOX_AUTOGEN_STRINGIFY_ENUMS_CPP).ts $(VBOX_AUTOGEN_STRINGIFY_ENUMS_CPP)
    884905
    885906ifdef VBOX_WITH_XPCOM
    … …  
    10391060        $(VBOX_XML_SCHEMADEFS_H) \
    10401061        $(VBOX_AUTOGEN_EVENT_H) \
     1062        $(VBOX_AUTOGEN_STRINGIFY_ENUMS_H) \
    10411063        $(VBOX_MAIN_APIWRAPPER_GEN_HDRS)
    10421064
    … …  
    10871109        src-client/VMMDevInterface.cpp \
    10881110        $(VBOX_AUTOGEN_EVENT_CPP) \
     1111        $(VBOX_AUTOGEN_STRINGIFY_ENUMS_CPP) \
    10891112        $(VBOX_XML_SCHEMADEFS_CPP)
    10901113
    … …  
    12151238        src-client/VirtualBoxClientImpl.cpp \
    12161239        $(VBOX_AUTOGEN_EVENT_CPP) \
     1240        $(VBOX_AUTOGEN_STRINGIFY_ENUMS_CPP) \
    12171241        $(VBOX_XML_SCHEMADEFS_CPP)
    12181242 ifdef VBOX_WITH_MAIN_NLS

  • trunk/src/VBox/Main/include/Global.h

    r93406 r93410  
    147147
    148148    /**
    149      * Stringify a machine state.
     149     * Stringify a machine state - translated.
     150     *
     151     * Drop the Global:: prefix and include StringifyEnums.h for an untranslated
     152     * version of this method.
    150153     *
    151154     * @returns Pointer to a read only string.
    … …  
    155158
    156159    /**
    157      * Stringify a session state.
     160     * Stringify a session state - translated.
     161     *
     162     * Drop the Global:: prefix and include StringifyEnums.h for an untranslated
     163     * version of this method.
    158164     *
    159165     * @returns Pointer to a read only string.
    … …  
    162168    static const char *stringifySessionState(SessionState_T aState);
    163169
     170#if 0 /* unused */
    164171    /**
    165172     * Stringify a storage bus type.
    166173     *
     174     * Drop the Global:: prefix and include StringifyEnums.h for an untranslated
     175     * version of this method.
     176     *
    167177     * @returns Pointer to a read only string.
    168178     * @param   aBus        The storage bus type.
    … …  
    173183     * Stringify a device type.
    174184     *
     185     * Drop the Global:: prefix and include StringifyEnums.h for an untranslated
     186     * version of this method.
     187     *
    175188     * @returns Pointer to a read only string.
    176189     * @param   aType       The device type.
    … …  
    181194     * Stringify a reason.
    182195     *
     196     * Drop the Global:: prefix and include StringifyEnums.h for an untranslated
     197     * version of this method.
     198     *
    183199     * @returns Pointer to a read only string.
    184200     * @param   aReason     The reason code.
    185201     */
    186202    static const char *stringifyReason(Reason_T aReason);
     203#endif
    187204
    188205    /**

  • trunk/src/VBox/Main/src-all/Global.cpp

    r93405 r93410  
    1919
    2020#include "Global.h"
     21#include "StringifyEnums.h"
    2122
    2223#include <iprt/assert.h>
    … …  
    615616        case MachineState_Snapshotting:         return GlobalCtx::tr("Snapshotting");
    616617        default:
    617         {
    618             AssertMsgFailed(("%d (%#x)\n", aState, aState));
    619             static char s_szMsg[48];
    620             RTStrPrintf(s_szMsg, sizeof(s_szMsg), GlobalCtx::tr("InvalidState-0x%08x\n"), aState);
    621             return s_szMsg;
    622         }
     618            AssertMsgFailedReturn(("%d (%#x)\n", aState, aState), ::stringifyMachineState(aState));
    623619    }
    624620}
    … …  
    635631        case SessionState_Unlocking:    return GlobalCtx::tr("Unlocking");
    636632        default:
    637         {
    638             AssertMsgFailed(("%d (%#x)\n", aState, aState));
    639             static char s_szMsg[48];
    640             RTStrPrintf(s_szMsg, sizeof(s_szMsg), GlobalCtx::tr("InvalidState-0x%08x\n"), aState);
    641             return s_szMsg;
    642         }
     633            AssertMsgFailedReturn(("%d (%#x)\n", aState, aState), ::stringifySessionState(aState));
    643634    }
    644635}
     636
     637#if 0 /* unused */
    645638
    646639/*static*/ const char *
    … …  
    649642    switch (aBus)
    650643    {
    651         case StorageBus_Null:           return "Null";
    652         case StorageBus_IDE:            return "IDE";
    653         case StorageBus_SATA:           return "SATA";
    654         case StorageBus_Floppy:         return "Floppy";
    655         case StorageBus_SAS:            return "SAS";
    656         case StorageBus_USB:            return "USB";
    657         case StorageBus_PCIe:           return "PCIe";
    658         case StorageBus_VirtioSCSI:     return "VirtioSCSI";
     644        case StorageBus_Null:           return GlobalCtx::tr("Null");
     645        case StorageBus_IDE:            return GlobalCtx::tr("IDE");
     646        case StorageBus_SATA:           return GlobalCtx::tr("SATA");
     647        case StorageBus_Floppy:         return GlobalCtx::tr("Floppy");
     648        case StorageBus_SAS:            return GlobalCtx::tr("SAS");
     649        case StorageBus_USB:            return GlobalCtx::tr("USB");
     650        case StorageBus_PCIe:           return GlobalCtx::tr("PCIe");
     651        case StorageBus_VirtioSCSI:     return GlobalCtx::tr("VirtioSCSI");
    659652        default:
    660         {
    661             AssertMsgFailed(("%d (%#x)\n", aBus, aBus));
    662             static char s_szMsg[48];
    663             RTStrPrintf(s_szMsg, sizeof(s_szMsg), "InvalidBus-0x%08x", aBus);
    664             return s_szMsg;
    665         }
     653            AssertMsgFailedReturn(("%d (%#x)\n", aBus, aBus), ::stringifyStorageBus(aBus));
    666654    }
    667655}
    … …  
    680668        case DeviceType_SharedFolder: return GlobalCtx::tr("ShardFolder");
    681669        default:
    682         {
    683             AssertMsgFailed(("%d (%#x)\n", aType, aType));
    684             static char s_szMsg[48];
    685             RTStrPrintf(s_szMsg, sizeof(s_szMsg), GlobalCtx::tr("InvalidType-0x%08x\n"), aType);
    686             return s_szMsg;
    687         }
     670            AssertMsgFailedReturn(("%d (%#x)\n", aType, aType), ::stringifyDeviceType(aType));
    688671    }
    689672}
    … …  
    700683        case Reason_Snapshot:         return GlobalCtx::tr("snapshot");
    701684        default:
    702         {
    703             AssertMsgFailed(("%d (%#x)\n", aReason, aReason));
    704             static char s_szMsg[48];
    705             RTStrPrintf(s_szMsg, sizeof(s_szMsg), GlobalCtx::tr("invalid reason %#010x\n"), aReason);
    706             return s_szMsg;
    707         }
     685            AssertMsgFailedReturn(("%d (%#x)\n", aReason, aReason), ::stringifyReason(aReason));
    708686    }
    709687}
    710688
     689#endif /* unused */
     690
    711691/* vi: set tabstop=4 shiftwidth=4 expandtab: */

  • trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

    r93362 r93410  
    7878#include "EmulatedUSBImpl.h"
    7979#include "NvramStoreImpl.h"
     80#include "StringifyEnums.h"
    8081
    8182#include "VBoxEvents.h"
    … …  
    66826683    LogFlowThisFunc(("Sending PAUSE request...\n"));
    66836684    if (aReason != Reason_Unspecified)
    6684         LogRel(("Pausing VM execution, reason '%s'\n", Global::stringifyReason(aReason)));
     6685        LogRel(("Pausing VM execution, reason '%s'\n", ::stringifyReason(aReason)));
    66856686
    66866687    /** @todo r=klaus make use of aReason */
    … …  
    67286729    LogFlowThisFunc(("Sending RESUME request...\n"));
    67296730    if (aReason != Reason_Unspecified)
    6730         LogRel(("Resuming VM execution, reason '%s'\n", Global::stringifyReason(aReason)));
     6731        LogRel(("Resuming VM execution, reason '%s'\n", ::stringifyReason(aReason)));
    67316732
    67326733    int vrc;
    … …  
    68416842
    68426843    if (aReason != Reason_Unspecified)
    6843         LogRel(("Saving state of VM, reason '%s'\n", Global::stringifyReason(aReason)));
     6844        LogRel(("Saving state of VM, reason '%s'\n", ::stringifyReason(aReason)));
    68446845
    68456846    /* ensure the directory for the saved state file exists */
    … …  
    81468147              || mMachineState == MachineState_TeleportingPausedVM
    81478148              || mMachineState == MachineState_TeleportingIn
    8148               , ("Invalid machine state: %s\n", Global::stringifyMachineState(mMachineState)));
     8149              , ("Invalid machine state: %s\n", ::stringifyMachineState(mMachineState)));
    81498150
    81508151    LogRel(("Console::powerDown(): A request to power off the VM has been issued (mMachineState=%s, InUninit=%d)\n",
    8151             Global::stringifyMachineState(mMachineState), getObjectState().getState() == ObjectState::InUninit));
     8152            ::stringifyMachineState(mMachineState), getObjectState().getState() == ObjectState::InUninit));
    81528153
    81538154    /* Check if we need to power off the VM. In case of mVMPoweredOff=true, the
    … …  
    84058406    {
    84068407        LogThisFunc(("machineState=%s -> %s aUpdateServer=%RTbool\n",
    8407                      Global::stringifyMachineState(mMachineState), Global::stringifyMachineState(aMachineState), aUpdateServer));
    8408         LogRel(("Console: Machine state changed to '%s'\n", Global::stringifyMachineState(aMachineState)));
     8408                     ::stringifyMachineState(mMachineState), ::stringifyMachineState(aMachineState), aUpdateServer));
     8409        LogRel(("Console: Machine state changed to '%s'\n", ::stringifyMachineState(aMachineState)));
    84098410        mMachineState = aMachineState;
    84108411
    … …  
    90489049
    90499050                default:
    9050                     AssertMsgFailed(("%s\n", Global::stringifyMachineState(that->mMachineState)));
     9051                    AssertMsgFailed(("%s\n", ::stringifyMachineState(that->mMachineState)));
    90519052            }
    90529053            break;
    … …  
    90759076
    90769077                default:
    9077                     AssertMsgFailed(("%s/%s -> %s\n", Global::stringifyMachineState(that->mMachineState),
     9078                    AssertMsgFailed(("%s/%s -> %s\n", ::stringifyMachineState(that->mMachineState),
    90789079                                    VMR3GetStateName(enmOldState), VMR3GetStateName(enmState) ));
    90799080                    that->i_setMachineState(MachineState_Paused);
    … …  
    91129113            AssertMsg(   that->mMachineState == MachineState_LiveSnapshotting
    91139114                      || that->mMachineState == MachineState_Teleporting,
    9114                       ("%s/%s -> %s\n", Global::stringifyMachineState(that->mMachineState),
     9115                      ("%s/%s -> %s\n", ::stringifyMachineState(that->mMachineState),
    91159116                      VMR3GetStateName(enmOldState), VMR3GetStateName(enmState) ));
    91169117            break;

  • trunk/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp

    r93115 r93410  
    2424
    2525#include "ConsoleImpl.h"
     26#include "ProgressImpl.h"
    2627#include "Global.h"
    27 #include "ProgressImpl.h"
     28#include "StringifyEnums.h"
    2829
    2930#include "AutoCaller.h"
    … …  
    814815         */
    815816        AssertLogRelMsg(enmVMState == VMSTATE_SUSPENDED, ("%s\n", VMR3GetStateName(enmVMState)));
    816         AssertLogRelMsg(enmMachineState == MachineState_TeleportingPausedVM,
    817                         ("%s\n", Global::stringifyMachineState(enmMachineState)));
     817        AssertLogRelMsg(enmMachineState == MachineState_TeleportingPausedVM, ("%s\n", ::stringifyMachineState(enmMachineState)));
    818818
    819819        ptrVM.release();

  • trunk/src/VBox/Main/src-client/SessionImpl.cpp

    r93115 r93410  
    2121#include "SessionImpl.h"
    2222#include "ConsoleImpl.h"
     23#include "ClientTokenHolder.h"
    2324#include "Global.h"
    24 #include "ClientTokenHolder.h"
     25#include "StringifyEnums.h"
    2526
    2627#include "AutoCaller.h"
    … …  
    525526        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
    526527
    527         LogFlowThisFunc(("mState=%s, mType=%d\n", Global::stringifySessionState(mState), mType));
     528        LogFlowThisFunc(("mState=%s, mType=%d\n", ::stringifySessionState(mState), mType));
    528529
    529530        if (mState == SessionState_Unlocking)
    … …  
    11631164                      aFinalRelease, aFromServer));
    11641165
    1165     LogFlowThisFunc(("mState=%s, mType=%d\n", Global::stringifySessionState(mState), mType));
     1166    LogFlowThisFunc(("mState=%s, mType=%d\n", ::stringifySessionState(mState), mType));
    11661167
    11671168    Assert(aLockW.isWriteLockOnCurrentThread());

  • trunk/src/VBox/Main/src-server/MachineImpl.cpp

    r93388 r93410  
    6161#include "HashedPw.h"
    6262#include "Performance.h"
     63#include "StringifyEnums.h"
    6364
    6465#include <iprt/asm.h>
    … …  
    29772978                        mUserData->s.strName.c_str());
    29782979
    2979     LogFlowThisFunc(("mSession.mState=%s\n", Global::stringifySessionState(mData->mSession.mState)));
     2980    LogFlowThisFunc(("mSession.mState=%s\n", ::stringifySessionState(mData->mSession.mState)));
    29802981
    29812982    SessionState_T oldState = mData->mSession.mState;
    … …  
    29902991        mData->mSession.mProgress->WaitForCompletion(1000);
    29912992        alock.acquire();
    2992         LogFlowThisFunc(("after waiting: mSession.mState=%s\n", Global::stringifySessionState(mData->mSession.mState)));
     2993        LogFlowThisFunc(("after waiting: mSession.mState=%s\n", ::stringifySessionState(mData->mSession.mState)));
    29932994    }
    29942995
    … …  
    74017402                        mUserData->s.strName.c_str());
    74027403
    7403     LogFlowThisFunc(("mSession.mState=%s\n", Global::stringifySessionState(mData->mSession.mState)));
     7404    LogFlowThisFunc(("mSession.mState=%s\n", ::stringifySessionState(mData->mSession.mState)));
    74047405
    74057406    /* The process started when launching a VM with separate UI/VM processes is always
    … …  
    84768477{
    84778478    LogFlowThisFuncEnter();
    8478     LogFlowThisFunc(("aMachineState=%s\n", Global::stringifyMachineState(aMachineState) ));
     8479    LogFlowThisFunc(("aMachineState=%s\n", ::stringifyMachineState(aMachineState) ));
    84798480    Assert(aMachineState != MachineState_Null);
    84808481
    … …  
    1360113602
    1360213603        if (!Global::IsOnline(mData->mMachineState))
    13603         {
    13604             AssertMsgFailedReturn(("%s\n", Global::stringifyMachineState(mData->mMachineState)),
    13605                                   VBOX_E_INVALID_VM_STATE);
    13606         }
     13604            AssertMsgFailedReturn(("%s\n", ::stringifyMachineState(mData->mMachineState)), VBOX_E_INVALID_VM_STATE);
    1360713605
    1360813606        i_setModified(IsModified_MachineData);
    … …  
    1466214660    AssertMsgReturn(oldMachineState != aMachineState,
    1466314661                    ("oldMachineState=%s, aMachineState=%s\n",
    14664                      Global::stringifyMachineState(oldMachineState), Global::stringifyMachineState(aMachineState)),
     14662                     ::stringifyMachineState(oldMachineState), ::stringifyMachineState(aMachineState)),
    1466514663                    E_FAIL);
    1466614664
    … …  
    1488914887    }
    1489014888
    14891     LogFlowThisFunc(("rc=%Rhrc [%s]\n", rc, Global::stringifyMachineState(mData->mMachineState) ));
     14889    LogFlowThisFunc(("rc=%Rhrc [%s]\n", rc, ::stringifyMachineState(mData->mMachineState) ));
    1489214890    LogFlowThisFuncLeave();
    1489314891    return rc;

  • trunk/src/VBox/Main/src-server/MediumAttachmentImpl.cpp

    r93115 r93410  
    2121#include "MediumImpl.h"
    2222#include "Global.h"
     23#include "StringifyEnums.h"
    2324
    2425#include "AutoCaller.h"
    … …  
    629630                          this,
    630631                          pszEndNick ? pszEndNick - pszName : 4, pszName,
    631                           m->bd->mData.lPort, m->bd->mData.lDevice, Global::stringifyDeviceType(m->bd->mData.deviceType),
     632                          m->bd->mData.lPort, m->bd->mData.lDevice, ::stringifyDeviceType(m->bd->mData.deviceType),
    632633                          m->bd->fImplicit ? ":I" : "");
    633634}

  • trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

    r93115 r93410  
    2626#include "MediumImpl.h"
    2727#include "MediumFormatImpl.h"
     28#include "ProgressImpl.h"
    2829#include "Global.h"
    29 #include "ProgressImpl.h"
     30#include "StringifyEnums.h"
    3031
    3132/// @todo these three includes are required for about one or two lines, try
    … …  
    19351936        rc = i_finishTakingSnapshot(task, alock, true /*aSuccess*/);
    19361937        // do not throw rc here because we can't call i_finishTakingSnapshot() twice
    1937         LogFlowThisFunc(("i_finishTakingSnapshot -> %Rhrc [mMachineState=%s]\n", rc, Global::stringifyMachineState(mData->mMachineState)));
     1938        LogFlowThisFunc(("i_finishTakingSnapshot -> %Rhrc [mMachineState=%s]\n", rc, ::stringifyMachineState(mData->mMachineState)));
    19381939    }
    19391940    catch (HRESULT rcThrown)
    19401941    {
    19411942        rc = rcThrown;
    1942         LogThisFunc(("Caught %Rhrc [mMachineState=%s]\n", rc, Global::stringifyMachineState(mData->mMachineState)));
     1943        LogThisFunc(("Caught %Rhrc [mMachineState=%s]\n", rc, ::stringifyMachineState(mData->mMachineState)));
    19431944
    19441945        /// @todo r=klaus check that the implicit diffs created above are cleaned up im the relevant error cases
    … …  
    19841985                if (FAILED(rc2) || enmMachineState == MachineState_Null)
    19851986                {
    1986                     AssertMsgFailed(("state=%s\n", Global::stringifyMachineState(enmMachineState)));
     1987                    AssertMsgFailed(("state=%s\n", ::stringifyMachineState(enmMachineState)));
    19871988                    // pure nonsense, try to continue somehow
    19881989                    enmMachineState = MachineState_Aborted;
    … …  
    20192020        }
    20202021        LogFlowThisFunc(("local mMachineState=%s remote mMachineState=%s\n",
    2021                          Global::stringifyMachineState(mData->mMachineState),
    2022                          Global::stringifyMachineState(enmMachineState)));
     2022                         ::stringifyMachineState(mData->mMachineState), ::stringifyMachineState(enmMachineState)));
    20232023
    20242024        if (fNeedClientMachineStateUpdate)

  • trunk/src/VBox/Main/src-server/UnattendedImpl.cpp

    r93405 r93410  
    3030#include "MachineImpl.h"
    3131#include "Global.h"
     32#include "StringifyEnums.h"
    3233
    3334#include <VBox/err.h>
    … …  
    19271928            if (enmRecommendedStorageBus != enmRecommendedStorageBus2)
    19281929                LogRel(("Unattended::reconfigureVM: DVD storage bus recommendations differs for the VM and the ISO guest OS types: VM: %s (%ls), ISO: %s (%ls)\n",
    1929                         Global::stringifyStorageBus(enmRecommendedStorageBus), bstrGuestOsTypeId.raw(),
    1930                         Global::stringifyStorageBus(enmRecommendedStorageBus2), bstrDetectedOSTypeId.raw() ));
     1930                        ::stringifyStorageBus(enmRecommendedStorageBus), bstrGuestOsTypeId.raw(),
     1931                        ::stringifyStorageBus(enmRecommendedStorageBus2), bstrDetectedOSTypeId.raw() ));
    19311932        }
    19321933    }
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette