diff --git a/packages/dhall/genode.nix b/packages/dhall/genode.nix
index 423e716..f6c4181 100644
--- a/packages/dhall/genode.nix
+++ b/packages/dhall/genode.nix
@@ -8,8 +8,8 @@ dhallPackages.buildDhallPackage {
code = let
src = fetchgit {
url = "https://git.sr.ht/~ehmry/dhall-genode";
- rev = "aecb2db8b23421addb57aa29cfc17d9c4601b6e5";
- sha256 = "17wv761fmbk6wzjjrlzj4lb2lazl5p95izni000xf7lra5xllilq";
+ rev = "b9630af18be8956562ffba026f7bfc3b55b093b1";
+ sha256 = "072w6g3561qnhfw2j721584c6ds9bw4f9xq1j5ggj3p0fhf5yp5z";
};
in src + "/package.dhall";
diff --git a/tests/posix.dhall b/tests/posix.dhall
index 9d48af3..5ede4bb 100644
--- a/tests/posix.dhall
+++ b/tests/posix.dhall
@@ -35,9 +35,11 @@ in λ(params : { bash : Text, coreutils : Text, script : Text })
-
''
]
+ , defaultPolicy = Some Init.Config.DefaultPolicy::{
+ , attributes = toMap { root = "/", writeable = "yes" }
+ }
}
, provides = [ "File_system" ]
, resources = Genode.Init.Resources::{
diff --git a/tests/solo5/net.dhall b/tests/solo5/net.dhall
index 66db1d9..78f4755 100644
--- a/tests/solo5/net.dhall
+++ b/tests/solo5/net.dhall
@@ -32,13 +32,15 @@ let init =
, routes = [ ServiceRoute.child "Nic" "nic" ]
, config = Init.Config::{
, attributes = toMap { mac = "02:02:02:02:03:00" }
- , content =
- [ Genode.Prelude.XML.text
- ''
-
-
- ''
+ , policies =
+ [ Init.Config.Policy::{
+ , attributes = toMap { ip_addr = "10.0.0.2" }
+ , label =
+ Init.LabelSelector.Type.Partial
+ { prefix = Some "solo5", suffix = None Text }
+ }
]
+ , defaultPolicy = Some Init.Config.DefaultPolicy::{=}
}
}
, solo5 =
diff --git a/tests/solo5/net_2if.dhall b/tests/solo5/net_2if.dhall
index 5d15724..9b5d1d8 100644
--- a/tests/solo5/net_2if.dhall
+++ b/tests/solo5/net_2if.dhall
@@ -29,13 +29,18 @@ let init =
, provides = [ "Nic" ]
, routes = [ Genode.Init.ServiceRoute.child "Nic" "nic" ]
, config = Init.Config::{
- , content =
- [ Genode.Prelude.XML.text
- ''
-
-
-
- ''
+ , defaultPolicy = Some Init.Config.DefaultPolicy::{=}
+ , policies =
+ [ Init.Config.Policy::{
+ , attributes = toMap { ip_addr = "10.0.0.2" }
+ , label =
+ Init.LabelSelector.Type.Scoped "solo5 -> service0"
+ }
+ , Init.Config.Policy::{
+ , attributes = toMap { ip_addr = "10.1.0.2" }
+ , label =
+ Init.LabelSelector.Type.Scoped "solo5 -> service1"
+ }
]
}
}
diff --git a/tests/test-wrapper.dhall b/tests/test-wrapper.dhall
index aa16440..27b76f8 100644
--- a/tests/test-wrapper.dhall
+++ b/tests/test-wrapper.dhall
@@ -129,11 +129,10 @@ in λ(test : Test.Type)
}
]
}
- , XML.leaf
- { name = "default-policy"
- , attributes = toMap { root = "/", writeable = "no" }
- }
]
+ , defaultPolicy = Some Init.Config.DefaultPolicy::{
+ , attributes = toMap { root = "/", writeable = "no" }
+ }
}
, provides = [ "File_system" ]
}
diff --git a/tests/vmm_arm.dhall b/tests/vmm_arm.dhall
index 869e9ef..1495962 100644
--- a/tests/vmm_arm.dhall
+++ b/tests/vmm_arm.dhall
@@ -22,11 +22,7 @@ in λ(guest : { linux : Text, dtb : Text, initrd : Text })
, binary = "nic_router"
, config = Init.Config::{
, content =
- [ XML.leaf
- { name = "default-policy"
- , attributes = toMap { domain = "default" }
- }
- , XML.element
+ [ XML.element
{ name = "domain"
, attributes = toMap
{ name = "default"
@@ -43,6 +39,9 @@ in λ(guest : { linux : Text, dtb : Text, initrd : Text })
]
}
]
+ , defaultPolicy = Some Init.Config.Policy::{
+ , attributes = toMap { domain = "default" }
+ }
}
, provides = [ "Nic" ]
, resources = Init.Resources::{ ram = Genode.units.MiB 8 }
diff --git a/tests/x86.dhall b/tests/x86.dhall
index 7b1b7ae..7516273 100644
--- a/tests/x86.dhall
+++ b/tests/x86.dhall
@@ -76,11 +76,16 @@ let pciInit =
, ServiceRoute.parent "IO_PORT"
]
, config = Init.Config::{
- , content =
- [ XML.text
- ''
-
- ''
+ , policies =
+ [ Init.Config.Policy::{
+ , content =
+ [ XML.leaf
+ { name = "pci"
+ , attributes = toMap { class = "ALL" }
+ }
+ ]
+ , label = Init.LabelSelector.Type.Scoped "test-pci"
+ }
]
}
}