diff options
| author |   Corentin LABBE <clabbe@baylibre.com> | 2020-04-24 14:21:44 +0200 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-05-04 16:12:06 +0000 |
| commit | acf5aa2e36816d6cc2bddec375e095f064341390 (patch) | |
| tree | 7ea8e0ce3706a092b2b4ab1fa9cf0e1de6eb92e9 | |
| parent | df4a57e5964a612cf5c6c509926658e827dd99ae (diff) | |
qemu-arm: fix the qemu virt version
With recent qemu, the ARM virt machine hit:
pci-host-generic 4010000000.pcie: can't claim ECAM area
[mem 0x10000000-0x1fffffff]: address conflict with pcie@10000000 [mem 0x10000000-0x3efeffff]
pci-host-generic: probe of 4010000000.pcie failed with error -16
Without the PCI working, the storage for tests cannot work.
So let's fix to the last version of the vmachine which work without
kernel hacking.
This patch should not be merged until LAVA 2020.02 since stretch qemu does not support virt-2.11
Change-Id: Ifbb352a491cf917c45d48e0f88af20c146ca5422
Bug-AGL: SPEC-3210
Signed-off-by: Corentin LABBE <clabbe@baylibre.com>
| -rw-r--r-- | templates/machines/qemuarm.jinja2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/machines/qemuarm.jinja2 b/templates/machines/qemuarm.jinja2 index 3949f48..7e0b904 100644 --- a/templates/machines/qemuarm.jinja2 +++ b/templates/machines/qemuarm.jinja2 @@ -7,7 +7,7 @@ {%- set device_mach = "arm" %} {%- set qemu_arch = "arm" %} {%- set qemu_cpu = "cortex-a15" %} -{%- set qemu_machine = "virt" %} +{%- set qemu_machine = "virt-2.11" %} {%- set qemu_memory = "2048" %} {%- set qemu_args = "-soundhw hda -device usb-ehci -device virtio-rng-pci" %} {%- set qemu_cmdline = "console=ttyAMA0,115200 root=/dev/vda verbose systemd.log_color=false " %} |