diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2017-05-16 09:05:28 +0200 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2017-05-16 09:06:22 +0200 |
| commit | 4fdaed4d6bff1f17a4de5634672005f40b9237fd (patch) | |
| tree | 806d3f75ce62847488f3f5eea2cee04f14d8ffab /configs | |
| parent | eb96760f6b7eb4430acc56f7da94362cbb772b5e (diff) | |
| download | DistroKit-4fdaed4d6bff1f17a4de5634672005f40b9237fd.tar.gz DistroKit-4fdaed4d6bff1f17a4de5634672005f40b9237fd.tar.xz | |
platform-v7a: change run script to use new qemu network definition
The old vlan=... variant is deprecated with qemu 2.9.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'configs')
| -rwxr-xr-x | configs/platform-v7a/run | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configs/platform-v7a/run b/configs/platform-v7a/run index 613b340..5cfe8bf 100755 --- a/configs/platform-v7a/run +++ b/configs/platform-v7a/run @@ -52,13 +52,13 @@ fi if [ -n "${VDE_SOCKET}" ]; then # make sure qemu supports vde networking if ${QEMU_EXEC} --help | grep -q -- '-net.*vde'; then - QEMU_NET=( -net vde,vlan=1,sock=${VDE_SOCKET} ) + QEMU_NET=( -netdev vde,id=net1,sock=${VDE_SOCKET} ) fi fi # fall back to user network if necessary if [ -z "${QEMU_NET}" ]; then - QEMU_NET=(-net user,vlan=1,hostfwd=tcp:127.0.0.1:${TELNET_EXTERNAL_PORT}-:${TELNET_INTERNAL_PORT} ) + QEMU_NET=(-netdev user,id=net1,hostfwd=tcp:127.0.0.1:${TELNET_EXTERNAL_PORT}-:${TELNET_INTERNAL_PORT} ) fi BASE_CMDLINE="console=ttyAMA0,115200 loglevel=5 systemd.log_level=warning systemd.show_status=auto" @@ -70,7 +70,7 @@ QEMU_ARGS[${#QEMU_ARGS[@]}]="-nographic" # Exit qemu on reboot QEMU_ARGS[${#QEMU_ARGS[@]}]="-no-reboot" # Configure networking -QEMU_ARGS=( "${QEMU_ARGS[@]}" -net nic,vlan=1 "${QEMU_NET[@]}" ) +QEMU_ARGS=( "${QEMU_ARGS[@]}" -net nic,netdev=net1 "${QEMU_NET[@]}" ) # Set base time to test NTP and time handling QEMU_ARGS=( "${QEMU_ARGS[@]}" -rtc base=2000-01-01 ) # Configure watchdog |