From 3f110ccc3b888d66f7489fd29b1220891fd4fddb Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 5 Feb 2020 13:42:53 +0000 Subject: Switch to virtio-net-pci --- run-qemu | 2 +- sub/kernel/qemu-system-aarch64-config | 3 +-- sub/kernel/qemu-system-arm-config | 3 +-- sub/kernel/qemu-system-x86_64-config | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/run-qemu b/run-qemu index e3c8aa8..13cf9cf 100755 --- a/run-qemu +++ b/run-qemu @@ -17,4 +17,4 @@ exec qemu-system-${QEMU_ARCH} -nographic $cpuoption -smp 4 -m 2G -nodefaults -di -drive if=virtio,file=$OUTPUT/rwfs.qcow2,format=qcow2,media=disk,index=2 \ -drive if=virtio,file=$OUTPUT/userfs.qcow2,format=qcow2,media=disk,index=3 \ -netdev user,id=eth0,hostfwd=::2222-10.0.2.1:22 \ - -device virtio-net-device,netdev=eth0 + -device virtio-net-pci,netdev=eth0 diff --git a/sub/kernel/qemu-system-aarch64-config b/sub/kernel/qemu-system-aarch64-config index 36b07ad..f05d1fb 100644 --- a/sub/kernel/qemu-system-aarch64-config +++ b/sub/kernel/qemu-system-aarch64-config @@ -1455,8 +1455,7 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTIO_BALLOON=m -CONFIG_VIRTIO_MMIO=m -# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set +# CONFIG_VIRTIO_MMIO is not set # # Microsoft Hyper-V guest support diff --git a/sub/kernel/qemu-system-arm-config b/sub/kernel/qemu-system-arm-config index 5807941..9260a21 100644 --- a/sub/kernel/qemu-system-arm-config +++ b/sub/kernel/qemu-system-arm-config @@ -1421,8 +1421,7 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTIO_BALLOON=m -CONFIG_VIRTIO_MMIO=m -# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set +# CONFIG_VIRTIO_MMIO is not set # # Microsoft Hyper-V guest support diff --git a/sub/kernel/qemu-system-x86_64-config b/sub/kernel/qemu-system-x86_64-config index f3beb47..ab044bc 100644 --- a/sub/kernel/qemu-system-x86_64-config +++ b/sub/kernel/qemu-system-x86_64-config @@ -1561,8 +1561,7 @@ CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTIO_BALLOON=m # CONFIG_VIRTIO_INPUT is not set -CONFIG_VIRTIO_MMIO=m -# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set +# CONFIG_VIRTIO_MMIO is not set # # Microsoft Hyper-V guest support -- cgit v1.3.1