Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	(revision 33019)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	(revision 33020)
@@ -193,4 +193,5 @@
 #endif
                      "                            [--firmware bios|efi|efi32|efi64]\n"
+                     "                            [--chipset ich9|piix3]\n"
                      "                            [--bioslogofadein on|off]\n"
                      "                            [--bioslogofadeout on|off]\n"
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp	(revision 33019)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp	(revision 33020)
@@ -249,4 +249,57 @@
     else
         RTPrintf("HPET:            %s\n", fHpetEnabled ? "on" : "off");
+
+    ChipsetType_T chipsetType = ChipsetType_Null;
+    const char *pszChipsetType = NULL;
+    machine->COMGETTER(ChipsetType)(&chipsetType);
+    switch (chipsetType)
+    {
+        case ChipsetType_Null:
+            pszChipsetType = "invalid";
+            break;
+        case ChipsetType_PIIX3:
+            pszChipsetType = "piix3";
+            break;
+        case ChipsetType_ICH9:
+            pszChipsetType = "ich9";
+            break;
+        default:
+            Assert(false);
+            pszChipsetType = "unknown";
+    }
+    if (details == VMINFO_MACHINEREADABLE)
+        RTPrintf("chipset=\"%s\"\n", pszChipsetType);
+    else
+        RTPrintf("Chipset:         %s\n", pszChipsetType);
+
+    FirmwareType_T firmwareType = FirmwareType_BIOS;
+    const char *pszFirmwareType = NULL;
+    machine->COMGETTER(FirmwareType)(&firmwareType);
+    switch (firmwareType)
+    {
+        case FirmwareType_BIOS:
+            pszFirmwareType = "BIOS";
+            break;
+        case FirmwareType_EFI:
+            pszFirmwareType = "EFI";
+            break;
+        case FirmwareType_EFI32:
+            pszFirmwareType = "EFI32";
+            break;
+        case FirmwareType_EFI64:
+            pszFirmwareType = "EFI64";
+            break;
+        case FirmwareType_EFIDUAL:
+            pszFirmwareType = "EFIDUAL";
+            break;
+        default:
+            Assert(false);
+            pszFirmwareType = "unknown";
+    }
+    if (details == VMINFO_MACHINEREADABLE)
+        RTPrintf("firmware=\"%s\"\n", pszFirmwareType);
+    else
+        RTPrintf("Firmware:        %s\n", pszFirmwareType);
+
 
     ULONG numCpus;
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp	(revision 33019)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp	(revision 33020)
@@ -159,5 +159,6 @@
     MODIFYVM_FAULT_TOLERANCE_PASSWORD,
     MODIFYVM_FAULT_TOLERANCE_SYNC_INTERVAL,
-    MODIFYVM_CPU_EXECTUION_CAP
+    MODIFYVM_CPU_EXECTUION_CAP,
+    MODIFYVM_CHIPSET
 };
 
@@ -275,4 +276,5 @@
     { "--faulttolerancepassword",   MODIFYVM_FAULT_TOLERANCE_PASSWORD,  RTGETOPT_REQ_STRING },
     { "--faulttolerancesyncinterval", MODIFYVM_FAULT_TOLERANCE_SYNC_INTERVAL, RTGETOPT_REQ_UINT32 },
+    { "--chipset",                  MODIFYVM_CHIPSET,                   RTGETOPT_REQ_STRING },
 };
 
@@ -2027,4 +2029,22 @@
             }
 
+            case MODIFYVM_CHIPSET:
+            {
+                if (!strcmp(ValueUnion.psz, "piix3"))
+                {
+                    CHECK_ERROR(machine, COMSETTER(ChipsetType)(ChipsetType_PIIX3));
+                }
+                else if (!strcmp(ValueUnion.psz, "ich9"))
+                {
+                    CHECK_ERROR(machine, COMSETTER(ChipsetType)(ChipsetType_ICH9));
+                }
+                else
+                {
+                    errorArgument("Invalid --chipset argument '%s' (valid: piix3,ich9)", ValueUnion.psz);
+                    rc = E_FAIL;
+                }
+                break;
+            }
+
             default:
             {