VirtualBox

Changeset 26548 in vbox


Ignore:
Timestamp:
Feb 15, 2010 3:26:04 PM (15 years ago)
Author:
vboxsync
Message:

Main, FE: HPET review feedback

Location:
trunk/src/VBox
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

    r25376 r26548  
    435435    return rc != 0;
    436436}
    437 

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

    r26356 r26548  
    11/* $Id$ */
    22/** @file
     3
    34 * VBoxManage - help and other message output.
    45 */
    … …  
    162163                 "                            [--ioapic on|off]\n"
    163164                 "                            [--pae on|off]\n"
     165                 "                            [--hpet on|off]\n"
    164166                 "                            [--hwvirtex on|off]\n"
    165167                 "                            [--nestedpaging on|off]\n"
    … …  
    693695    return 1;
    694696}
    695 

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

    r26517 r26548  
    239239    else
    240240        RTPrintf("VRAM size:       %uMB\n", vramSize);
     241
     242    BOOL fHpetEnabled;
     243    machine->COMGETTER(HpetEnabled)(&fHpetEnabled);
     244    if (details == VMINFO_MACHINEREADABLE)
     245        RTPrintf("hpet=\"%s\"\n", fHpetEnabled ? "on" : "off");
     246    else
     247        RTPrintf("HPET:   %s\n", fHpetEnabled ? "on" : "off");
    241248
    242249    ULONG numCpus;

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

    r26517 r26548  
    134134    MODIFYVM_TELEPORTER_ADDRESS,
    135135    MODIFYVM_TELEPORTER_PASSWORD,
    136     MODIFYVM_HARDWARE_UUID
     136    MODIFYVM_HARDWARE_UUID,
     137    MODIFYVM_HPET
    137138};
    138139
    … …  
    218219    { "--teleporterpassword",       MODIFYVM_TELEPORTER_PASSWORD,       RTGETOPT_REQ_STRING },
    219220    { "--hardwareuuid",             MODIFYVM_HARDWARE_UUID,             RTGETOPT_REQ_STRING },
     221    { "--hpet",                     MODIFYVM_HPET,                      RTGETOPT_REQ_BOOL_ONOFF },
    220222};
    221223
    … …  
    15691571            }
    15701572
     1573            case MODIFYVM_HPET:
     1574            {
     1575                CHECK_ERROR(machine, COMSETTER(HpetEnabled)(ValueUnion.f));
     1576                break;
     1577            }
     1578
    15711579            default:
    15721580            {

  • trunk/src/VBox/Frontends/VBoxShell/vboxshell.py

    r24859 r26548  
    550550    print "  Hardware 2d video acceleration[accelerate2DVideoEnabled]: " + asState(mach.accelerate2DVideoEnabled)
    551551
     552    print "  HPET [hpetEnabled]: %s" %(asState(mach.hpetEnabled))
    552553    print "  Last changed [n/a]: " + time.asctime(time.localtime(long(mach.lastStateChange)/1000))
    553554    print "  VRDP server [VRDPServer.enabled]: %s" %(asState(mach.VRDPServer.enabled))

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp

    r26539 r26548  
    122122    { QRegExp("Ne.*B", Qt::CaseInsensitive), "NetBSD" },
    123123    { QRegExp("QN", Qt::CaseInsensitive), "QNX" },
    124     { QRegExp("((Mac)|(Tig)|(Leop)).*64", Qt::CaseInsensitive), "MacOS_64" },
    125     { QRegExp("(Mac)|(Tig)|(Leop)", Qt::CaseInsensitive), "MacOS" },
     124    { QRegExp("((Mac)|(Tig)|(Leop)|(osx)).*64", Qt::CaseInsensitive), "MacOS_64" },
     125    { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" },
    126126    { QRegExp("Net", Qt::CaseInsensitive), "Netware" },
    127127    { QRegExp("Ot", Qt::CaseInsensitive), "Other" },
    … …  
    693693    }
    694694
     695    // Set HPET flag
     696    m_Machine.SetHpetEnabled(type.GetRecommendedHpet());
     697
    695698    /* Register the VM prior to attaching hard disks */
    696699    vbox.RegisterMachine(m_Machine);

  • trunk/src/VBox/Main/ConsoleImpl2.cpp

    r26532 r26548  
    586586    hrc = guestOSType->COMGETTER(FamilyId)(tmpStr2.asOutParam());                   H();
    587587    /*
    588      * Enable 3 following devices: HPET, SMC, LPC on MacOS X guests */
     588     * Enable 3 following devices: HPET, SMC, LPC on MacOS X guests
     589     */
    589590    BOOL fExtProfile = tmpStr2 == Bstr("MacOS");
    590591
    … …  
    594595    BOOL fHpetEnabled;
    595596#ifdef VBOX_WITH_HPET
     597    /* Other guests may wish to use HPET too, but MacOS X not functional without it */
    596598    hrc = pMachine->COMGETTER(HpetEnabled)(&fHpetEnabled);                          H();
    597     /* Always enable HPET in extended profile */
     599    /* so always enable HPET in extended profile */
    598600    fHpetEnabled |= fExtProfile;
    599601#else
    … …  
    20922094        rc = CFGMR3InsertInteger(pCfg,  "IOAPIC", fIOAPIC);                         RC_CHECK();
    20932095        rc = CFGMR3InsertInteger(pCfg,  "FdcEnabled", fFdcEnabled);                 RC_CHECK();
    2094 #ifdef VBOX_WITH_HPET
    20952096        rc = CFGMR3InsertInteger(pCfg,  "HpetEnabled", fHpetEnabled);               RC_CHECK();
    2096 #endif
    20972097#ifdef VBOX_WITH_SMC
    20982098        rc = CFGMR3InsertInteger(pCfg,  "SmcEnabled", fSmcEnabled);                 RC_CHECK();

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

    r26544 r26548  
    157157      VBOXOSTYPE_OS2,             VBOXOSHINT_HWVIRTEX,   96,   4,  2 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4 },
    158158    { "MacOS",  "Mac OS X",             SchemaDefs_OSTypeId_MacOS,             "Mac OS X",
    159       VBOXOSTYPE_MacOS,           VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID,  1024,   4,  20 * _1K, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6 },
     159      VBOXOSTYPE_MacOS,           VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET,  1024,   4,  20 * _1K, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6 },
    160160    { "MacOS",  "Mac OS X",             SchemaDefs_OSTypeId_MacOS_64,          "Mac OS X (64 bit)",
    161       VBOXOSTYPE_MacOS_x64,       VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE |  VBOXOSHINT_64BIT | VBOXOSHINT_USBHID,  1024,   4,  20 * _1K, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6 },
     161      VBOXOSTYPE_MacOS_x64,       VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE |  VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET,  1024,   4,  20 * _1K, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6 },
    162162    { "Other",   "Other",             SchemaDefs_OSTypeId_DOS,             "DOS",
    163163      VBOXOSTYPE_DOS,             VBOXOSHINT_NONE,  32,   4,      512, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 },

  • trunk/src/VBox/Main/GuestOSTypeImpl.cpp

    r26536 r26548  
    332332}
    333333
     334STDMETHODIMP GuestOSType::COMGETTER(RecommendedHpet) (BOOL *aRecommendedHpet)
     335{
     336    CheckComArgOutPointerValid(aRecommendedHpet);
     337
     338    AutoCaller autoCaller(this);
     339    if (FAILED(autoCaller.rc())) return autoCaller.rc();
     340
     341    /* HPET recomendation is constant during life time, no need to lock */
     342    *aRecommendedHpet = !!(mOSHint & VBOXOSHINT_HPET);
     343
     344    return S_OK;
     345}
     346
    334347/* vi: set tabstop=4 shiftwidth=4 expandtab: */

  • trunk/src/VBox/Main/idl/VirtualBox.xidl

    r26459 r26548  
    82758275  <interface
    82768276    name="IGuestOSType" extends="$unknown"
    8277     uuid="1498bf9c-c662-4cee-8f6f-59ec933fa892"
     8277    uuid="5e02d197-dfa2-474d-bd1d-3243a1f24afb"
    82788278    wsmap="struct"
    82798279  >
    … …  
    83398339    <attribute name="recommendedUsbHid" type="boolean" readonly="yes">
    83408340      <desc>Returns @c true if using USB Human Interface Devices, such as keyboard and mouse recommended.</desc>
     8341    </attribute>
     8342
     8343     <attribute name="recommendedHpet" type="boolean" readonly="yes">
     8344      <desc>Returns @c true if using HPET is recommended for this OS type.</desc>
    83418345    </attribute>
    83428346

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

    r26440 r26548  
    4242#define VBOXOSHINT_PAE                  RT_BIT(4)
    4343#define VBOXOSHINT_USBHID               RT_BIT(5)
    44 
     44#define VBOXOSHINT_HPET                 RT_BIT(6)
    4545
    4646/**

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

    r26440 r26548  
    7878    STDMETHOD(COMGETTER(RecommendedPae)) (BOOL *aRecommendedExtHw);
    7979    STDMETHOD(COMGETTER(RecommendedUsbHid)) (BOOL *aRecommendedUsbHid);
     80    STDMETHOD(COMGETTER(RecommendedHpet)) (BOOL *aRecommendedHpet);
    8081
    8182    // public methods only for internal purposes
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