From f5a94fd31ea9e4eb2bd3ed975b60009e6451bd93 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Fri, 8 Apr 2022 15:25:18 -0400 Subject: [PATCH] qemuarm64: use virtio pci interfaces The virtio PCI devices seemed to be required for this machine for some versions of qemu (based on errors from running qemu saying that the devices don't exist). Changes to the entries here is all that is needed to get it working. (From OE-Core rev: 291940f12c319e74351ff97811919c8c03477c27) Signed-off-by: Jon Mason Signed-off-by: Richard Purdie (cherry picked from commit 217deeb43036d1a046d6c5ea2c1ccdb94d3d605a) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/conf/machine/qemuarm64.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf index f245152168..ffc51c803f 100644 --- a/meta/conf/machine/qemuarm64.conf +++ b/meta/conf/machine/qemuarm64.conf @@ -23,9 +23,9 @@ QB_GRAPHICS = "-device virtio-gpu-pci" QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" # Virtio Networking support QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" -QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" +QB_NETWORK_DEVICE = "-device virtio-net-pci,netdev=net0,mac=@MAC@" # Virtio block device -QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0" +QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-pci,drive=disk0" # Virtio serial console -QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon" -QB_TCPSERIAL_OPT = "-device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" +QB_SERIAL_OPT = "-device virtio-serial-pci -chardev null,id=virtcon -device virtconsole,chardev=virtcon" +QB_TCPSERIAL_OPT = "-device virtio-serial-pci -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon"