aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-26 19:22:19 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-27 09:26:49 +0000
commit18ca1ba6b3a85c40c7eab9dc0e32c80032941184 (patch)
treeead0e2256ba21837c102c838e6df293b61174311
parentc75ba4b14bf2b5f2b21ebc8705e2e4e60746f960 (diff)
AArch64: Switch jumpserver VMs to virtio video
Drop vgabios dependency by switching video from VGA to virtio for all VMs spawned on the jumpserver. NOTE: This requires virtualization packages on the jumpserver to be up to date (e.g. libvirt, QEMU). JIRA: ARMBAND-306 Change-Id: I73913e1ae8584f4e73b92994f78f7ec363cba3ec Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit d058675b9a4274336ae3497914d6651f653ccde0)
-rwxr-xr-xci/deploy.sh6
-rw-r--r--mcp/scripts/lib.sh4
2 files changed, 2 insertions, 8 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 3699bf966..8882cb9c2 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -269,12 +269,6 @@ pushd "${DEPLOY_DIR}" > /dev/null
[ -n "$(command -v yum)" ] && sudo yum install -y --skip-broken \
git make rsync genisoimage curl virt-install qemu-kvm
-if [ "$(uname -i)" = "aarch64" ]; then
- [ -n "$(command -v apt-get)" ] && sudo apt-get install -y vgabios && \
- sudo ln -sf /usr/share/vgabios/vgabios.bin /usr/share/qemu/vgabios-stdvga.bin
- [ -n "$(command -v yum)" ] && sudo yum install -y --skip-broken vgabios
-fi
-
# Clone git submodules and apply our patches
make -C "${REPO_ROOT_PATH}/mcp/patches" deepclean patches-import
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index a165bb367..b8991534b 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -97,8 +97,8 @@ function create_vms {
# AArch64: prepare arch specific arguments
local virt_extra_args=""
if [ "$(uname -i)" = "aarch64" ]; then
- # No Cirrus VGA on AArch64, use vga std
- virt_extra_args="$virt_extra_args --video=vga"
+ # No Cirrus VGA on AArch64, use virtio instead
+ virt_extra_args="$virt_extra_args --video=virtio"
fi
# create vms with specified options