From: Jan Kiszka <[email protected]> This allows to drop the no longer needed config files and all related logic. All target images now work with this release.
With Jailhouse 0.10, the qemuarm64 target was grown to 16 CPUs, so adjust our starter script accordingly. Signed-off-by: Jan Kiszka <[email protected]> --- conf/distro/jailhouse-demo.conf | 2 +- images.list | 4 ++-- recipes-jailhouse/jailhouse/files/orangepi-zero_config.h | 1 - recipes-jailhouse/jailhouse/files/qemuarm64_config.h | 1 - recipes-jailhouse/jailhouse/files/x86-64_config.h | 1 - recipes-jailhouse/jailhouse/jailhouse.inc | 14 +------------- .../jailhouse/{jailhouse_0.9.1.bb => jailhouse_0.10.bb} | 2 +- start-qemu.sh | 4 +++- 8 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 recipes-jailhouse/jailhouse/files/orangepi-zero_config.h delete mode 100644 recipes-jailhouse/jailhouse/files/qemuarm64_config.h delete mode 100644 recipes-jailhouse/jailhouse/files/x86-64_config.h rename recipes-jailhouse/jailhouse/{jailhouse_0.9.1.bb => jailhouse_0.10.bb} (79%) diff --git a/conf/distro/jailhouse-demo.conf b/conf/distro/jailhouse-demo.conf index 489f629..3300154 100644 --- a/conf/distro/jailhouse-demo.conf +++ b/conf/distro/jailhouse-demo.conf @@ -15,4 +15,4 @@ IMAGE_PREINSTALL += "init" KERNEL_NAME = "jailhouse-${DISTRO_ARCH}" -PREFERRED_VERSION_jailhouse ?= "0.9.1" +PREFERRED_VERSION_jailhouse ?= "0.10" diff --git a/images.list b/images.list index 267c9e8..6613567 100644 --- a/images.list +++ b/images.list @@ -1,5 +1,5 @@ qemuamd64 QEMU/KVM Intel-x86 virtual target qemuarm64 QEMU ARM64 virtual target orangepi-zero Orange Pi Zero (256 MB edition) -nuc6cay Intel NUC (NUC6CAY, 8 GB RAM) [requires '--latest'] -espressobin Marvell ESPRESSObin (1 GB edition) [requires '--latest'] +nuc6cay Intel NUC (NUC6CAY, 8 GB RAM) +espressobin Marvell ESPRESSObin (1 GB edition) diff --git a/recipes-jailhouse/jailhouse/files/orangepi-zero_config.h b/recipes-jailhouse/jailhouse/files/orangepi-zero_config.h deleted file mode 100644 index a87a6ce..0000000 --- a/recipes-jailhouse/jailhouse/files/orangepi-zero_config.h +++ /dev/null @@ -1 +0,0 @@ -#define CONFIG_MACH_ORANGEPI0 1 diff --git a/recipes-jailhouse/jailhouse/files/qemuarm64_config.h b/recipes-jailhouse/jailhouse/files/qemuarm64_config.h deleted file mode 100644 index cdaa500..0000000 --- a/recipes-jailhouse/jailhouse/files/qemuarm64_config.h +++ /dev/null @@ -1 +0,0 @@ -#define CONFIG_MACH_QEMU_ARM64 1 diff --git a/recipes-jailhouse/jailhouse/files/x86-64_config.h b/recipes-jailhouse/jailhouse/files/x86-64_config.h deleted file mode 100644 index 40a8c17..0000000 --- a/recipes-jailhouse/jailhouse/files/x86-64_config.h +++ /dev/null @@ -1 +0,0 @@ -/* empty */ diff --git a/recipes-jailhouse/jailhouse/jailhouse.inc b/recipes-jailhouse/jailhouse/jailhouse.inc index 89e1eb5..c7a15b2 100644 --- a/recipes-jailhouse/jailhouse/jailhouse.inc +++ b/recipes-jailhouse/jailhouse/jailhouse.inc @@ -9,24 +9,13 @@ # SPDX-License-Identifier: GPL-2.0 # -python() { - machine = d.getVar('MACHINE', True) - if machine in ['qemuamd64', 'nuc6cay']: - machine = 'x86-64' - # only work with --latest where configs became obsolete - if machine == 'espressobin': - machine = 'qemuarm64' - d.setVar('JAILHOUSE_CONFIG', machine + '_config.h') -} - DESCRIPTION = "Jailhouse partitioning hypervisor" LICENSE = "GPL-2.0 & BSD-2-clause" SRC_URI = " \ git://github.com/siemens/jailhouse;branch=next \ - file://debian/ \ - file://${JAILHOUSE_CONFIG}" + file://debian/" S = "${WORKDIR}/git" @@ -40,7 +29,6 @@ do_prepare_build() { # Install device trees only on non-x86 archs as they only exist there echo "configs{,/*}/dts/*.dtb etc/jailhouse/dts" >> ${S}/debian/jailhouse.install fi - cp ${WORKDIR}/${JAILHOUSE_CONFIG} ${S}/include/jailhouse/config.h sed -i 's/@PV@/${PV}/' ${S}/debian/changelog sed -i 's/@KERNEL_NAME@/${KERNEL_NAME}/' ${S}/debian/control } diff --git a/recipes-jailhouse/jailhouse/jailhouse_0.9.1.bb b/recipes-jailhouse/jailhouse/jailhouse_0.10.bb similarity index 79% rename from recipes-jailhouse/jailhouse/jailhouse_0.9.1.bb rename to recipes-jailhouse/jailhouse/jailhouse_0.10.bb index c2cdf8b..71540ee 100644 --- a/recipes-jailhouse/jailhouse/jailhouse_0.9.1.bb +++ b/recipes-jailhouse/jailhouse/jailhouse_0.10.bb @@ -11,4 +11,4 @@ require jailhouse.inc -SRCREV = "c2327d42887795a57163680a82b947fcb5e4a7d3" +SRCREV = "f596aa7355bc2134650544bdf1e13f1f55d3f2fc" diff --git a/start-qemu.sh b/start-qemu.sh index 37659d3..f4f5132 100755 --- a/start-qemu.sh +++ b/start-qemu.sh @@ -28,6 +28,7 @@ case "$1" in QEMU=qemu-system-x86_64 QEMU_EXTRA_ARGS=" \ -cpu kvm64,-kvm_pv_eoi,-kvm_steal_time,-kvm_asyncpf,-kvmclock,+vmx,+arat \ + -smp 4 \ -enable-kvm -machine q35,kernel_irqchip=split \ -serial vc \ -device ide-hd,drive=disk \ @@ -43,6 +44,7 @@ case "$1" in QEMU=qemu-system-aarch64 QEMU_EXTRA_ARGS=" \ -cpu cortex-a57 \ + -smp 16 \ -machine virt,gic-version=3,virtualization=on \ -device virtio-serial-device \ -device virtconsole,chardev=con -chardev vc,id=con \ @@ -70,6 +72,6 @@ shift 1 ${QEMU_PATH}${QEMU} \ -drive file=${IMAGE_FILE},discard=unmap,if=none,id=disk,format=raw \ - -m 1G -smp 4 -serial mon:stdio -netdev user,id=net \ + -m 1G -serial mon:stdio -netdev user,id=net \ -kernel ${KERNEL_FILE} -append "${KERNEL_CMDLINE}" \ -initrd ${INITRD_FILE} ${QEMU_EXTRA_ARGS} "$@" -- 2.16.4 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
