Merge pull request hermit-os#747 from stlankes/aarch64

test also the virtio network interface
simonschoening · May 17, 2023 · 54cad6d · 54cad6d
2 parents 6969d70 + b5d27c1
commit 54cad6d
Showing 1 changed file with 26 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -169,10 +169,10 @@ jobs:
             -device vhost-user-fs-pci,queue-size=1024,chardev=char0,tag=root \
             -object memory-backend-file,id=mem,size=1G,mem-path=/dev/shm,share=on -numa node,memdev=mem \
             -initrd target/x86_64-unknown-hermit/release/rusty_demo
-      - name: Build httpd with DHCP support (debug profile)
+      - name: Build httpd with DHCP support (debug  )
         run:
           cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --package httpd --features ci,dhcpv4
-      - name: Test httpd with DHCP support (debug profile)
+      - name: Test httpd with DHCP support (debug, rtl8139)
         run: |
           qemu-system-x86_64 -smp 1 -cpu qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr,rdrand \
             -device isa-debug-exit,iobase=0xf4,iosize=0x04 -display none -m 128M -serial stdio \
@@ -183,10 +183,21 @@ jobs:
             sleep 5
             curl http://127.0.0.1:9975/help
             sleep 1
-      - name: Build httpd with DHCP support (release profile)
+      - name: Test httpd with DHCP support (debug, virtio-net)
+        run: |
+          qemu-system-x86_64 -smp 1 -cpu qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr,rdrand \
+            -device isa-debug-exit,iobase=0xf4,iosize=0x04 -display none -m 512M -serial stdio \
+            -kernel rusty-loader-x86_64 \
+            -initrd target/x86_64-unknown-hermit/debug/httpd \
+            -netdev user,id=u1,hostfwd=tcp::9975-:9975,net=192.168.76.0/24,dhcpstart=192.168.76.9 \
+            -device virtio-net-pci,netdev=u1,disable-legacy=on &
+            sleep 5
+            curl http://127.0.0.1:9975/help
+            sleep 1
+      - name: Build httpd with DHCP support (release)
         run:
           cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --package httpd --release --features ci,dhcpv4
-      - name: Test httpd with DHCP support (release profile)
+      - name: Test httpd with DHCP support (release, rtl8139)
         run: |
           qemu-system-x86_64 -smp 1 -cpu qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr,rdrand \
             -device isa-debug-exit,iobase=0xf4,iosize=0x04 -display none -m 128M -serial stdio \
@@ -197,6 +208,17 @@ jobs:
             sleep 5
             curl http://127.0.0.1:9975/help
             sleep 1
+      - name: Test httpd with DHCP support (release, virtio-net)
+        run: |
+          qemu-system-x86_64 -smp 1 -cpu qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr,rdrand \
+            -device isa-debug-exit,iobase=0xf4,iosize=0x04 -display none -m 512M -serial stdio \
+            -kernel rusty-loader-x86_64 \
+            -initrd target/x86_64-unknown-hermit/release/httpd \
+            -netdev user,id=u1,hostfwd=tcp::9975-:9975,net=192.168.76.0/24,dhcpstart=192.168.76.9 \
+            -device virtio-net-pci,netdev=u1,disable-legacy=on &
+            sleep 5
+            curl http://127.0.0.1:9975/help
+            sleep 1
       - name: Build minimal profile
         run: cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --no-default-features --release --package hello_world
       - name: Test minimal profile