summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2020-02-05 13:42:53 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2020-02-05 13:42:53 +0000
commit3f110ccc3b888d66f7489fd29b1220891fd4fddb (patch)
tree534d8d206acf3ad33ff7e527789105f0c84af008
parent7c5752df5d7b7f952529ced3b03a74abe1c926f3 (diff)
downloadlh-bootstrap-3f110ccc3b888d66f7489fd29b1220891fd4fddb.tar.xz
Switch to virtio-net-pci
-rwxr-xr-xrun-qemu2
-rw-r--r--sub/kernel/qemu-system-aarch64-config3
-rw-r--r--sub/kernel/qemu-system-arm-config3
-rw-r--r--sub/kernel/qemu-system-x86_64-config3
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