Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update BuiltinDevices.java

Browse Source 
Use buildroot bootfs
This commit is contained in:
Jackson Abney
2025-04-10 19:39:42 -08:00
committed by GitHub
parent 694110f1c3
commit fb5cd8e60b
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/li/cil/oc2/common/vm/BuiltinDevices.java
View File

@@ -51,14 +51,9 @@ public final class BuiltinDevices {
uart = initialize(context, new UART16550A(), UART_INTERRUPT, UART16550A::getInterrupt);
vfs = initialize(context, new VirtIOFileSystemDevice(context.getMemoryMap(), "builtin", FileSystems.getLayeredFileSystem()), VFS_INTERRUPT, VirtIOFileSystemDevice::getInterrupt);
InputStream ris = Buildroot.getRootFilesystem();
InputStream bis = Buildroot.getBootFilesystem();
try {
var bfsd = FileSystems.getBlockByName("bootfs");
if (bfsd != null) {
bfs = initialize(context, new VirtIOBlockDevice(context.getMemoryMap(), bfsd.getBlockDevice()), BFS_INTERRUPT, VirtIOBlockDevice::getInterrupt);
}
else {
bfs = null;
}
bfs = initialize(context, new VirtIOBlockDevice(context.getMemoryMap(), ByteBufferBlockDevice.createFromStream(bis, true)), BFS_INTERRUPT, VirtIOBlockDevice::getInterrupt);
rfs = initialize(context, new VirtIOBlockDevice(context.getMemoryMap(), ByteBufferBlockDevice.createFromStream(ris, true)), RFS_INTERRUPT, VirtIOBlockDevice::getInterrupt);
}
catch(final IOException e) {