VirtualBox

Changeset 48308 in vbox for trunk/src/VBox/VMM/VMMAll


Ignore:
Timestamp:
Sep 5, 2013 1:52:30 PM (11 years ago)
Author:
vboxsync
Message:

VMM: Log cosmetics.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

    r48203 r48308  
    675675                HyperCR0 &= ~X86_CR0_EM;
    676676                HyperCR0 |= cr0 & X86_CR0_EM;
    677                 Log(("CPUM New HyperCR0=%#x\n", HyperCR0));
     677                Log(("CPUM: New HyperCR0=%#x\n", HyperCR0));
    678678                ASMSetCR0(HyperCR0);
    679679            }
     
    699699            HyperCR0 &= ~(X86_CR0_TS | X86_CR0_EM | X86_CR0_MP);
    700700            HyperCR0 |= cr0 & (X86_CR0_TS | X86_CR0_EM | X86_CR0_MP);
    701             Log(("CPUM New HyperCR0=%#x\n", HyperCR0));
     701            Log(("CPUM: New HyperCR0=%#x\n", HyperCR0));
    702702            ASMSetCR0(HyperCR0);
    703703        }
     
    11501150            if (CPUMGetGuestCpuVendor(pVCpu->CTX_SUFF(pVM)) != CPUMCPUVENDOR_INTEL)
    11511151            {
    1152                 Log(("MSR %#x is Intel, the virtual CPU isn't an Intel one -> #GP\n", idMsr));
     1152                Log(("CPUM: MSR %#x is Intel, the virtual CPU isn't an Intel one -> #GP\n", idMsr));
    11531153                rc = VERR_CPUM_RAISE_GP_0;
    11541154                break;
     
    11941194            if (CPUMGetGuestCpuVendor(pVCpu->CTX_SUFF(pVM)) != CPUMCPUVENDOR_AMD)
    11951195            {
    1196                 Log(("MSR %#x is AMD, the virtual CPU isn't an Intel one -> #GP\n", idMsr));
     1196                Log(("CPUM: MSR %#x is AMD, the virtual CPU isn't an Intel one -> #GP\n", idMsr));
    11971197                return VERR_CPUM_RAISE_GP_0;
    11981198            }
     
    12991299                    &&  (uValue & 0xff) != 6) )
    13001300            {
    1301                 Log(("MSR_IA32_MTRR_DEF_TYPE: #GP(0) - writing reserved value (%#llx)\n", uValue));
     1301                Log(("CPUM: MSR_IA32_MTRR_DEF_TYPE: #GP(0) - writing reserved value (%#llx)\n", uValue));
    13021302                return VERR_CPUM_RAISE_GP_0;
    13031303            }
     
    13821382                &&  (pVCpu->cpum.s.Guest.cr0 & X86_CR0_PG))
    13831383            {
    1384                 Log(("Illegal MSR_K6_EFER_LME change: paging is enabled!!\n"));
     1384                Log(("CPUM: Illegal MSR_K6_EFER_LME change: paging is enabled!!\n"));
    13851385                return VERR_CPUM_RAISE_GP_0;
    13861386            }
     
    14571457            if (CPUMGetGuestCpuVendor(pVCpu->CTX_SUFF(pVM)) != CPUMCPUVENDOR_INTEL)
    14581458            {
    1459                 Log(("MSR %#x is Intel, the virtual CPU isn't an Intel one -> #GP\n", idMsr));
     1459                Log(("CPUM: MSR %#x is Intel, the virtual CPU isn't an Intel one -> #GP\n", idMsr));
    14601460                return VERR_CPUM_RAISE_GP_0;
    14611461            }
     
    14711471            if (CPUMGetGuestCpuVendor(pVCpu->CTX_SUFF(pVM)) != CPUMCPUVENDOR_AMD)
    14721472            {
    1473                 Log(("MSR %#x is AMD, the virtual CPU isn't an Intel one -> #GP\n", idMsr));
     1473                Log(("CPUM: MSR %#x is AMD, the virtual CPU isn't an Intel one -> #GP\n", idMsr));
    14741474                return VERR_CPUM_RAISE_GP_0;
    14751475            }
     
    19221922                &&  pVM->cpum.s.enmGuestCpuVendor == CPUMCPUVENDOR_AMD)
    19231923                pVM->cpum.s.aGuestCpuIdExt[1].edx |= X86_CPUID_AMD_FEATURE_EDX_APIC;
    1924             LogRel(("CPUMSetGuestCpuIdFeature: Enabled APIC\n"));
     1924            LogRel(("CPUM: SetGuestCpuIdFeature: Enabled APIC\n"));
    19251925            break;
    19261926
     
    19311931            if (pVM->cpum.s.aGuestCpuIdStd[0].eax >= 1)
    19321932                pVM->cpum.s.aGuestCpuIdStd[1].ecx |= X86_CPUID_FEATURE_ECX_X2APIC;
    1933             LogRel(("CPUMSetGuestCpuIdFeature: Enabled x2APIC\n"));
     1933            LogRel(("CPUM: SetGuestCpuIdFeature: Enabled x2APIC\n"));
    19341934            break;
    19351935
     
    19481948            if (pVM->cpum.s.aGuestCpuIdStd[0].eax >= 1)
    19491949                pVM->cpum.s.aGuestCpuIdStd[1].edx |= X86_CPUID_FEATURE_EDX_SEP;
    1950             LogRel(("CPUMSetGuestCpuIdFeature: Enabled sysenter/exit\n"));
     1950            LogRel(("CPUM: SetGuestCpuIdFeature: Enabled sysenter/exit\n"));
    19511951            break;
    19521952        }
     
    19701970#endif
    19711971                {
    1972                     LogRel(("WARNING: Can't turn on SYSCALL/SYSRET when the host doesn't support it!!\n"));
     1972                    LogRel(("CPUM: WARNING! Can't turn on SYSCALL/SYSRET when the host doesn't support it!\n"));
    19731973                    return;
    19741974                }
     
    19761976            /* Valid for both Intel and AMD CPUs, although only in 64 bits mode for Intel. */
    19771977            pVM->cpum.s.aGuestCpuIdExt[1].edx |= X86_CPUID_EXT_FEATURE_EDX_SYSCALL;
    1978             LogRel(("CPUMSetGuestCpuIdFeature: Enabled syscall/ret\n"));
     1978            LogRel(("CPUM: SetGuestCpuIdFeature: Enabled syscall/ret\n"));
    19791979            break;
    19801980        }
     
    19881988            if (!(ASMCpuId_EDX(1) & X86_CPUID_FEATURE_EDX_PAE))
    19891989            {
    1990                 LogRel(("WARNING: Can't turn on PAE when the host doesn't support it!!\n"));
     1990                LogRel(("CPUM: WARNING! Can't turn on PAE when the host doesn't support it!\n"));
    19911991                return;
    19921992            }
     
    19971997                &&  pVM->cpum.s.enmGuestCpuVendor == CPUMCPUVENDOR_AMD)
    19981998                pVM->cpum.s.aGuestCpuIdExt[1].edx |= X86_CPUID_AMD_FEATURE_EDX_PAE;
    1999             LogRel(("CPUMSetGuestCpuIdFeature: Enabled PAE\n"));
     1999            LogRel(("CPUM: SetGuestCpuIdFeature: Enabled PAE\n"));
    20002000            break;
    20012001        }
     
    20102010                ||  !(ASMCpuId_EDX(0x80000001) & X86_CPUID_EXT_FEATURE_EDX_LONG_MODE))
    20112011            {
    2012                 LogRel(("WARNING: Can't turn on LONG MODE when the host doesn't support it!!\n"));
     2012                LogRel(("CPUM: WARNING! Can't turn on LONG MODE when the host doesn't support it!\n"));
    20132013                return;
    20142014            }
     
    20162016            /* Valid for both Intel and AMD. */
    20172017            pVM->cpum.s.aGuestCpuIdExt[1].edx |= X86_CPUID_EXT_FEATURE_EDX_LONG_MODE;
    2018             LogRel(("CPUMSetGuestCpuIdFeature: Enabled LONG MODE\n"));
     2018            LogRel(("CPUM: SetGuestCpuIdFeature: Enabled LONG MODE\n"));
    20192019            break;
    20202020        }
     
    20292029                ||  !(ASMCpuId_EDX(0x80000001) & X86_CPUID_EXT_FEATURE_EDX_NX))
    20302030            {
    2031                 LogRel(("WARNING: Can't turn on NX/XD when the host doesn't support it!!\n"));
     2031                LogRel(("CPUM: WARNING! Can't turn on NX/XD when the host doesn't support it!\n"));
    20322032                return;
    20332033            }
     
    20352035            /* Valid for both Intel and AMD. */
    20362036            pVM->cpum.s.aGuestCpuIdExt[1].edx |= X86_CPUID_EXT_FEATURE_EDX_NX;
    2037             LogRel(("CPUMSetGuestCpuIdFeature: Enabled NX\n"));
     2037            LogRel(("CPUM: SetGuestCpuIdFeature: Enabled NX\n"));
    20382038            break;
    20392039        }
     
    20482048                ||  !(ASMCpuId_ECX(0x80000001) & X86_CPUID_EXT_FEATURE_ECX_LAHF_SAHF))
    20492049            {
    2050                 LogRel(("WARNING: Can't turn on LAHF/SAHF when the host doesn't support it!!\n"));
     2050                LogRel(("CPUM: WARNING! Can't turn on LAHF/SAHF when the host doesn't support it!\n"));
    20512051                return;
    20522052            }
     
    20542054            /* Valid for both Intel and AMD. */
    20552055            pVM->cpum.s.aGuestCpuIdExt[1].ecx |= X86_CPUID_EXT_FEATURE_ECX_LAHF_SAHF;
    2056             LogRel(("CPUMSetGuestCpuIdFeature: Enabled LAHF/SAHF\n"));
     2056            LogRel(("CPUM: SetGuestCpuIdFeature: Enabled LAHF/SAHF\n"));
    20572057            break;
    20582058        }
     
    20652065                &&  pVM->cpum.s.enmGuestCpuVendor == CPUMCPUVENDOR_AMD)
    20662066                pVM->cpum.s.aGuestCpuIdExt[1].edx |= X86_CPUID_AMD_FEATURE_EDX_PAT;
    2067             LogRel(("CPUMSetGuestCpuIdFeature: Enabled PAT\n"));
     2067            LogRel(("CPUM: SetGuestCpuIdFeature: Enabled PAT\n"));
    20682068            break;
    20692069        }
     
    20802080            {
    20812081                if (!pVM->cpum.s.u8PortableCpuIdLevel)
    2082                     LogRel(("WARNING: Can't turn on RDTSCP when the host doesn't support it!!\n"));
     2082                    LogRel(("CPUM: WARNING! Can't turn on RDTSCP when the host doesn't support it!\n"));
    20832083                return;
    20842084            }
     
    20862086            /* Valid for both Intel and AMD. */
    20872087            pVM->cpum.s.aGuestCpuIdExt[1].edx |= X86_CPUID_EXT_FEATURE_EDX_RDTSCP;
    2088             LogRel(("CPUMSetGuestCpuIdFeature: Enabled RDTSCP.\n"));
     2088            LogRel(("CPUM: SetGuestCpuIdFeature: Enabled RDTSCP.\n"));
    20892089            break;
    20902090        }
     
    20962096            if (pVM->cpum.s.aGuestCpuIdStd[0].eax >= 1)
    20972097                pVM->cpum.s.aGuestCpuIdStd[1].ecx |= X86_CPUID_FEATURE_ECX_HVP;
    2098             LogRel(("CPUMSetGuestCpuIdFeature: Enabled Hypervisor Present bit\n"));
     2098            LogRel(("CPUM: SetGuestCpuIdFeature: Enabled Hypervisor Present bit\n"));
    20992099            break;
    21002100
     
    21822182                &&  pVM->cpum.s.enmGuestCpuVendor == CPUMCPUVENDOR_AMD)
    21832183                pVM->cpum.s.aGuestCpuIdExt[1].edx &= ~X86_CPUID_AMD_FEATURE_EDX_APIC;
    2184             Log(("CPUMClearGuestCpuIdFeature: Disabled APIC\n"));
     2184            Log(("CPUM: ClearGuestCpuIdFeature: Disabled APIC\n"));
    21852185            break;
    21862186
     
    21912191            if (pVM->cpum.s.aGuestCpuIdStd[0].eax >= 1)
    21922192                pVM->cpum.s.aGuestCpuIdStd[1].ecx &= ~X86_CPUID_FEATURE_ECX_X2APIC;
    2193             Log(("CPUMClearGuestCpuIdFeature: Disabled x2APIC\n"));
     2193            Log(("CPUM: ClearGuestCpuIdFeature: Disabled x2APIC\n"));
    21942194            break;
    21952195
     
    22012201                &&  pVM->cpum.s.enmGuestCpuVendor == CPUMCPUVENDOR_AMD)
    22022202                pVM->cpum.s.aGuestCpuIdExt[1].edx &= ~X86_CPUID_AMD_FEATURE_EDX_PAE;
    2203             Log(("CPUMClearGuestCpuIdFeature: Disabled PAE!\n"));
     2203            Log(("CPUM: ClearGuestCpuIdFeature: Disabled PAE!\n"));
    22042204            break;
    22052205        }
     
    22122212                &&  pVM->cpum.s.enmGuestCpuVendor == CPUMCPUVENDOR_AMD)
    22132213                pVM->cpum.s.aGuestCpuIdExt[1].edx &= ~X86_CPUID_AMD_FEATURE_EDX_PAT;
    2214             Log(("CPUMClearGuestCpuIdFeature: Disabled PAT!\n"));
     2214            Log(("CPUM: ClearGuestCpuIdFeature: Disabled PAT!\n"));
    22152215            break;
    22162216        }
     
    22342234            if (pVM->cpum.s.aGuestCpuIdExt[0].eax >= 0x80000001)
    22352235                pVM->cpum.s.aGuestCpuIdExt[1].edx &= ~X86_CPUID_EXT_FEATURE_EDX_RDTSCP;
    2236             Log(("CPUMClearGuestCpuIdFeature: Disabled RDTSCP!\n"));
     2236            Log(("CPUM: ClearGuestCpuIdFeature: Disabled RDTSCP!\n"));
    22372237            break;
    22382238        }
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