diff options
| author |   Corentin LABBE <clabbe@baylibre.com> | 2020-10-13 07:35:05 +0200 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-10-13 11:56:28 +0000 |
| commit | 36d9df857024a1c254305bf7f06714ee0148f33e (patch) | |
| tree | 4baea86ad590c45bdd7538e320b7bd901fccaee9 | |
| parent | 5280722c7d07a3cef3ac016b2d1031a076528fd1 (diff) | |
SPEC-3631: Add network to qemu
qemu machines does not have a network card by default.
So let's add one.
Change-Id: I6ea5d5625ee5c24b5ee49652f1aa838580a6f952
Bug-AGL: SPEC-3631
Signed-off-by: Corentin LABBE <clabbe@baylibre.com>
(cherry picked from commit bc944019a9f558454ede39b95e5da39fca0c81f8)
| -rw-r--r-- | templates/boot/generic-qemu-tmpfs.jinja2 | 3 | ||||
| -rw-r--r-- | templates/machines/qemuarm.jinja2 | 1 | ||||
| -rw-r--r-- | templates/machines/qemuarm64.jinja2 | 1 | ||||
| -rw-r--r-- | templates/machines/qemux86-64.jinja2 | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/templates/boot/generic-qemu-tmpfs.jinja2 b/templates/boot/generic-qemu-tmpfs.jinja2 index ef8273a..a5e842a 100644 --- a/templates/boot/generic-qemu-tmpfs.jinja2 +++ b/templates/boot/generic-qemu-tmpfs.jinja2 @@ -21,6 +21,9 @@ context: {%- if qemu_memory is defined %} memory: {{ qemu_memory }} {%- endif %} +{%- if qemu_model is defined %} + model: {{ qemu_model }} +{%- endif %} {%- if guestfs_interface is defined %} guestfs_interface: {{ guestfs_interface }} {%- endif %} diff --git a/templates/machines/qemuarm.jinja2 b/templates/machines/qemuarm.jinja2 index 624986a..1cde86d 100644 --- a/templates/machines/qemuarm.jinja2 +++ b/templates/machines/qemuarm.jinja2 @@ -6,6 +6,7 @@ {%- set sdk_arch = "arm" %} {%- set device_mach = "arm" %} {%- set qemu_arch = "arm" %} +{%- set qemu_model = "model=virtio" %} {%- set qemu_cpu = "cortex-a15" %} {%- set qemu_machine = "virt-2.11" %} {%- set qemu_memory = "2048" %} diff --git a/templates/machines/qemuarm64.jinja2 b/templates/machines/qemuarm64.jinja2 index 0e280eb..73e13c2 100644 --- a/templates/machines/qemuarm64.jinja2 +++ b/templates/machines/qemuarm64.jinja2 @@ -6,6 +6,7 @@ {%- set sdk_arch = "aarch64" %} {%- set device_mach = "arm64" %} {%- set qemu_arch = "aarch64" %} +{%- set qemu_model = "model=virtio" %} {%- set qemu_cpu = "cortex-a57" %} {%- set qemu_machine = "virt" %} {%- set qemu_memory = "2048" %} diff --git a/templates/machines/qemux86-64.jinja2 b/templates/machines/qemux86-64.jinja2 index fc4609d..74b3915 100644 --- a/templates/machines/qemux86-64.jinja2 +++ b/templates/machines/qemux86-64.jinja2 @@ -6,6 +6,7 @@ {%- set sdk_arch = "x86-64" %} {%- set device_mach = "x86" %} {%- set qemu_arch = "x86_64" %} +{%- set qemu_model = "model=virtio" %} {%- 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 -device qemu-xhci -device usb-tablet -device usb-kbd " %} {%- 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") %} |