allow configuring network card type, slightly refactor V86 interface

(breaking change) remove network_adapter option for now

src/browser/main.js

@@ -1698,7 +1698,10 @@
 
             boot_order: settings.boot_order || parseInt($("boot_order").value, 16) || 0,
 
-            network_relay_url: networking_proxy,
+            net_device: {
+                type: "ne2k",
+                relay_url: networking_proxy,
+            },
 
             bios: settings.bios || bios,
             vga_bios: settings.bios ? null : vga_bios,

src/browser/starter.js

@@ -3,11 +3,11 @@
 /**
  * Constructor for emulator instances.
  *
- * Usage: `var emulator = new V86(options);`
+ * Usage: `new V86(options);`
  *
  * Options can have the following properties (all optional, default in parenthesis):
  *
- * - `memory_size number` (16 * 1024 * 1024) - The memory size in bytes, should
+ * - `memory_size number` (64 * 1024 * 1024) - The memory size in bytes, should
  *   be a power of 2.
  * - `vga_memory_size number` (8 * 1024 * 1024) - VGA memory size in bytes.
  *
@@ -19,7 +19,15 @@
  *
  * - `network_relay_url string` (No network card) - The url of a server running
  *   websockproxy. See [networking.md](networking.md). Setting this will
- *   enable an emulated network card.
+ *   enable an emulated ne2k network card. Only provided for backwards
+ *   compatibility, use `net_device` instead.
+ *
+ * - `net_device Object` (null) - An object with the following properties:
+ *   - `relay_url: string` - See above
+ *   - `type: "ne2k" | "virtio"` - the type of the emulated cards
+ *
+ * - `net_devices Array<Object>` - Like `net_device`, but allows specifying
+ *   more than one network card (up to 4). (currently not implemented)
  *
  * - `bios Object` (No bios) - Either a url pointing to a bios or an
  *   ArrayBuffer, see below.
@@ -294,28 +302,27 @@ V86.prototype.continue_init = async function(emulator, options)
     settings.cpuid_level = options.cpuid_level;
     settings.virtio_console = options.virtio_console;
 
-    if(options.network_adapter)
+    const relay_url = options.network_relay_url || options.net_device && options.net_device.relay_url;
+    if(relay_url)
     {
-        this.network_adapter = options.network_adapter(this.bus);
-    }
-    else if(options.network_relay_url)
-    {
-        if(options.network_relay_url === "fetch")
+        // TODO: remove bus, use direct calls instead
+        if(relay_url === "fetch")
         {
             this.network_adapter = new FetchNetworkAdapter(this.bus);
         }
-        else if(options.network_relay_url.startsWith("wisp://") || options.network_relay_url.startsWith("wisps://")) {
-            this.network_adapter = new WispNetworkAdapter(options.network_relay_url, this.bus, options);
+        else if(relay_url.startsWith("wisp://") || relay_url.startsWith("wisps://"))
+        {
+            this.network_adapter = new WispNetworkAdapter(relay_url, this.bus, options);
         }
         else
         {
-            this.network_adapter = new NetworkAdapter(options.network_relay_url, this.bus);
+            this.network_adapter = new NetworkAdapter(relay_url, this.bus);
         }
     }
 
     // Enable unconditionally, so that state images don't miss hardware
     // TODO: Should be properly fixed in restore_state
-    settings.enable_ne2k = true;
+    settings.net_device = options.net_device || { type: "ne2k" };
 
     const screen_options = options.screen || {};
     if(options.screen_container)

src/cpu.js

@@ -969,7 +969,7 @@ CPU.prototype.init = function(settings, device_bus)
 
         this.devices.pit = new PIT(this, device_bus);
 
-        if(settings.enable_ne2k)
+        if(settings.net_device.type === "ne2k")
         {
             this.devices.net = new Ne2k(this, device_bus, settings.preserve_mac_from_state_image, settings.mac_address_translation);
         }