diff --git a/run/remote_rom_backend_nic_ip.run b/run/remote_rom_backend_nic_ip.run index 6e26b92..bda0c15 100644 --- a/run/remote_rom_backend_nic_ip.run +++ b/run/remote_rom_backend_nic_ip.run @@ -2,7 +2,7 @@ # Build # -build { core init drivers/timer +set build_components { core init drivers/timer server/dynamic_rom proxy/remote_rom/backend/nic_ip app/rom_logger @@ -10,6 +10,11 @@ build { core init drivers/timer server/nic_bridge } +source ${genode_dir}/repos/base/run/platform_drv.inc +append_platform_drv_build_components + +build $build_components + create_boot_directory # @@ -98,6 +103,7 @@ install_config { + @@ -118,15 +124,18 @@ install_config { # Boot image # -build_boot_image { core ld.lib.so init timer +append boot_modules { core ld.lib.so init timer remote_rom_server remote_rom_client dynamic_rom rom_logger - nic_drv + } [nic_drv_binary] { nic_bridge } +append_platform_drv_boot_modules +build_boot_image $boot_modules + append qemu_args " -nographic " run_genode_until {.*change \(finished\).*} 30 diff --git a/run/remote_rom_backend_nic_ip_client.run b/run/remote_rom_backend_nic_ip_client.run index 507f27f..100947c 100644 --- a/run/remote_rom_backend_nic_ip_client.run +++ b/run/remote_rom_backend_nic_ip_client.run @@ -2,12 +2,17 @@ # Build # -build { core init drivers/timer +set build_components { core init drivers/timer app/rom_logger proxy/remote_rom/backend/nic_ip/client drivers/nic } +source ${genode_dir}/repos/base/run/platform_drv.inc +append_platform_drv_build_components + +build $build_components + create_boot_directory # @@ -52,6 +57,7 @@ install_config { + @@ -64,12 +70,15 @@ install_config { # Boot image # -build_boot_image { core ld.lib.so init timer +append boot_modules { core ld.lib.so init timer remote_rom_client rom_logger - nic_drv + } [nic_drv_binary] { } +append_platform_drv_boot_modules +build_boot_image $boot_modules + append qemu_args " -nographic " append qemu_args " -net tap,ifname=tap2 " diff --git a/run/remote_rom_backend_nic_ip_server.run b/run/remote_rom_backend_nic_ip_server.run index bb9b0f5..5a6eff3 100644 --- a/run/remote_rom_backend_nic_ip_server.run +++ b/run/remote_rom_backend_nic_ip_server.run @@ -2,12 +2,17 @@ # Build # -build { core init drivers/timer +set build_components { core init drivers/timer server/dynamic_rom proxy/remote_rom/backend/nic_ip/server drivers/nic } +source ${genode_dir}/repos/base/run/platform_drv.inc +append_platform_drv_build_components + +build $build_components + create_boot_directory # @@ -66,6 +71,7 @@ install_config { + @@ -78,12 +84,15 @@ install_config { # Boot image # -build_boot_image { core ld.lib.so init timer +append boot_modules { core ld.lib.so init timer remote_rom_server dynamic_rom - nic_drv + } [nic_drv_binary] { } +append_platform_drv_boot_modules +build_boot_image $boot_modules + append qemu_args " -nographic " append qemu_args " -net tap,ifname=tap2 " diff --git a/src/lib/remote_rom/backend/nic_ip/backend.cc b/src/lib/remote_rom/backend/nic_ip/backend.cc index 48e5dad..84a297b 100644 --- a/src/lib/remote_rom/backend/nic_ip/backend.cc +++ b/src/lib/remote_rom/backend/nic_ip/backend.cc @@ -128,7 +128,7 @@ class Remote_rom::Packet_base : public Ethernet_frame, public Ipv4_packet { Ethernet_frame::src(src); Ethernet_frame::dst(dst); - Ethernet_frame::type(IPV4); + Ethernet_frame::type(Ethernet_frame::Type::IPV4); } void prepare_ipv4(const Ipv4_address &src, const Ipv4_address &dst=Ipv4_packet::BROADCAST)