github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-24 14:32:33 +00:00
Code Issues Projects Releases Wiki Activity

qemu: does not use unsupported flags for qemu 2.11

Browse Source 
Qemu 2.11 does not support --disable-static flag and
--enable-strip flag, this patch adds a condition
to only use it for qemu 2.7 or older.

Fixes: #11.

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
This commit is contained in:
Salvador Fuentes 2018-03-28 16:06:26 -06:00
parent 2118e5f74b
commit fb59a2b966
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/configure-hypervisor.sh
View File

@ -268,8 +268,11 @@ main()
# Disable TCG support
qemu_options+=(size:--disable-tcg)
# Don't build a static binary (lowers security)
qemu_options+=(security:--disable-static)
# SECURITY: Don't build a static binary (lowers security)
# needed if qemu version is less than 2.7
if [ ${qemu_version_major} -eq 2 ] && [ ${qemu_version_minor} -lt 7 ]; then
qemu_options+=(--disable-static)
fi
# Not required as "-uuid ..." is always passed to the qemu binary
qemu_options+=(size:--disable-uuid)
@ -309,7 +312,10 @@ main()
qemu_options+=(speed:--enable-vhost-net)
# Always strip binaries
qemu_options+=(size:--enable-strip)
# needed if qemu version is less than 2.7
if [ ${qemu_version_major} -eq 2 ] && [ ${qemu_version_minor} -lt 7 ]; then
qemu_options+=(--enable-strip)
fi
# Support Ceph RADOS Block Device (RBD)
qemu_options+=(functionality:--enable-rbd)