Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/examples.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
env:
MICROKIT_VERSION: 2.3.0
MICROKIT_URL: https://github.com/seL4/microkit/releases/download/2.3.0/
SDFGEN_VERSION: 0.33.0
SDFGEN_VERSION: 0.35.0

jobs:
build_examples_linux_x86_64:
Expand Down
2 changes: 1 addition & 1 deletion dep/libvmm
Submodule libvmm updated 53 files
+1 −1 .github/workflows/ci.yaml
+1 −0 .reuse/dep5
+3 −1 ci/matrix.py
+1 −1 ci/test_groups.json
+2 −2 ci/tests/virtio_net_wget.py
+112 −0 ci/tests/vswitch.py
+1 −1 dep/sddf
+2 −0 examples/rust/README.md
+4 −0 examples/simple/README.md
+21 −2 examples/simple/vmm.c
+4 −0 examples/smp/README.md
+6 −0 examples/uefi/README.md
+21 −2 examples/uefi/vmm.c
+7 −5 examples/virtio_mmio/README.md
+10 −1 examples/virtio_mmio/client_vmm.c
+1 −1 examples/virtio_mmio/meta.py
+7 −5 examples/virtio_pci/README.md
+2 −1 examples/virtio_pci/client_vm/aarch64/guest_arch_init.c
+22 −3 examples/virtio_pci/client_vm/x86_64/guest_arch_init.c
+8 −0 examples/virtio_pci/guest_arch_init.h
+1 −1 examples/virtio_pci/meta.py
+0 −1 examples/virtio_pci/virtio_pci.mk
+0 −19 examples/virtio_vswitch/client_vm/gic_v2_overlay.dts
+0 −17 examples/virtio_vswitch/client_vm/gic_v3_overlay.dts
+0 −151 examples/virtio_vswitch/client_vmm.c
+0 −179 examples/virtio_vswitch/meta.py
+3 −14 examples/vswitch/Makefile
+138 −0 examples/vswitch/README.md
+47 −0 examples/vswitch/client_vm/aarch64/gic_v2_overlay.dts
+46 −0 examples/vswitch/client_vm/aarch64/gic_v3_overlay.dts
+124 −0 examples/vswitch/client_vm/aarch64/guest_arch_init.c
+0 −12 examples/vswitch/client_vm/aarch64/linux.dts
+145 −0 examples/vswitch/client_vm/x86_64/guest_arch_init.c
+58 −0 examples/vswitch/client_vm/x86_64/vswitch_dsdt.dsl
+97 −0 examples/vswitch/client_vmm.c
+ examples/vswitch/docs/arch_diagram.png
+ examples/vswitch/docs/bootup.png
+ examples/vswitch/docs/example_1.png
+ examples/vswitch/docs/example_2.png
+17 −0 examples/vswitch/guest_arch_init.h
+276 −0 examples/vswitch/meta.py
+77 −17 examples/vswitch/vswitch.mk
+4 −4 flake.lock
+1 −1 flake.nix
+2 −0 include/libvmm/arch/x86_64/apic.h
+30 −3 include/libvmm/arch/x86_64/cpuid.h
+2 −0 include/libvmm/util/util.h
+8 −2 include/libvmm/virtio/net.h
+1 −0 src/arch/aarch64/vgic/vgic_v3.c
+12 −12 src/arch/x86_64/cpuid.c
+2 −0 src/arch/x86_64/msr.c
+32 −0 src/util/util.c
+23 −15 src/virtio/net.c
2 changes: 1 addition & 1 deletion examples/fileio/meta.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from importlib.metadata import version
from board import BOARDS

assert version('sdfgen').split(".")[1] == "33", "Unexpected sdfgen version"
assert version('sdfgen').split(".")[1] == "35", "Unexpected sdfgen version"

ProtectionDomain = SystemDescription.ProtectionDomain
MemoryRegion = SystemDescription.MemoryRegion
Expand Down
2 changes: 1 addition & 1 deletion examples/firewall/meta.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

from sdfgen import SystemDescription, Sddf, DeviceTree

assert version("sdfgen").split(".")[1] == "33", "Unexpected sdfgen version"
assert version("sdfgen").split(".")[1] == "35", "Unexpected sdfgen version"

from typing import List
from pyfw.memory_layout import (
Expand Down
2 changes: 1 addition & 1 deletion examples/kitty/meta.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from importlib.metadata import version
from board import BOARDS

assert version('sdfgen').split(".")[1] == "33", "Unexpected sdfgen version"
assert version('sdfgen').split(".")[1] == "35", "Unexpected sdfgen version"

ProtectionDomain = SystemDescription.ProtectionDomain
VirtualMachine = SystemDescription.VirtualMachine
Expand Down
2 changes: 1 addition & 1 deletion examples/posix_test/meta.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from importlib.metadata import version
from board import BOARDS

assert version("sdfgen").split(".")[1] == "33", "Unexpected sdfgen version"
assert version("sdfgen").split(".")[1] == "35", "Unexpected sdfgen version"

ProtectionDomain = SystemDescription.ProtectionDomain
MemoryRegion = SystemDescription.MemoryRegion
Expand Down
2 changes: 1 addition & 1 deletion examples/wasm_test/meta.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from importlib.metadata import version
from board import BOARDS

assert version("sdfgen").split(".")[1] == "33", "Unexpected sdfgen version"
assert version("sdfgen").split(".")[1] == "35", "Unexpected sdfgen version"

ProtectionDomain = SystemDescription.ProtectionDomain
MemoryRegion = SystemDescription.MemoryRegion
Expand Down
2 changes: 1 addition & 1 deletion examples/webserver/meta.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from importlib.metadata import version
from board import BOARDS

assert version('sdfgen').split(".")[1] == "33", "Unexpected sdfgen version"
assert version('sdfgen').split(".")[1] == "35", "Unexpected sdfgen version"

ProtectionDomain = SystemDescription.ProtectionDomain
MemoryRegion = SystemDescription.MemoryRegion
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
zig-overlay.url = "github:mitchellh/zig-overlay";
sdfgen.url = "github:au-ts/microkit_sdf_gen/0.33.0";
sdfgen.url = "github:au-ts/microkit_sdf_gen/0.35.0";
sdfgen.inputs.nixpkgs.follows = "nixpkgs";
};

Expand Down
Loading