Index: /trunk/src/VBox/Devices/Storage/DevATA.cpp
===================================================================
--- /trunk/src/VBox/Devices/Storage/DevATA.cpp	(revision 41018)
+++ /trunk/src/VBox/Devices/Storage/DevATA.cpp	(revision 41019)
@@ -252,4 +252,6 @@
     /** Enable passing through commands directly to the ATAPI drive. */
     bool            fATAPIPassthrough;
+    /** Flag whether to overwrite inquiry data in passthrough mode. */
+    bool            fOverwriteInquiry;
     /** Number of errors we've reported to the release log.
      * This is to prevent flooding caused by something going horribly wrong.
@@ -2280,5 +2282,6 @@
                 s->cbTotalTransfer = cbTransfer;
 
-            if (s->aATAPICmd[0] == SCSI_INQUIRY)
+            if (   s->aATAPICmd[0] == SCSI_INQUIRY
+                && s->fOverwriteInquiry)
             {
                 /* Make sure that the real drive cannot be identified.
@@ -7599,4 +7602,9 @@
                                         N_("PIIX3 configuration error: failed to read \"ATAPIRevision\" as string"));
                         }
+
+                        rc = CFGMR3QueryBoolDef(pCfgNode, "OverwriteInquiry", &pIf->fOverwriteInquiry, true);
+                        if (RT_FAILURE(rc))
+                            return PDMDEV_SET_ERROR(pDevIns, rc,
+                                        N_("PIIX3 configuration error: failed to read \"OverwriteInquiry\" as boolean"));
                     }
                 }
Index: /trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp
===================================================================
--- /trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp	(revision 41018)
+++ /trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp	(revision 41019)
@@ -783,5 +783,7 @@
     GEN_CHECK_OFF(ATADevState, StatBytesWritten);
     GEN_CHECK_OFF(ATADevState, StatFlushes);
+    GEN_CHECK_OFF(ATADevState, fNonRotational);
     GEN_CHECK_OFF(ATADevState, fATAPIPassthrough);
+    GEN_CHECK_OFF(ATADevState, fOverwriteInquiry);
     GEN_CHECK_OFF(ATADevState, cErrors);
     GEN_CHECK_OFF(ATADevState, pDrvBase);