github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-02 17:34:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5161 from liubin/fix/5160-typo-in-configure-hypervisor-sh

Browse Source 
packaging: fix typo in configure-hypervisor.sh
This commit is contained in:
Bin Liu
2022-09-27 13:03:39 +08:00
committed by GitHub
parent 407e46b1b7 adb33a4121
commit 41a3bd87a5
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tools/packaging/scripts/configure-hypervisor.sh
View File

@@ -324,20 +324,20 @@ generate_qemu_options() {
# enabled. # enabled.
# #
# From Kata Containers 2.5.0-alpha2 all arches but powerpc have been # From Kata Containers 2.5.0-alpha2 all arches but powerpc have been
# using the new implementation of virtiofs daemon, which is not part # using the new implementation of virtiofs daemon, which is not part
# of QEMU. # of QEMU.
# For the powwer, at least for now, keep building virtiofsd while # For the power, at least for now, keep building virtiofsd while
# building QEMU. # building QEMU.
case "$arch" in case "$arch" in
aarch64) aarch64)
;; ;;
x86_64) x86_64)
;; ;;
ppc64le) ppc64le)
qemu_options+=(functionality:--enable-virtiofsd) qemu_options+=(functionality:--enable-virtiofsd)
;; ;;
s390x) s390x)
;; ;;
esac esac
qemu_options+=(functionality:--enable-virtfs) qemu_options+=(functionality:--enable-virtfs)
@@ -417,15 +417,15 @@ generate_qemu_options() {
# AVX2 is enabled by default by x86_64, make sure it's enabled only # AVX2 is enabled by default by x86_64, make sure it's enabled only
# for that architecture # for that architecture
if [ "$arch" == x86_64 ]; then if [ "$arch" == x86_64 ]; then
qemu_options+=(speed:--enable-avx2) qemu_options+=(speed:--enable-avx2)
qemu_options+=(speed:--enable-avx512f) qemu_options+=(speed:--enable-avx512f)
# According to QEMU's nvdimm documentation: When 'pmem' is 'on' and QEMU is # According to QEMU's nvdimm documentation: When 'pmem' is 'on' and QEMU is
# built with libpmem support, QEMU will take necessary operations to guarantee # built with libpmem support, QEMU will take necessary operations to guarantee
# the persistence of its own writes to the vNVDIMM backend. # the persistence of its own writes to the vNVDIMM backend.
qemu_options+=(functionality:--enable-libpmem) qemu_options+=(functionality:--enable-libpmem)
else else
qemu_options+=(speed:--disable-avx2) qemu_options+=(speed:--disable-avx2)
qemu_options+=(functionality:--disable-libpmem) qemu_options+=(functionality:--disable-libpmem)
fi fi
# Enable libc malloc_trim() for memory optimization. # Enable libc malloc_trim() for memory optimization.
qemu_options+=(speed:--enable-malloc-trim) qemu_options+=(speed:--enable-malloc-trim)
@@ -541,7 +541,7 @@ main() {
die "cannot determine qemu version from file $qemu_version_file" die "cannot determine qemu version from file $qemu_version_file"
if ! gt_eq "${qemu_version}" "6.1.0" ; then if ! gt_eq "${qemu_version}" "6.1.0" ; then
die "Kata requires QEMU >= 6.1.0" die "Kata requires QEMU >= 6.1.0"
fi fi
local gcc_version_major=$(gcc -dumpversion | cut -f1 -d.) local gcc_version_major=$(gcc -dumpversion | cut -f1 -d.)