diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-09-25 21:54:07 +0200 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-09-25 20:32:01 +0000 |
| commit | 1336c3d2f132dbefc156ccc8e261062048fa295c (patch) | |
| tree | 23257e6cc200dc2c5af2157f1908797f587b4896 /templates | |
| parent | c02b0727e98f4346333adc108753154c8d382408 (diff) | |
Update qemu machine to use q35 on x86
This fits what we do when calling runqemu.
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: Ic5ffa2f2a65b5b55c820063300171cc31d3d878c
(cherry picked from commit d766b5ab6ca2268260bb6bf04509789e1f845764)
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/machines/qemux86-64.jinja2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/machines/qemux86-64.jinja2 b/templates/machines/qemux86-64.jinja2 index 8bea92c..5641172 100644 --- a/templates/machines/qemux86-64.jinja2 +++ b/templates/machines/qemux86-64.jinja2 @@ -6,8 +6,8 @@ {%- set sdk_arch = "x86-64" %} {%- set device_mach = "x86" %} {%- set qemu_arch = "x86_64" %} -{%- set qemu_args = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt -smp 2 -m 2048 -soundhw hda -device usb-ehci -device virtio-rng-pci -vga virtio" %} -{%- set qemu_cmdline = "console=ttyS0,115200 root=/dev/hda verbose systemd.log_color=false rw fstab=no no_timer_check" %} +{%- set qemu_args = "-machine q35 -cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt -smp 2 -m 2048 -soundhw hda -device usb-ehci -device virtio-rng-pci -vga virtio" %} +{%- set qemu_cmdline = "console=ttyS0,115200 root=/dev/sda verbose systemd.log_color=false rw fstab=no no_timer_check" %} {%- set rootfs_type = rootfs_type|default("rootvd") %} {%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') or (build_type == 'prerelease') %} {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-qemux86-64.ext4.xz") %} |