Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

qemu: does not use --disable-static for qemu 2.11 #12

Merged
merged 1 commit into from
Mar 28, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions scripts/configure-hypervisor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down