VirtualBox

Changeset 23801 in vbox for trunk/src/VBox/VMM


Ignore:
Timestamp:
Oct 15, 2009 3:00:47 PM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
53543
Message:

Main,VMM,Frontends,++: Teminology. Added a bind address for the (target) teleporter.

Location:
trunk/src/VBox/VMM
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/VMM/CPUM.cpp

    r23800 r23801  
    7373#define CPUM_SAVED_STATE_VERSION                10
    7474#endif
    75 /** The saved state version of 3.0 and 3.1 trunk before the live migration
     75/** The saved state version of 3.0 and 3.1 trunk before the teleportation
    7676 * changes. */
    7777#define CPUM_SAVED_STATE_VERSION_VER3_0         10
    … …  
    392392                                       //| X86_CPUID_AMD_FEATURE_ECX_SVM    - not virtualized.
    393393                                       //| X86_CPUID_AMD_FEATURE_ECX_EXT_APIC
    394                                        /** Note: This could prevent migration from AMD to Intel CPUs! */
     394                                       /* Note: This could prevent teleporting from AMD to Intel CPUs! */
    395395                                       | X86_CPUID_AMD_FEATURE_ECX_CR8L         /* expose lock mov cr0 = mov cr8 hack for guests that can use this feature to access the TPR. */
    396396                                       //| X86_CPUID_AMD_FEATURE_ECX_ABM

  • trunk/src/VBox/VMM/PGMSavedState.cpp

    r23565 r23801  
    4949/** Saved state data unit version. */
    5050#define PGM_SAVED_STATE_VERSION                 10
    51 /** Saved state data unit version for 3.0. (pre live migration) */
     51/** Saved state data unit version for 3.0 (pre teleportation). */
    5252#define PGM_SAVED_STATE_VERSION_3_0_0           9
    5353/** Saved state data unit version for 2.2.2 and later. */

  • trunk/src/VBox/VMM/SSM.cpp

    r23785 r23801  
    55
    66/*
    7  * Copyright (C) 2006-2007 Sun Microsystems, Inc.
     7 * Copyright (C) 2006-2009 Sun Microsystems, Inc.
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    4242 * @section sec_ssm_live_snapshots  Live Snapshots
    4343 *
    44  * The live snapshots feature (LS) is similar to live migration (LM) and was a
    45  * natural first step when implementing LM.  The main differences between LS and
    46  * LM are that after a live snapshot we will have a saved state file, disk image
     44 * The live snapshots feature (LS) is similar to teleportation (TP) and was a
     45 * natural first step when implementing TP.  The main differences between LS and
     46 * TP are that after a live snapshot we will have a saved state file, disk image
    4747 * snapshots, and the VM will still be running.
    4848 *
    … …  
    5656 * pass is done on EMT(0).
    5757 *
    58  * There are a couple of common reasons why LS and LM will fail:
     58 * There are a couple of common reasons why LS and TP will fail:
    5959 *   - Memory configuration changed (PCI memory mappings).
    60  *   - Takes too long (LM) / Too much output (LS).
     60 *   - Takes too long (TP) / Too much output (LS).
    6161 *
    6262 *
    … …  
    7676 *
    7777 *
    78  * @section sec_ssm_live_migration  Live Migration
     78 * @section sec_ssm_teleportation   Teleportation
    7979 *
    8080 * As mentioned in the previous section, the main differences between this and
    … …  
    8585 * transfer - is taken care of by layer above the VMM (i.e.  Main).
    8686 *
    87  * The SSM data format was made streamable for the purpose of live migration
     87 * The SSM data format was made streamable for the purpose of teleportation
    8888 * (v1.2 was the last non-streamable version).
    8989 *
    … …  
    40244024    AssertMsgReturn(   pSSM->enmAfter == SSMAFTER_DESTROY
    40254025                    || pSSM->enmAfter == SSMAFTER_CONTINUE
    4026                     || pSSM->enmAfter == SSMAFTER_MIGRATE,
     4026                    || pSSM->enmAfter == SSMAFTER_TELEPORT,
    40274027                    ("%d\n", pSSM->enmAfter),
    40284028                    VERR_INVALID_PARAMETER);
    … …  
    44674467    AssertMsgReturn(   pSSM->enmAfter == SSMAFTER_DESTROY
    44684468                    || pSSM->enmAfter == SSMAFTER_CONTINUE
    4469                     || pSSM->enmAfter == SSMAFTER_MIGRATE,
     4469                    || pSSM->enmAfter == SSMAFTER_TELEPORT,
    44704470                    ("%d\n", pSSM->enmAfter),
    44714471                    VERR_INVALID_PARAMETER);
    … …  
    48724872    AssertMsgReturn(   pSSM->enmAfter == SSMAFTER_DESTROY
    48734873                    || pSSM->enmAfter == SSMAFTER_CONTINUE
    4874                     || pSSM->enmAfter == SSMAFTER_MIGRATE,
     4874                    || pSSM->enmAfter == SSMAFTER_TELEPORT,
    48754875                    ("%d\n", pSSM->enmAfter),
    48764876                    VERR_INVALID_PARAMETER);
    … …  
    50735073    AssertMsgReturn(   enmAfter == SSMAFTER_DESTROY
    50745074                    || enmAfter == SSMAFTER_CONTINUE
    5075                     || enmAfter == SSMAFTER_MIGRATE,
     5075                    || enmAfter == SSMAFTER_TELEPORT,
    50765076                    ("%d\n", enmAfter),
    50775077                    VERR_INVALID_PARAMETER);
    … …  
    78227822     */
    78237823    AssertMsgReturn(   enmAfter == SSMAFTER_RESUME
    7824                     || enmAfter == SSMAFTER_MIGRATE
     7824                    || enmAfter == SSMAFTER_TELEPORT
    78257825                    || enmAfter == SSMAFTER_DEBUG_IT,
    78267826                    ("%d\n", enmAfter),

  • trunk/src/VBox/VMM/VM.cpp

    r23668 r23801  
    13811381
    13821382/**
    1383  * EMT rendezvous worker for VMR3Save and VMR3Migrate that suspends the VM after
    1384  * the live step has been completed.
     1383 * EMT rendezvous worker for VMR3Save and VMR3Teleport that suspends the VM
     1384 * after the live step has been completed.
    13851385 *
    13861386 * @returns VERR_VM_INVALID_VM_STATE or VINF_EM_RESUME. (This is a strict
    … …  
    14761476
    14771477/**
    1478  * EMT rendezvous worker that VMR3Save and VMR3Migrate uses to clean up a
     1478 * EMT rendezvous worker that VMR3Save and VMR3Teleport uses to clean up a
    14791479 * SSMR3LiveDoStep1 failure.
    14801480 *
    … …  
    15141514
    15151515/**
    1516  * EMT(0) worker for VMR3Save and VMR3Migrate that completes the live save.
     1516 * EMT(0) worker for VMR3Save and VMR3Teleport that completes the live save.
    15171517 *
    15181518 * @returns VBox status code.
    … …  
    15621562
    15631563/**
    1564  * Worker for vmR3SaveMigrate that validates the state and calls SSMR3Save or
     1564 * Worker for vmR3SaveTeleport that validates the state and calls SSMR3Save or
    15651565 * SSMR3LiveSave.
    15661566 *
    … …  
    15921592    Assert(   enmAfter == SSMAFTER_DESTROY
    15931593           || enmAfter == SSMAFTER_CONTINUE
    1594            || enmAfter == SSMAFTER_MIGRATE);
     1594           || enmAfter == SSMAFTER_TELEPORT);
    15951595    AssertPtr(ppSSM);
    15961596    *ppSSM = NULL;
    … …  
    16201620
    16211621/**
    1622  * Commmon worker for VMR3Save and VMR3Migrate.
     1622 * Commmon worker for VMR3Save and VMR3Teleport.
    16231623 *
    16241624 * @returns VBox status code.
    … …  
    16341634 * @thread  Non-EMT
    16351635 */
    1636 static int vmR3SaveMigrate(PVM pVM, const char *pszFilename, PCSSMSTRMOPS pStreamOps, void *pvStreamOpsUser,
    1637                            SSMAFTER enmAfter, PFNVMPROGRESS pfnProgress, void *pvProgressUser)
     1636static int vmR3SaveTeleport(PVM pVM, const char *pszFilename, PCSSMSTRMOPS pStreamOps, void *pvStreamOpsUser,
     1637                            SSMAFTER enmAfter, PFNVMPROGRESS pfnProgress, void *pvProgressUser)
    16381638{
    16391639    /*
    … …  
    17271727
    17281728    /*
    1729      * Join paths with VMR3Migrate.
     1729     * Join paths with VMR3Teleport.
    17301730     */
    17311731    SSMAFTER enmAfter = fContinueAfterwards ? SSMAFTER_CONTINUE : SSMAFTER_DESTROY;
    1732     int rc = vmR3SaveMigrate(pVM, pszFilename, NULL /*pStreamOps*/, NULL /*pvStreamOpsUser*/,
    1733                              enmAfter, pfnProgress, pvUser);
     1732    int rc = vmR3SaveTeleport(pVM, pszFilename, NULL /*pStreamOps*/, NULL /*pvStreamOpsUser*/,
     1733                              enmAfter, pfnProgress, pvUser);
    17341734    LogFlow(("VMR3Save: returns %Rrc\n", rc));
    17351735    return rc;
    … …  
    17381738
    17391739/**
    1740  * Migrate the VM.
     1740 * Teleport the VM (aka live migration).
    17411741 *
    17421742 * @returns VBox status code.
    … …  
    17531753 *              RunningLS+SuspeningLS+SuspendedLS+Saving+Suspended.
    17541754 */
    1755 VMMR3DECL(int) VMR3Migrate(PVM pVM, PCSSMSTRMOPS pStreamOps, void *pvStreamOpsUser, PFNVMPROGRESS pfnProgress, void *pvProgressUser)
    1756 {
    1757     LogFlow(("VMR3Migrate: pVM=%p pStreamOps=%p pvStreamOps=%p pfnProgress=%p pvProgressUser=%p\n",
     1755VMMR3DECL(int) VMR3Teleport(PVM pVM, PCSSMSTRMOPS pStreamOps, void *pvStreamOpsUser, PFNVMPROGRESS pfnProgress, void *pvProgressUser)
     1756{
     1757    LogFlow(("VMR3Teleport: pVM=%p pStreamOps=%p pvStreamOps=%p pfnProgress=%p pvProgressUser=%p\n",
    17581758             pVM, pStreamOps, pvStreamOpsUser, pfnProgress, pvProgressUser));
    17591759
    … …  
    17691769     * Join paths with VMR3Save.
    17701770     */
    1771     int rc = vmR3SaveMigrate(pVM, NULL /*pszFilename*/, pStreamOps, pvStreamOpsUser,
    1772                              SSMAFTER_MIGRATE, pfnProgress, pvProgressUser);
    1773     LogFlow(("VMR3Migrate: returns %Rrc\n", rc));
     1771    int rc = vmR3SaveTeleport(pVM, NULL /*pszFilename*/, pStreamOps, pvStreamOpsUser,
     1772                              SSMAFTER_TELEPORT, pfnProgress, pvProgressUser);
     1773    LogFlow(("VMR3Teleport: returns %Rrc\n", rc));
    17741774    return rc;
    17751775}

  • trunk/src/VBox/VMM/VMM.cpp

    r23730 r23801  
    101101/** The saved state version. */
    102102#define VMM_SAVED_STATE_VERSION     4
    103 /** The saved state version used by v3.0 and earlier. (Live migration.) */
     103/** The saved state version used by v3.0 and earlier. (Teleportation) */
    104104#define VMM_SAVED_STATE_VERSION_3_0 3
    105105
Note: See TracChangeset for help on using the changeset viewer.

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