Fix booting from cd while hda present, booting from hda while cd present

Makefile

@@ -314,6 +314,7 @@ api-tests: all-debug
 	./tests/api/reset.js
 	./tests/api/floppy-insert-eject.js
 	./tests/api/serial.js
+	./tests/api/cdrom-insert-eject.js
 
 all-tests: jshint kvm-unit-test qemutests qemutests-release jitpagingtests api-tests nasmtests nasmtests-force-jit tests expect-tests
 	# Skipping:

debug.html

@@ -143,6 +143,13 @@ <h4>Debugger</h4>
                 </td>
             </tr>
 
+            <tr>
+                <td><label for="wants_cdrom">Allow empty cd-rom drive</label></td>
+                <td>
+                    <input id="wants_cdrom" type="checkbox"><br>
+                </td>
+            </tr>
+
             <tr>
                 <td><label for="floppy_image">Floppy disk image</label></td>
                 <td> <input type="file" id="floppy_image"><br></td>

index.html

@@ -80,6 +80,13 @@ <h4>Setup</h4>
                 </td>
             </tr>
 
+            <tr>
+                <td><label for="wants_cdrom">Allow empty cd-rom drive</label></td>
+                <td>
+                    <input id="wants_cdrom" type="checkbox"><br>
+                </td>
+            </tr>
+
             <tr>
                 <td><label for="floppy_image">Floppy disk image</label></td>
                 <td> <input type="file" id="floppy_image"><br></td>

src/browser/main.js

@@ -1113,6 +1113,7 @@
 
             settings.fda = infos.fda;
             settings.cdrom = infos.cdrom;
+            settings.wants_cdrom = infos.wants_cdrom;
             settings.hda = infos.hda;
             settings.multiboot = infos.multiboot;
             settings.bzimage = infos.bzimage;
@@ -1323,6 +1324,8 @@
         const disable_audio = settings.audio === undefined ? $("disable_audio").checked : !settings.audio;
         const enable_acpi = settings.acpi === undefined ? $("enable_acpi").checked : settings.acpi;
 
+        const wants_cdrom = settings.wants_cdrom === undefined ? $("wants_cdrom").checked : settings.wants_cdrom;
+
         /** @const */
         var BIOSPATH = "bios/";
 
@@ -1369,6 +1372,7 @@
             "hda": settings.hda,
             "hdb": settings.hdb,
             "cdrom": settings.cdrom,
+            "wants_cdrom": settings.wants_cdrom,
 
             "multiboot": settings.multiboot,
             "bzimage": settings.bzimage,

src/browser/starter.js

@@ -39,6 +39,7 @@
  * - `filesystem Object` (No 9p filesystem) - A 9p filesystem, see
  *   [filesystem.md](filesystem.md).
  *
+ * - `wants_cdrom bool` - Whether to set up a CD-ROM drive even with no CD present. Implied by the presence of a `cdrom` object.
  * - `serial_container HTMLTextAreaElement` (No serial terminal) - A textarea
  *   that will receive and send data to the emulated serial terminal.
  *   Alternatively the serial terminal can also be accessed programatically,
@@ -261,6 +262,7 @@ V86Starter.prototype.continue_init = async function(emulator, options)
         options["fda"] ? BOOT_ORDER_FD_FIRST :
         options["hda"] ? BOOT_ORDER_HD_FIRST : BOOT_ORDER_CD_FIRST;
 
+    settings.wants_cdrom = options["wants_cdrom"] || ("cdrom" in options) || false;
     settings.acpi = options["acpi"];
     settings.disable_jit = options["disable_jit"];
     settings.load_devices = true;
@@ -339,6 +341,7 @@ V86Starter.prototype.continue_init = async function(emulator, options)
                 break;
             case "cdrom":
                 settings.cdrom = this.disk_images["cdrom"] = buffer;
+                settings.wants_cdrom = true;
                 break;
             case "fda":
                 settings.fda = this.disk_images["fda"] = buffer;
@@ -371,6 +374,7 @@ V86Starter.prototype.continue_init = async function(emulator, options)
                 break;
             default:
                 dbg_assert(false, name);
+                break;
         }
     }
 
@@ -1008,6 +1012,42 @@ V86Starter.prototype.eject_fda = function()
     this.v86.cpu.devices.fdc.eject_fda();
 };
 
+/**
+ * Set the image inserted in the CD-ROM drive. Can be changed at runtime, as
+ * when physically changing the CD-ROM.
+ * @export
+ */
+V86Starter.prototype.set_cdrom = async function(file)
+{
+    if(file.url && !file.async)
+    {
+        v86util.load_file(file.url, {
+            done: result =>
+            {
+                this.v86.cpu.devices.cdrom.master.set_cdrom(new v86util.SyncBuffer(result));
+            },
+        });
+    }
+    else
+    {
+        const image = v86util.buffer_from_object(file);
+        image.onload = () =>
+        {
+            this.v86.cpu.devices.cdrom.master.set_cdrom(image);
+        };
+        await image.load();
+    }
+};
+
+/**
+ * Eject the CD-ROM.
+ * @export
+ */
+V86Starter.prototype.eject_cdrom = function()
+{
+    this.v86.cpu.devices.cdrom.master.eject();
+};
+
 /**
  * Send a sequence of scan codes to the emulated PS2 controller. A list of
  * codes can be found at http://stanislavs.org/helppc/make_codes.html.

src/cpu.js

@@ -873,7 +873,7 @@ CPU.prototype.init = function(settings, device_bus)
             this.devices.hda = new IDEDevice(this, settings.hda, settings.hdb, false, ide_device_count++, device_bus);
         }
 
-        if(settings.cdrom)
+        if(settings.cdrom || settings.wants_cdrom)
         {
             this.devices.cdrom = new IDEDevice(this, settings.cdrom, undefined, true, ide_device_count++, device_bus);
         }