koffi 1.2.4 → 1.3.1

package/qemu/qemu.js

@@ -123,13 +123,16 @@ async function main() {
             machine.key = key;
             machine.started = false;
 
-            machine.qemu.accelerate = null;
-            if (accelerate && (machine.qemu.binary == 'qemu-system-x86_64' ||
-                               machine.qemu.binary == 'qemu-system-i386')) {
-                if (process.platform == 'linux') {
-                    machine.qemu.accelerate = 'kvm';
-                } else if (process.platform == 'win32') {
-                    machine.qemu.accelerate = 'whpx';
+            if (machine.qemu != null) {
+                machine.qemu.accelerate = null;
+
+                if (accelerate && (machine.qemu.binary == 'qemu-system-x86_64' ||
+                                   machine.qemu.binary == 'qemu-system-i386')) {
+                    if (process.platform == 'linux') {
+                        machine.qemu.accelerate = 'kvm';
+                    } else if (process.platform == 'win32') {
+                        machine.qemu.accelerate = 'whpx';
+                    }
                 }
             }
         }
@@ -222,6 +225,12 @@ async function start(detach = true) {
     await Promise.all(machines.map(async machine => {
         if (ignore.has(machine))
             return;
+        if (machine.qemu == null) {
+            ignore.add(machine);
+            missing++;
+
+            return;
+        }
 
         let dirname = `qemu/${machine.key}`;
 
@@ -239,7 +248,7 @@ async function start(detach = true) {
             let filename = dirname + '/VERSION';
             let version = fs.existsSync(filename) ? parseInt(fs.readFileSync(filename).toString(), 10) : 0;
 
-            if (version != machine.info.version) {
+            if (version != machine.qemu.version) {
                 log(machine, 'Download newer machine', chalk.bold.gray('[ignore]'));
 
                 ignore.add(machine);
@@ -286,13 +295,13 @@ async function pack() {
         for (let suite in machine.builds) {
             let build = machine.builds[suite];
 
-            let platform = build.platform || machine.info.platform;
-            let arch = build.arch || machine.info.arch;
-
-            let archive_filename = root_dir + `/koffi/build/qemu/${version}/koffi_${platform}_${arch}.tar.gz`;
+            let archive_filename = root_dir + `/koffi/build/qemu/${version}/koffi_${machine.platform}_${build.arch}.tar.gz`;
 
             if (fs.existsSync(archive_filename)) {
                 log(machine, `${suite} > Status`, chalk.bold.green(`[ok]`));
+            } else if (machine.qemu == null) {
+                log(machine, `${suite} > Status`, chalk.bold.red(`[manual]`));
+                needed = true;
             } else {
                 log(machine, `${suite} > Status`, chalk.bold.red(`[build]`));
                 needed = true;
@@ -369,11 +378,8 @@ async function pack() {
             await Promise.all(Object.keys(machine.builds).map(async suite => {
                 let build = machine.builds[suite];
 
-                let platform = build.platform || machine.info.platform;
-                let arch = build.arch || machine.info.arch;
-
                 let src_dir = build.directory + '/koffi/build';
-                let dest_dir = build_dir + `/${version}/koffi_${platform}_${arch}`;
+                let dest_dir = build_dir + `/${version}/koffi_${machine.platform}_${build.arch}`;
                 let dest_filename = dest_dir + '.tar.gz';
 
                 unlink_recursive(dest_dir + '/build');
@@ -547,6 +553,8 @@ async function stop(all = true) {
     await Promise.all(machines.map(async machine => {
         if (ignore.has(machine))
             return;
+        if (machine.qemu == null)
+            return;
         if (!machine.started && !all)
             return;
 
@@ -570,7 +578,7 @@ async function stop(all = true) {
                 machine.ssh.connection.on('end', resolve);
                 wait(60000).then(() => { reject(new Error('Timeout')) });
 
-                exec_remote(machine, machine.info.shutdown);
+                exec_remote(machine, machine.qemu.shutdown);
             });
 
             log(machine, 'Stop', chalk.bold.green('[ok]'));
@@ -585,11 +593,14 @@ async function stop(all = true) {
 
 async function info() {
     for (let machine of machines) {
+        if (machine.qemu == null)
+            continue;
+
         console.log(`>> ${machine.name} (${machine.key})`);
-        console.log(`  - SSH port: ${machine.info.ssh_port}`);
-        console.log(`  - VNC port: ${machine.info.vnc_port}`);
-        console.log(`  - Username: ${machine.info.username}`);
-        console.log(`  - Password: ${machine.info.password}`);
+        console.log(`  - SSH port: ${machine.qemu.ssh_port}`);
+        console.log(`  - VNC port: ${machine.qemu.vnc_port}`);
+        console.log(`  - Username: ${machine.qemu.username}`);
+        console.log(`  - Password: ${machine.qemu.password}`);
     }
 }
 
@@ -602,10 +613,10 @@ async function ssh() {
     let machine = machines[0];
 
     let args = [
-        '-p' + machine.info.password,
+        '-p' + machine.qemu.password,
         'ssh', '-o', 'StrictHostKeyChecking=no',
                '-o', 'UserKnownHostsFile=' + (process.platform == 'win32' ? '\\\\.\\NUL' : '/dev/null'),
-               '-p', machine.info.ssh_port, machine.info.username + '@127.0.0.1'
+               '-p', machine.qemu.ssh_port, machine.qemu.username + '@127.0.0.1'
     ];
 
     let proc = spawnSync('sshpass', args, { stdio: 'inherit' });
@@ -624,6 +635,9 @@ async function reset() {
 
     console.log('>> Restoring snapshots...')
     await Promise.all(machines.map(machine => {
+        if (machine.qemu == null)
+            return;
+
         let dirname = `qemu/${machine.key}`;
         let disk = dirname + '/disk.qcow2';
 
@@ -753,9 +767,9 @@ async function join(machine, tries) {
         try {
             await ssh.connect({
                 host: '127.0.0.1',
-                port: machine.info.ssh_port,
-                username: machine.info.username,
-                password: machine.info.password,
+                port: machine.qemu.ssh_port,
+                username: machine.qemu.username,
+                password: machine.qemu.password,
                 tryKeyboard: true
             });
 
@@ -790,7 +804,7 @@ function log(machine, action, status) {
 
 async function exec_remote(machine, cmd, cwd = null) {
     try {
-        if (machine.info.platform == 'win32') {
+        if (machine.platform == 'win32') {
             if (cwd != null) {
                 cwd = cwd.replaceAll('/', '\\');
                 cmd = `cd "${cwd}" && ${cmd}`;

package/qemu/registry/machines.json

@@ -1,16 +1,12 @@
 {
     "debian_arm32": {
         "name": "Debian ARM32",
+        "platform": "linux",
 
         "qemu": {
             "binary": "qemu-system-arm",
-            "arguments": ["-M", "virt", "-cpu", "cortex-a15", "-m", "1G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-armmp-lpae", "-initrd", "initrd.img-5.10.0-12-armmp-lpae", "-append", "root=/dev/vda2 apparmor=0", "-drive", "if=none,file=disk.qcow2,format=qcow2,id=hd", "-device", "virtio-blk-device,drive=hd", "-netdev", "user,id=mynet,hostfwd=tcp::22201-:22", "-device", "virtio-net-device,netdev=mynet", "-vnc", "127.0.0.1:11"]
-        },
-
-        "info": {
+            "arguments": ["-M", "virt", "-cpu", "cortex-a15", "-m", "1G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-armmp-lpae", "-initrd", "initrd.img-5.10.0-12-armmp-lpae", "-append", "root=/dev/vda2 apparmor=0", "-drive", "if=none,file=disk.qcow2,format=qcow2,id=hd", "-device", "virtio-blk-device,drive=hd", "-netdev", "user,id=mynet,hostfwd=tcp::22201-:22", "-device", "virtio-net-device,netdev=mynet", "-vnc", "127.0.0.1:11"],
             "version": 3,
-            "platform": "linux",
-            "arch": "arm",
 
             "ssh_port": 22201,
             "vnc_port": 5911,
@@ -23,6 +19,7 @@
 
         "builds": {
             "Linux ARM32": {
+                "arch": "arm32hf",
                 "directory": "/home/debian/luigi",
                 "build": "node ../cnoke/cnoke.js"
             }
@@ -47,16 +44,12 @@
 
     "debian_arm64": {
         "name": "Debian ARM64",
+        "platform": "linux",
 
         "qemu": {
             "binary": "qemu-system-aarch64",
-            "arguments": ["-M", "virt", "-cpu", "cortex-a53", "-m", "1G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-arm64", "-initrd", "initrd.img-5.10.0-12-arm64", "-append", "root=/dev/vda2 apparmor=0", "-drive", "if=none,file=disk.qcow2,format=qcow2,id=hd", "-device", "virtio-blk-device,drive=hd", "-netdev", "user,id=mynet,hostfwd=tcp::22202-:22", "-device", "virtio-net-device,netdev=mynet", "-vnc", "127.0.0.1:12"]
-        },
-
-        "info": {
+            "arguments": ["-M", "virt", "-cpu", "cortex-a53", "-m", "1G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-arm64", "-initrd", "initrd.img-5.10.0-12-arm64", "-append", "root=/dev/vda2 apparmor=0", "-drive", "if=none,file=disk.qcow2,format=qcow2,id=hd", "-device", "virtio-blk-device,drive=hd", "-netdev", "user,id=mynet,hostfwd=tcp::22202-:22", "-device", "virtio-net-device,netdev=mynet", "-vnc", "127.0.0.1:12"],
             "version": 3,
-            "platform": "linux",
-            "arch": "arm64",
 
             "ssh_port": 22202,
             "vnc_port": 5912,
@@ -69,6 +62,7 @@
 
         "builds": {
             "Linux ARM64": {
+                "arch": "arm64",
                 "directory": "/home/debian/luigi",
                 "build": "node ../cnoke/cnoke.js"
             }
@@ -93,16 +87,12 @@
 
     "debian_i386": {
         "name": "Debian i386",
+        "platform": "linux",
 
         "qemu": {
             "binary": "qemu-system-i386",
-            "arguments": ["-cpu", "max", "-m", "1G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-686-pae", "-initrd", "initrd.img-5.10.0-12-686-pae", "-append", "root=/dev/sda1 apparmor=0", "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22203-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:13"]
-        },
-
-        "info": {
+            "arguments": ["-cpu", "max", "-m", "1G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-686-pae", "-initrd", "initrd.img-5.10.0-12-686-pae", "-append", "root=/dev/sda1 apparmor=0", "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22203-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:13"],
             "version": 3,
-            "platform": "linux",
-            "arch": "ia32",
 
             "ssh_port": 22203,
             "vnc_port": 5913,
@@ -115,6 +105,7 @@
 
         "builds": {
             "Linux i386": {
+                "arch": "ia32",
                 "directory": "/home/debian/luigi",
                 "build": "node ../cnoke/cnoke.js"
             }
@@ -139,16 +130,12 @@
 
     "debian_x64": {
         "name": "Debian x64",
+        "platform": "linux",
 
         "qemu": {
             "binary": "qemu-system-x86_64",
-            "arguments": ["-m", "1G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-amd64", "-initrd", "initrd.img-5.10.0-12-amd64", "-append", "root=/dev/sda1 apparmor=0", "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22204-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:14"]
-        },
-
-        "info": {
+            "arguments": ["-m", "1G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-amd64", "-initrd", "initrd.img-5.10.0-12-amd64", "-append", "root=/dev/sda1 apparmor=0", "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22204-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:14"],
             "version": 3,
-            "platform": "linux",
-            "arch": "x64",
 
             "ssh_port": 22204,
             "vnc_port": 5914,
@@ -161,6 +148,7 @@
 
         "builds": {
             "Linux x64": {
+                "arch": "x64",
                 "directory": "/home/debian/luigi",
                 "build": "node ../cnoke/cnoke.js"
             }
@@ -183,18 +171,14 @@
         }
     },
 
-    "windows": {
-        "name": "Windows",
+    "windows_x64": {
+        "name": "Windows x64",
+        "platform": "win32",
 
         "qemu": {
             "binary": "qemu-system-x86_64",
-            "arguments": ["-m", "3G", "-smp", 4, "-rtc", "clock=host,base=localtime", "-bios", "bios.bin", "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22205-:22", "-device", "e1000,netdev=mynet", "-vga", "std", "-device", "qemu-xhci", "-device", "usb-tablet", "-vnc", "127.0.0.1:15"]
-        },
-
-        "info": {
-            "version": 7,
-            "platform": "win32",
-            "arch": "x64",
+            "arguments": ["-m", "3G", "-smp", 4, "-rtc", "clock=host,base=localtime", "-bios", "bios.bin", "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22205-:22", "-device", "e1000,netdev=mynet", "-vga", "std", "-device", "qemu-xhci", "-device", "usb-tablet", "-vnc", "127.0.0.1:15"],
+            "version": 9,
 
             "ssh_port": 22205,
             "vnc_port": 5915,
@@ -208,20 +192,26 @@
         "builds": {
             "Windows i386": {
                 "arch": "ia32",
-                "directory": "C:/Users/windows/Desktop/luigi32",
+                "directory": "C:/Users/windows/Desktop/luigi_ia32",
                 "build": "C:\\Node32\\node32.cmd node ../cnoke/cnoke.js"
             },
 
             "Windows x64": {
                 "arch": "x64",
-                "directory": "C:/Users/windows/Desktop/luigi64",
+                "directory": "C:/Users/windows/Desktop/luigi_x64",
                 "build": "C:\\Node64\\node64.cmd node ../cnoke/cnoke.js"
+            },
+
+            "Windows ARM64": {
+                "arch": "arm64",
+                "directory": "C:/Users/windows/Desktop/luigi_arm64",
+                "build": "C:\\Node64\\node64.cmd node ../cnoke/cnoke.js --arch arm64 --version 16.13.0"
             }
         },
 
         "tests": {
             "Windows i386": {
-                "directory": "C:/Users/windows/Desktop/luigi32",
+                "directory": "C:/Users/windows/Desktop/luigi_ia32",
                 "build": {
                     "Build": "C:\\Node32\\node32.cmd node ../cnoke/cnoke.js -C test"
                 },
@@ -235,7 +225,7 @@
             },
 
             "Windows x64": {
-                "directory": "C:/Users/windows/Desktop/luigi64",
+                "directory": "C:/Users/windows/Desktop/luigi_x64",
                 "build": {
                     "Build": "C:\\Node64\\node64.cmd node ../cnoke/cnoke.js -C test"
                 },
@@ -252,16 +242,12 @@
 
     "freebsd_x64": {
         "name": "FreeBSD x64",
+        "platform": "freebsd",
 
         "qemu": {
             "binary": "qemu-system-x86_64",
-            "arguments": ["-m", "1G", "-smp", 2, "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22206-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:16"]
-        },
-
-        "info": {
+            "arguments": ["-m", "1G", "-smp", 2, "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22206-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:16"],
             "version": 2,
-            "platform": "freebsd",
-            "arch": "x64",
 
             "ssh_port": 22206,
             "vnc_port": 5916,
@@ -274,6 +260,7 @@
 
         "builds": {
             "FreeBSD x64": {
+                "arch": "x64",
                 "directory": "/home/freebsd/luigi",
                 "build": "node ../cnoke/cnoke.js"
             }
@@ -298,16 +285,12 @@
 
     "freebsd_i386": {
         "name": "FreeBSD i386",
+        "platform": "freebsd",
 
         "qemu": {
             "binary": "qemu-system-i386",
-            "arguments": ["-m", "1G", "-smp", 2, "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22207-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:17"]
-        },
-
-        "info": {
+            "arguments": ["-m", "1G", "-smp", 2, "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22207-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:17"],
             "version": 2,
-            "platform": "freebsd",
-            "arch": "ia32",
 
             "ssh_port": 22207,
             "vnc_port": 5917,
@@ -320,6 +303,7 @@
 
         "builds": {
             "FreeBSD i386": {
+                "arch": "ia32",
                 "directory": "/home/freebsd/luigi",
                 "build": "node ../cnoke/cnoke.js"
             }
@@ -344,16 +328,12 @@
 
     "freebsd_arm64": {
         "name": "FreeBSD ARM64",
+        "platform": "freebsd",
 
         "qemu": {
             "binary": "qemu-system-aarch64",
-            "arguments": ["-M", "virt", "-cpu", "cortex-a53", "-m", "1G", "-smp", 2, "-drive", "if=pflash,format=raw,file=QEMU_EFI.img", "-drive", "if=pflash,file=varstore.img", "-drive", "if=virtio,file=disk.qcow2,format=qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22208-:22", "-device", "virtio-net-device,netdev=mynet", "-vnc", "127.0.0.1:18"]
-        },
-
-        "info": {
+            "arguments": ["-M", "virt", "-cpu", "cortex-a53", "-m", "1G", "-smp", 2, "-drive", "if=pflash,format=raw,file=QEMU_EFI.img", "-drive", "if=pflash,file=varstore.img", "-drive", "if=virtio,file=disk.qcow2,format=qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22208-:22", "-device", "virtio-net-device,netdev=mynet", "-vnc", "127.0.0.1:18"],
             "version": 2,
-            "platform": "freebsd",
-            "arch": "arm64",
 
             "ssh_port": 22208,
             "vnc_port": 5918,
@@ -366,6 +346,7 @@
 
         "builds": {
             "FreeBSD ARM64": {
+                "arch": "arm64",
                 "directory": "/home/freebsd/luigi",
                 "build": "node ../cnoke/cnoke.js"
             }
@@ -390,16 +371,12 @@
 
     "macos_x64": {
         "name": "macOS x64",
+        "platform": "darwin",
 
         "qemu": {
             "binary": "qemu-system-x86_64",
-            "arguments": ["-m", "3G", "-machine", "q35", "-smp", 2, "-cpu", "Penryn,vendor=GenuineIntel,kvm=on,+sse3,+sse4.2,+aes,+xsave,+avx,+xsaveopt,+xsavec,+xgetbv1,+avx2,+bmi2,+smep,+bmi1,+fma,+movbe,+invtsc", "-device", "isa-applesmc,osk=ourhardworkbythesewordsguardedpleasedontsteal(c)AppleComputerInc", "-smbios", "type=2", "-drive", "if=pflash,format=raw,readonly=on,file=OVMF_CODE.fd", "-drive", "if=pflash,format=raw,file=OVMF_VARS-1024x768.fd", "-vga", "qxl", "-device", "ich9-intel-hda", "-device", "hda-output", "-usb", "-device", "usb-kbd", "-device", "usb-tablet", "-netdev", "user,id=net0,hostfwd=tcp::22209-:22", "-device", "e1000-82545em,netdev=net0,id=net0,mac=52:54:00:c9:18:27", "-device", "ich9-ahci,id=sata", "-drive", "id=ESP,if=none,format=qcow2,file=ESP.qcow2", "-device", "ide-hd,bus=sata.2,drive=ESP", "-drive", "id=SystemDisk,if=none,file=macOS.qcow2", "-device", "ide-hd,bus=sata.4,drive=SystemDisk", "-vnc", "127.0.0.1:19"]
-        },
-
-        "info": {
+            "arguments": ["-m", "3G", "-machine", "q35", "-smp", 2, "-cpu", "Penryn,vendor=GenuineIntel,kvm=on,+sse3,+sse4.2,+aes,+xsave,+avx,+xsaveopt,+xsavec,+xgetbv1,+avx2,+bmi2,+smep,+bmi1,+fma,+movbe,+invtsc", "-device", "isa-applesmc,osk=ourhardworkbythesewordsguardedpleasedontsteal(c)AppleComputerInc", "-smbios", "type=2", "-drive", "if=pflash,format=raw,readonly=on,file=OVMF_CODE.fd", "-drive", "if=pflash,format=raw,file=OVMF_VARS-1024x768.fd", "-vga", "qxl", "-device", "ich9-intel-hda", "-device", "hda-output", "-usb", "-device", "usb-kbd", "-device", "usb-tablet", "-netdev", "user,id=net0,hostfwd=tcp::22209-:22", "-device", "e1000-82545em,netdev=net0,id=net0,mac=52:54:00:c9:18:27", "-device", "ich9-ahci,id=sata", "-drive", "id=ESP,if=none,format=qcow2,file=ESP.qcow2", "-device", "ide-hd,bus=sata.2,drive=ESP", "-drive", "id=SystemDisk,if=none,file=macOS.qcow2", "-device", "ide-hd,bus=sata.4,drive=SystemDisk", "-vnc", "127.0.0.1:19"],
             "version": 2,
-            "platform": "darwin",
-            "arch": "x64",
 
             "ssh_port": 22209,
             "vnc_port": 5919,
@@ -412,6 +389,7 @@
 
         "builds": {
             "macOS x64": {
+                "arch": "x64",
                 "directory": "/Users/macos/luigi",
                 "build": "PATH=/usr/local/bin:/usr/bin:/bin SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk node ../cnoke/cnoke.js"
             }
@@ -435,16 +413,12 @@
 
     "openbsd_x64": {
         "name": "OpenBSD x64",
+        "platform": "openbsd",
 
         "qemu": {
             "binary": "qemu-system-x86_64",
-            "arguments": ["-m", "1G", "-smp", 2, "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22210-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:20"]
-        },
-
-        "info": {
+            "arguments": ["-m", "1G", "-smp", 2, "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22210-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:20"],
             "version": 1,
-            "platform": "openbsd",
-            "arch": "x64",
 
             "ssh_port": 22210,
             "vnc_port": 5920,
@@ -457,6 +431,7 @@
 
         "builds": {
             "OpenBSD x64": {
+                "arch": "x64",
                 "directory": "/home/openbsd/luigi",
                 "build": "node ../cnoke/cnoke.js"
             }
@@ -481,16 +456,12 @@
 
     "openbsd_i386": {
         "name": "OpenBSD i386",
+        "platform": "openbsd",
 
         "qemu": {
             "binary": "qemu-system-x86_64",
-            "arguments": ["-m", "1G", "-smp", 2, "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22211-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:21"]
-        },
-
-        "info": {
+            "arguments": ["-m", "1G", "-smp", 2, "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22211-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:21"],
             "version": 1,
-            "platform": "openbsd",
-            "arch": "ia32",
 
             "ssh_port": 22211,
             "vnc_port": 5921,
@@ -503,6 +474,7 @@
 
         "builds": {
             "OpenBSD i386": {
+                "arch": "ia32",
                 "directory": "/home/openbsd/luigi",
                 "build": "node ../cnoke/cnoke.js"
             }
@@ -527,16 +499,12 @@
 
     "debian_riscv64": {
         "name": "Debian RISC-V 64",
+        "platform": "linux",
 
         "qemu": {
             "binary": "qemu-system-riscv64",
-            "arguments": ["-machine", "virt", "-cpu", "rv64", "-m", "1G", "-smp", 2, "-device", "virtio-blk-device,drive=hd", "-drive", "file=disk.qcow2,if=none,id=hd", "-device", "virtio-net-device,netdev=net", "-netdev", "user,id=net,hostfwd=tcp::22212-:22", "-bios", "fw_jump.elf", "-kernel", "uboot.elf", "-append", "root=LABEL=rootfs console=ttyS0", "-vnc", "127.0.0.1:22"]
-        },
-
-        "info": {
+            "arguments": ["-machine", "virt", "-cpu", "rv64", "-m", "1G", "-smp", 2, "-device", "virtio-blk-device,drive=hd", "-drive", "file=disk.qcow2,if=none,id=hd", "-device", "virtio-net-device,netdev=net", "-netdev", "user,id=net,hostfwd=tcp::22212-:22", "-bios", "fw_jump.elf", "-kernel", "uboot.elf", "-append", "root=LABEL=rootfs console=ttyS0", "-vnc", "127.0.0.1:22"],
             "version": 1,
-            "platform": "linux",
-            "arch": "riscv64",
 
             "ssh_port": 22212,
             "vnc_port": 5912,
@@ -549,6 +517,7 @@
 
         "builds": {
             "Linux RISC-V 64": {
+                "arch": "riscv64hf64",
                 "directory": "/home/debian/luigi",
                 "build": "node ../cnoke/cnoke.js"
             }
@@ -569,5 +538,16 @@
                 }
             }
         }
+    },
+
+    "macos_arm64": {
+        "name": "macOS ARM64",
+        "platform": "darwin",
+
+        "builds": {
+            "macOS ARM64": {
+                "arch": "arm64"
+            }
+        }
     }
 }

package/qemu/registry/sha256sum.txt

@@ -1,7 +1,7 @@
-10159baf262b43a92d95db59dae1f72c645127301661e0a3ce4e38b295a97c58 *qemu/windows/VERSION
-eb30b5652a0b7962710c72cb2ba79626347eee84ebe3fc5482a93ec8b8fe8b02 *qemu/windows/install.sh
-f8c9a1638a3fc2cdd214f2cbcad6fee0e3b2c9383942bbd49b3915bb4c3da102 *qemu/windows/bios.bin
-23792b98aef4d169a9a0382a474b279d24dc0757698870f16b950f44dd7c2c2c *qemu/windows/disk.qcow2
+2e6d31a5983a91251bfae5aefa1c0a19d8ba3cf601d0e8a706b4cfa9661a6b8a *qemu/windows_x64/VERSION
+0a40f87b2a038522e55318a0abde60403bb13a5e81a7a0966a9a736e65d4ae46 *qemu/windows_x64/install.sh
+f8c9a1638a3fc2cdd214f2cbcad6fee0e3b2c9383942bbd49b3915bb4c3da102 *qemu/windows_x64/bios.bin
+0b18ced5ee9e377a04fc2ad3282ce632b39870adbeb18afe30eae4a7c19b3a44 *qemu/windows_x64/disk.qcow2
 1121cfccd5913f0a63fec40a6ffd44ea64f9dc135c66634ba001d10bcf4302a2 *qemu/debian_x64/VERSION
 ba418d2d602981fe324ae7a1a608b0f2d8d7c6113d03a429cc402e24ddc81311 *qemu/debian_x64/vmlinuz-5.10.0-12-amd64
 4d44622e8ce058017c08051d694b8e5afe9ff406b6ad91c17ebc4ec43d205c42 *qemu/debian_x64/install.sh