From: Yi Sun <yi.sun@intel.com>
To: yi.sun@linux.intel.com, yi.sun@intel.com, kvm@vger.kernel.org
Subject: [kvm-unit-tests PATCH RESEND v3 1/2] x86: Build ISO images from x86/*.elf
Date: Tue, 7 Dec 2021 17:44:31 +0800 [thread overview]
Message-ID: <20211207094432.189576-2-yi.sun@intel.com> (raw)
In-Reply-To: <20211207094432.189576-1-yi.sun@intel.com>
Make use of tool grub-mkresure to wrap x86/*.elf in ISO images.
VMM could load test cases just like a CD-ROM, which could
extend usage of those cases.
Refine Makefile to clean *.iso when running 'make clean'.
Signed-off-by: Yi Sun <yi.sun@intel.com>
diff --git a/lib/grub/grub.cfg b/lib/grub/grub.cfg
new file mode 100644
index 0000000..b287cf4
--- /dev/null
+++ b/lib/grub/grub.cfg
@@ -0,0 +1,7 @@
+set timeout=0
+set default=0
+
+menuentry "my os" {
+ multiboot /boot/kernel.bin
+ boot
+}
diff --git a/x86/Makefile.common b/x86/Makefile.common
index 461de51..99a2706 100644
--- a/x86/Makefile.common
+++ b/x86/Makefile.common
@@ -50,6 +50,22 @@ FLATLIBS = lib/libcflat.a
$(OBJCOPY) -O elf32-i386 $^ $@
@chmod a-x $@
+grub_cfg := lib/grub/grub.cfg
+
+elf_files := $(wildcard ./x86/*.elf)
+iso_files := $(patsubst %.elf,%.iso,$(elf_files))
+
+%.iso: %.elf
+ @echo "Creating ISO for case: $(notdir $<)"
+ @rm -rf build/isofiles
+ @mkdir -p build/isofiles/boot/grub
+ @cp $< build/isofiles/boot/kernel.bin
+ @cp $(grub_cfg) build/isofiles/boot/grub
+ @grub-mkrescue -o $@ build/isofiles 2> /dev/null
+
+iso: $(iso_files)
+ echo "All ISO created successfully!"
+
tests-common = $(TEST_DIR)/vmexit.flat $(TEST_DIR)/tsc.flat \
$(TEST_DIR)/smptest.flat \
$(TEST_DIR)/realmode.flat $(TEST_DIR)/msr.flat \
@@ -85,5 +101,5 @@ $(TEST_DIR)/hyperv_stimer.elf: $(TEST_DIR)/hyperv.o
$(TEST_DIR)/hyperv_connections.elf: $(TEST_DIR)/hyperv.o
arch_clean:
- $(RM) $(TEST_DIR)/*.o $(TEST_DIR)/*.flat $(TEST_DIR)/*.elf \
+ $(RM) $(TEST_DIR)/*.o $(TEST_DIR)/*.flat $(TEST_DIR)/*.elf $(TEST_DIR)/*.iso \
$(TEST_DIR)/.*.d lib/x86/.*.d \
--
2.27.0
next prev parent reply other threads:[~2021-12-07 9:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-07 9:44 [kvm-unit-tests PATCH RESEND v3 0/2] Wrap EFL binaries into ISO images Yi Sun
2021-12-07 9:44 ` Yi Sun [this message]
2021-12-07 9:44 ` [kvm-unit-tests PATCH RESEND v3 2/2] x86: Create ISO images according to unittests.cfg Yi Sun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211207094432.189576-2-yi.sun@intel.com \
--to=yi.sun@intel.com \
--cc=kvm@vger.kernel.org \
--cc=yi.sun@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox