From: Jan Kiszka <[email protected]> No need to use the default wks file for this target which creates a bootable disk with grub. We boot this target via -kernel directly. This also makes qemuamd64 more similar to qemuarm64.
Signed-off-by: Jan Kiszka <[email protected]> --- conf/multiconfig/qemuamd64-jailhouse.conf | 2 ++ start-qemu.sh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/conf/multiconfig/qemuamd64-jailhouse.conf b/conf/multiconfig/qemuamd64-jailhouse.conf index 05de4f0..90ce8a9 100644 --- a/conf/multiconfig/qemuamd64-jailhouse.conf +++ b/conf/multiconfig/qemuamd64-jailhouse.conf @@ -14,3 +14,5 @@ require conf/multiconfig/qemuamd64-stretch.conf DISTRO = "jailhouse-demo" KERNEL_NAME = "jailhouse-amd64" + +IMAGE_TYPE = "ext4-img" diff --git a/start-qemu.sh b/start-qemu.sh index 48d9a38..37659d3 100755 --- a/start-qemu.sh +++ b/start-qemu.sh @@ -35,7 +35,7 @@ case "$1" in -device intel-hda,addr=1b.0 -device hda-duplex \ -device e1000e,addr=2.0,netdev=net" KERNEL_CMDLINE=" \ - root=/dev/sda2 intel_iommu=off memmap=82M\$0x3a000000 \ + root=/dev/sda intel_iommu=off memmap=82M\$0x3a000000 \ vga=0x305" ;; arm64|aarch64) @@ -61,7 +61,7 @@ case "$1" in esac IMAGE_BUILD_DIR="$(dirname $0)/out/" -IMAGE_FILE=$(ls ${IMAGE_BUILD_DIR}/build/tmp/deploy/images/demo-image-qemu${DISTRO_ARCH}-jailhouse-demo-qemu${DISTRO_ARCH}.*.img) +IMAGE_FILE=$(ls ${IMAGE_BUILD_DIR}/build/tmp/deploy/images/demo-image-qemu${DISTRO_ARCH}-jailhouse-demo-qemu${DISTRO_ARCH}.ext4.img) KERNEL_FILE=$(ls ${IMAGE_BUILD_DIR}/build/tmp/deploy/images/vmlinuz*_jailhouse-demo-qemu${DISTRO_ARCH} | tail -1) INITRD_FILE=$(ls ${IMAGE_BUILD_DIR}/build/tmp/deploy/images/initrd.img*_jailhouse-demo-qemu${DISTRO_ARCH} | tail -1) -- 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.
