Skip to content

Fix minor bootstrap-managarm bugs #440

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

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

Fix minor bootstrap-managarm bugs #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8259f39
app-emulation: enable SLIRP in host QEMU
pitust Jan 20, 2025
c76b33c
vm-util: only set migratable=no on x86_64 platforms
pitust Jan 20, 2025
b7d3b9f
dockerfile: use mdbook targetting the correct architecture
pitust Jan 20, 2025
6022f93
app-emulation: Bump revision
pitust Jan 20, 2025
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
3 changes: 2 additions & 1 deletion bootstrap.d/app-emulation.y4.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tools:
architecture: noarch
containerless: true
from_source: qemu
revision: 1
revision: 2
configure:
- args:
- '@THIS_SOURCE_DIR@/configure'
Expand All @@ -24,6 +24,7 @@ tools:
- '--enable-gtk'
- '--enable-sdl'
- '--enable-trace-backends=log'
- '--enable-slirp'
Copy link
Copy Markdown
Member

@no92 no92 Jan 20, 2025

Choose a reason for hiding this comment

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

This seems wrong - meson auto-detects libslirp without needing this flag. It only ever gets disabled when it's not present.

Copy link
Copy Markdown
Member

@no92 no92 Jan 20, 2025

Choose a reason for hiding this comment

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

Also, changing configure flags requires a revbump.

Copy link
Copy Markdown
Author

@pitust pitust Jan 20, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

This seems wrong - meson auto-detects libslirp without needing this flag. It only ever gets disabled when it's not present.

Weird, it didn't detect it for me (and this fixed it). libslirp is a subproject of qemu, though, so I suspect it's fetched automatically if you ask for it.

Also, changing configure flags requires a revbump.

Done.

environ:
CFLAGS: '-Wno-int-conversion'
compile:
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ RUN pip3 install --break-system-packages meson \

# Install mdbook.
RUN cd /root && \
wget -O mdbook.tar.gz https://github.com/rust-lang/mdBook/releases/download/v0.3.7/mdbook-v0.3.7-x86_64-unknown-linux-gnu.tar.gz && \
wget -O mdbook.tar.gz https://github.com/rust-lang/mdBook/releases/download/v0.4.43/mdbook-v0.4.43-$(uname -m)-unknown-linux-musl.tar.gz && \
tar xf mdbook.tar.gz && \
install -D mdbook /usr/local/bin/mdbook

Expand Down
4 changes: 3 additions & 1 deletion scripts/vm-util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,12 +290,14 @@ def do_qemu(args):
qemu_args += ["-debugcon", "stdio"]

cpu_extras = []
cpu_model = "host,migratable=no"
cpu_model = "host"

if args.arch == "x86_64":
if not have_kvm or args.virtual_cpu:
cpu_model = "qemu64"
cpu_extras = ["+smap", "+smep", "+umip", "+pcid", "+invpcid"]
else:
cpu_model = "host,migratable=no"
elif args.arch == "aarch64":
if not have_kvm or args.virtual_cpu:
cpu_model = "cortex-a72"
Expand Down