Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tux qemu device names #205

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Tux qemu device names #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e05427c
devices: add qemu-* devices
roxell Jul 27, 2022
adfb6e6
projects: lkft: devices: add qemu-* devices
roxell Jul 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions devices/qemu-arm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
qemu_arm64
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

replace qemu_arm64 with qemu_arm

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, its a symlink.

1 change: 1 addition & 0 deletions devices/qemu-arm64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
qemu_arm64
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do you want to change the file name with _
devices/qemu_arm64 ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here its a symlink

1 change: 1 addition & 0 deletions devices/qemu-i386
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
qemu_i386
1 change: 1 addition & 0 deletions devices/qemu-x86_64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
qemu_x86_64
2 changes: 1 addition & 1 deletion devices/qemu_arm64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
arch: arm64
netdevice: tap
machine: {{ GS_MACHINE }}
cpu: {{ QEMU_CPU_VARIABLES }}{% if DEVICE_TYPE == 'qemu_arm' %},aarch64=off{% endif %}
cpu: {{ QEMU_CPU_VARIABLES }}{% if DEVICE_TYPE == 'qemu_arm' or DEVICE_TYPE == 'qemu-arm' %},aarch64=off{% endif %}
guestfs_size: {{ guestfs_size|default(512) }}
{% endblock global_settings %}

Expand Down
1 change: 1 addition & 0 deletions projects/lkft/devices/qemu-arm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
qemu_arm64
1 change: 1 addition & 0 deletions projects/lkft/devices/qemu-arm64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
qemu_arm64
1 change: 1 addition & 0 deletions projects/lkft/devices/qemu-i386
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
qemu_i386
1 change: 1 addition & 0 deletions projects/lkft/devices/qemu-x86_64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
qemu_x86_64
4 changes: 2 additions & 2 deletions projects/lkft/devices/qemu_arm64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "devices/qemu_arm64" %}
{% extends "devices/qemu-arm64" %}

{% set ROOTFS_URL_FORMAT = ROOTFS_URL_FORMAT|default("ext4") %}
{% set OVERLAY_KSELFTEST_URL_FORMAT = OVERLAY_KSELFTEST_URL_FORMAT|default("tar") %}
Expand All @@ -7,7 +7,7 @@
{% set OVERLAY_MODULES_URL_COMP = OVERLAY_MODULES_URL_COMP|default("xz") %}
{% set OVERLAY_PERF_URL_FORMAT = OVERLAY_PERF_URL_FORMAT|default("tar") %}
{% set OVERLAY_PERF_URL_COMP = OVERLAY_PERF_URL_COMP|default("xz") %}
{% if DEVICE_TYPE == 'qemu_arm' %}
{% if DEVICE_TYPE == 'qemu_arm' or DEVICE_TYPE == 'qemu-arm' %}
{% set GS_MACHINE = "virt-2.10,accel=kvm" %}
{% else %}
{% set QEMU_CPU_VARIABLES = QEMU_CPU_VARIABLES|default("max,pauth-impdef=on") %}
Expand Down
2 changes: 1 addition & 1 deletion projects/lkft/devices/qemu_i386
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "devices/qemu_i386" %}
{% extends "devices/qemu-i386" %}

{% set ROOTFS_URL_FORMAT = ROOTFS_URL_FORMAT|default("ext4") %}
{% set OVERLAY_CPUPOWER_URL_FORMAT = OVERLAY_CPUPOWER_URL_FORMAT|default("tar") %}
Expand Down
2 changes: 1 addition & 1 deletion projects/lkft/devices/qemu_x86_64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "devices/qemu_x86_64" %}
{% extends "devices/qemu-x86_64" %}

{% set ROOTFS_URL_FORMAT = ROOTFS_URL_FORMAT|default("ext4") %}
{% set OVERLAY_CPUPOWER_URL_FORMAT = OVERLAY_CPUPOWER_URL_FORMAT|default("tar") %}
Expand Down
2 changes: 1 addition & 1 deletion projects/lkft/qemu.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% include PROJECT+"include/metadata.jinja2" %}
{% endblock metadata %}

{% if DEVICE_TYPE == 'qemu_arm' %}
{% if DEVICE_TYPE == 'qemu_arm' or DEVICE_TYPE == 'qemu-arm' %}
{# libhugetlbfs_word_size variable is required for libhugetlbfs.yaml test template #}
{% set libhuggetlbfs_word_size = 32 %}
{% set AUTO_LOGIN_PROMPT = AUTO_LOGIN_PROMPT|default("am57xx-evm login:") %}
Expand Down