From 5ae8ad3316e52f7faa018aa408dc606edeabbb34 Mon Sep 17 00:00:00 2001 From: Christopher Clark Date: Tue, 31 Aug 2021 16:27:40 -0700 Subject: [PATCH] xen-image-minimal: supply bootloader config for qemux86-64 machine Add a dedicated bootloader config for the qemux86-64 machine so that the 'pmtmr=0' kernel command line argument can be provided, which removes an error message that otherwise occurs in syslog during boot which is detected by an OEQA test case causing it to fail. A new kickstart file is provided that applies the new bootloader config and it is supplied as an override to WKS_FILE for this image. This is work towards enabling the Xen Test Framework (XTF) in the OEQA testimage framework. Signed-off-by: Christopher Clark Signed-off-by: Bruce Ashfield --- recipes-extended/images/xen-image-minimal.bb | 1 + wic/qemuboot-xen-x86-64.cfg | 8 ++++++++ wic/qemuboot-xen-x86-64.wks | 12 ++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 wic/qemuboot-xen-x86-64.cfg create mode 100644 wic/qemuboot-xen-x86-64.wks diff --git a/recipes-extended/images/xen-image-minimal.bb b/recipes-extended/images/xen-image-minimal.bb index b4ddda2f..fbdd007b 100644 --- a/recipes-extended/images/xen-image-minimal.bb +++ b/recipes-extended/images/xen-image-minimal.bb @@ -74,6 +74,7 @@ build_syslinux_cfg () { # Enable runqemu. eg: runqemu xen-image-minimal nographic slirp WKS_FILE:x86-64 = "directdisk-xen.wks" +WKS_FILE:qemux86-64 = "qemuboot-xen-x86-64.wks" QB_MEM ?= "-m 400" QB_DEFAULT_KERNEL ?= "none" QB_DEFAULT_FSTYPE ?= "wic" diff --git a/wic/qemuboot-xen-x86-64.cfg b/wic/qemuboot-xen-x86-64.cfg new file mode 100644 index 00000000..297e19b2 --- /dev/null +++ b/wic/qemuboot-xen-x86-64.cfg @@ -0,0 +1,8 @@ +DEFAULT boot +TIMEOUT 0 +PROMPT 0 +SERIAL 0 115200 + +LABEL boot + KERNEL mboot.c32 + APPEND /xen.gz console=com1,vga com1=115200,8n1 loglvl=all guest_loglvl=all --- /vmlinuz console=hvc0 earlyprintk=xen root=/dev/sda2 pmtmr=0 diff --git a/wic/qemuboot-xen-x86-64.wks b/wic/qemuboot-xen-x86-64.wks new file mode 100644 index 00000000..593e0a66 --- /dev/null +++ b/wic/qemuboot-xen-x86-64.wks @@ -0,0 +1,12 @@ +# short-description: Create a 'pcbios' direct disk image with Xen hypervisor and bootloader config +# long-description: Creates a partitioned legacy BIOS disk image to boot Xen +# with a bootloader config that the user can directly dd to boot media. +# Boot files are located on the first vfat partition. + +part /boot --source bootimg-biosxen --ondisk sda --label boot --active --align 1024 + +# For the main partition, it can be useful to add additional space for VMs; +# eg. increase partition size by appending: --size 10G +part / --source rootfs --ondisk sda --use-uuid --fstype=ext4 --label root --align 1024 + +bootloader --configfile="qemuboot-xen-x86-64.cfg"