Skip to content

2 Fixes: for modules.order containing *.o's, -watchdog #89

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
jimc wants to merge 2 commits into
base: master
Choose a base branch
from
Open

2 Fixes: for modules.order containing *.o's, -watchdog #89

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
1ad9087
fixup warnings about -watchdog
jimc Jan 16, 2023
d056695
fixup for modules.order containing *.o's
jimc Jan 16, 2023
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 bin/virtme-prep-kdir-mods
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ ln -srfT . "$MODDIR/build"
# Remove all preexisting symlinks and add symlinks to all modules that belong
# to the build kenrnel.
find "$MODDIR/kernel" -type l -print0 |xargs -0 rm -f --
while read -r i; do
while read -r in; do
i=${in/%\.o/.ko}
[ ! -e "$i" ] && i=$(echo "$i" | sed s:^kernel/::)
mkdir -p "$MODDIR/kernel/$(dirname "$i")"
ln -sr "$i" "$MODDIR/kernel/$i"
Expand Down
2 changes: 1 addition & 1 deletion virtme/architectures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def qemuargs(is_native):
ret = Arch.qemuargs(is_native)

# Add a watchdog. This is useful for testing.
ret.extend(['-watchdog', 'i6300esb'])
ret.extend(['-device', 'i6300esb', '-watchdog-action', 'pause'])

if is_native and os.access('/dev/kvm', os.R_OK):
# If we're likely to use KVM, request a full-featured CPU.
Expand Down