From 1ad90875736c55ccd38852fd22b4fbddc815cb1a Mon Sep 17 00:00:00 2001 From: Jim Cromie Date: Mon, 16 Jan 2023 15:10:21 -0700 Subject: [PATCH 1/2] fixup warnings about -watchdog In newer qemu -watchdog draws a warning and suggestion. This change seems to properly follow the advice and silence the thing. Its about 3 months old, Ive been using it w/o issues. Signed-off-by: Jim Cromie --- virtme/architectures.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virtme/architectures.py b/virtme/architectures.py index ba16138..941186a 100644 --- a/virtme/architectures.py +++ b/virtme/architectures.py @@ -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. From d056695a142ecf03ad63c5f24fe4c76dbc6edbd3 Mon Sep 17 00:00:00 2001 From: Jim Cromie Date: Mon, 16 Jan 2023 15:14:09 -0700 Subject: [PATCH 2/2] fixup for modules.order containing *.o's As of: v6.1-rc6-24-gf65a486821cf virtme-run --kdir $builddir is broken. The cause is: commit f65a486821cfd363833079b2a7b0769250ee21c9 (HEAD) Author: Masahiro Yamada Date: Sun Dec 11 22:04:07 2022 +0900 kbuild: change module.order to list *.o instead of *.ko scripts/Makefile.build replaces the suffix .o with .ko, then scripts/Makefile.modpost calls the sed command to change .ko back to the original .o suffix. Instead of converting the suffixes back-and-forth, store the .o paths in modules.order, and replace it with .ko in 'make modules_install'. This avoids the unneeded sed command. Signed-off-by: Masahiro Yamada Reviewed-by: Luis Chamberlain virtme-prep-kdir-mod is expecting *.ko's, and is now getting *.o's. It does the copying, but the *.o's arent loadable. Fix with another shell-var and a parameter substitution on it. This will also work for kernels before the cited patch, which already have the ko's Signed-off-by: Jim Cromie -- v1 - used sed, now uses bash parameter substitution wo forking. --- bin/virtme-prep-kdir-mods | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/virtme-prep-kdir-mods b/bin/virtme-prep-kdir-mods index dd80ad5..a58be12 100755 --- a/bin/virtme-prep-kdir-mods +++ b/bin/virtme-prep-kdir-mods @@ -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"