Changeset 107298 in vbox

Timestamp:

Dec 12, 2024 12:01:08 PM (2 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

166328

Message:

Main/Appliance: Within IMachine::exportTo() only call IPlatform::getX86()
and IPlatformX86::getCPUProperty() if the VM being exported contains an
x86 CPU.

File:

• trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp

@@ -147 +147 @@
         uint32_t ulMemSizeMB = mHWData->mMemorySize;
 
-        ComPtr<IPlatformX86> pPlatformX86;
-        mPlatform->COMGETTER(X86)(pPlatformX86.asOutParam());
-
-        // VRAM size?
-        // BIOS settings?
-        // 3D acceleration enabled?
-        // hardware virtualization enabled?
-        // nested paging enabled?
-        // HWVirtExVPIDEnabled?
-        // PAEEnabled?
-        // Long mode enabled?
-        BOOL fLongMode;
-        hrc = pPlatformX86->GetCPUProperty(CPUPropertyTypeX86_LongMode, &fLongMode);
-        if (FAILED(hrc)) throw hrc;
+        PlatformArchitecture_T enmPlatformArch;
+        mPlatform->COMGETTER(Architecture)(&enmPlatformArch);
+
+        BOOL fLongMode = false;
+        if (enmPlatformArch == PlatformArchitecture_x86)
+        {
+            ComPtr<IPlatformX86> pPlatformX86;
+            mPlatform->COMGETTER(X86)(pPlatformX86.asOutParam());
+
+            // VRAM size?
+            // BIOS settings?
+            // 3D acceleration enabled?
+            // hardware virtualization enabled?
+            // nested paging enabled?
+            // HWVirtExVPIDEnabled?
+            // PAEEnabled?
+            // Long mode enabled?
+            hrc = pPlatformX86->GetCPUProperty(CPUPropertyTypeX86_LongMode, &fLongMode);
+            if (FAILED(hrc)) throw hrc;
+        }
 
         // snapshotFolder?