From 318d718724da1b8f9671d84b0a42ca2b10a4b6a2 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 24 Oct 2019 12:08:04 +0200 Subject: [PATCH] Configure QEMU with q35 machine model --- tests/driver-nova.nix | 2 +- tests/pci.dhall | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/driver-nova.nix b/tests/driver-nova.nix index 52ee08e..6978ec2 100644 --- a/tests/driver-nova.nix +++ b/tests/driver-nova.nix @@ -93,7 +93,7 @@ let global spawn_id spawn ${hostPkgs.qemu}/bin/qemu-system-x86_64 -cdrom ${iso} -nographic \ - -M pc -m size=${toString qemuMem} + -machine q35 -m size=${toString qemuMem} wait_for_output $wait_for_re $timeout_value $spawn_id } diff --git a/tests/pci.dhall b/tests/pci.dhall index 28b1028..1adbc45 100644 --- a/tests/pci.dhall +++ b/tests/pci.dhall @@ -53,5 +53,12 @@ in λ ( _ (Some "acpi") (None Text) ] + , config = + Genode.Prelude.XML.text + '' + + + + '' } }