Index: /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-PicSetup.c
===================================================================
--- /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-PicSetup.c	(revision 92523)
+++ /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-PicSetup.c	(revision 92524)
@@ -46,5 +46,5 @@
  */
 #undef Bs3PicSetup
-BS3_CMN_DEF(void, Bs3PicSetup,(void))
+BS3_CMN_DEF(void, Bs3PicSetup,(bool fForcedReInit))
 {
     /*
@@ -53,5 +53,5 @@
      * handlers and then(!) use Bs3PicUpdateMask to unmask the IRQ.
      */
-    if (!g_fBs3PicConfigured)
+    if (!g_fBs3PicConfigured || fForcedReInit)
     {
         g_fBs3PicConfigured = true;
Index: /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-pit.c
===================================================================
--- /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-pit.c	(revision 92523)
+++ /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-pit.c	(revision 92524)
@@ -61,5 +61,5 @@
      */
     Bs3PitDisable();
-    Bs3PicSetup();
+    Bs3PicSetup(false /*fForcedReInit*/);
     Bs3TrapSetHandlerEx(0x70, bs3PitIrqHandler_c16, bs3PitIrqHandler_c32, bs3PitIrqHandler_c64);
 
Index: /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-rm-InitAll.c
===================================================================
--- /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-rm-InitAll.c	(revision 92523)
+++ /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-rm-InitAll.c	(revision 92524)
@@ -69,5 +69,5 @@
     }
     ASMIntDisable();
-    Bs3PicSetup();
+    Bs3PicSetup(false /*fForcedReInit*/);
 
     /*
Index: /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h
===================================================================
--- /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h	(revision 92523)
+++ /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h	(revision 92524)
@@ -2461,6 +2461,8 @@
  * use #Bs3PicUpdateMask unmask their IRQ once they've got all the handlers
  * installed.
- */
-BS3_CMN_PROTO_STUB(void, Bs3PicSetup,(void));
+ *
+ * @param   fForcedReInit   Force a reinitialization.
+ */
+BS3_CMN_PROTO_STUB(void, Bs3PicSetup,(bool fForcedReInit));
 
 /**