github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-25 03:34:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1296 from ijc25/q35-and-kvm

Browse Source 
qemu: Enable KVM support and switch to Q35
This commit is contained in:
Justin Cormack 2017-03-13 15:55:16 +00:00 committed by GitHub
commit 1a80011a4c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/qemu.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
QEMU_IMAGE=mobylinux/qemu:2e63db70759e37de6f9cc5cdf67c15f3aa8373c8@sha256:958c6bb1fca426cadf7a3664b8c019eba9f9e2ad4f6b4f3ed02d766fe5e709e4 QEMU_IMAGE=mobylinux/qemu:97973fb6721778c639676812ccb8bc3332e0a542@sha256:c08dac641a75fda3232a8ff3250f23d743aeac12aa4db02ec7926a42b79b0e69
# if not interactive # if not interactive
if [ ! -t 0 -a -z "$1" ] if [ ! -t 0 -a -z "$1" ]
@ -29,8 +29,11 @@ then
echo "$FILE2" | grep -q '^/' || FILE2="$PWD/$FILE2" echo "$FILE2" | grep -q '^/' || FILE2="$PWD/$FILE2"
fi fi
if [ -c "/dev/kvm" ] ; then
DEVKVM="--device=/dev/kvm"
fi
BASE=$(basename "$FILE") BASE=$(basename "$FILE")
MOUNTS="-v $FILE:/tmp/$BASE" MOUNTS="-v $FILE:/tmp/$BASE"
BASE2=$(basename "$FILE2") BASE2=$(basename "$FILE2")
[ ! -z "$FILE2" ] && MOUNTS="$MOUNTS -v $FILE2:/tmp/$BASE2" [ ! -z "$FILE2" ] && MOUNTS="$MOUNTS -v $FILE2:/tmp/$BASE2"
docker run -it --rm $MOUNTS "$QEMU_IMAGE" $CMDLINE docker run -it --rm $MOUNTS $DEVKVM "$QEMU_IMAGE" $CMDLINE

2
tools/qemu/qemu.sh
View File

@ -44,4 +44,4 @@ then
CMDLINE="console=ttyS0" CMDLINE="console=ttyS0"
fi fi
qemu-system-x86_64 -device virtio-rng-pci -serial stdio -vnc none -m 1024 -append "${CMDLINE}" $ARGS qemu-system-x86_64 -machine q35,accel=kvm:tcg -device virtio-rng-pci -serial stdio -vnc none -m 1024 -append "${CMDLINE}" $ARGS