From 646b9023407d8315440dbd1223ccf2823a191623 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 18 Jan 2023 19:56:24 -0500 Subject: Rework guest network configuration for QEMU+KVM demo Changes: - Tweak agl-qemu-runner to make network options configurable. - Add qemu-config-vmnet0 recipe that installs the required configuration files to set up a vmnet0 bridge device for QEMU to add the guests to, and to run dnsmasq against it to provide set IPs (in 172.16.10.0/8) to known MAC addresses that can be used to get the IVI and IC guests at stable IP addresses. - As part of the above, disable connman DNS proxying to avoid conflicting with dnsmasq. This does mean this package should only be used for simple host images where applications can live with less dynamic DNS configuration behavior. - Update the various guest configuration files for agl-qemu-runner to set the new QEMU_NET_OPT variable as required. Bug-AGL: SPEC-4618 Change-Id: I81d2ea9f0605a8bca7ac17d6e8f33c0b1a9f2c46 Signed-off-by: Scott Murray (cherry picked from commit 0219e6547b627f45936599fa54e02cad27dee4f4) --- recipes-extended/agl-qemu-runner/files/agl-qemu-runner.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'recipes-extended') diff --git a/recipes-extended/agl-qemu-runner/files/agl-qemu-runner.sh b/recipes-extended/agl-qemu-runner/files/agl-qemu-runner.sh index d1276473..6bf2cc4f 100755 --- a/recipes-extended/agl-qemu-runner/files/agl-qemu-runner.sh +++ b/recipes-extended/agl-qemu-runner/files/agl-qemu-runner.sh @@ -58,14 +58,13 @@ qemu-system-${arch} \ -drive id=disk0,file=${disk},format=raw,if=none \ -serial mon:pty \ -object rng-random,filename=/dev/urandom,id=rng0 \ - -netdev user,id=net-user \ -device virtio-blk-device,drive=disk0 \ - -device virtio-net-device,netdev=net-user,mac=52:54:00:12:00:02 \ -device virtio-rng-device,rng=rng0 \ + ${QEMU_NET_OPT} \ ${QEMU_INPUT_OPT} \ -global virtio-mmio.force-legacy=false \ -device virtio-gpu-gl-device \ -display sdl,gl=on -vga std \ - ${QEMU_AUDIO_OPT} \ - ${QEMU_EXTRA_OPT} \ + ${QEMU_AUDIO_OPT} \ + ${QEMU_EXTRA_OPT} \ -full-screen -- cgit 1.2.3-korg