From adb33a4121882d6b61eea5db6a22513a9116e8c2 Mon Sep 17 00:00:00 2001 From: Bin Liu Date: Wed, 14 Sep 2022 11:38:01 +0800 Subject: [PATCH] packaging: fix typo in configure-hypervisor.sh `powwer` is a typo of `power`, and many spaces should be replaced by tabs for indent. Fixes: #5160 Signed-off-by: Bin Liu --- .../packaging/scripts/configure-hypervisor.sh | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tools/packaging/scripts/configure-hypervisor.sh b/tools/packaging/scripts/configure-hypervisor.sh index e1e17ef014..04a48c72d5 100755 --- a/tools/packaging/scripts/configure-hypervisor.sh +++ b/tools/packaging/scripts/configure-hypervisor.sh @@ -324,20 +324,20 @@ generate_qemu_options() { # enabled. # # From Kata Containers 2.5.0-alpha2 all arches but powerpc have been - # using the new implementation of virtiofs daemon, which is not part - # of QEMU. - # For the powwer, at least for now, keep building virtiofsd while + # using the new implementation of virtiofs daemon, which is not part + # of QEMU. + # For the power, at least for now, keep building virtiofsd while # building QEMU. case "$arch" in aarch64) - ;; + ;; x86_64) - ;; + ;; ppc64le) - qemu_options+=(functionality:--enable-virtiofsd) - ;; + qemu_options+=(functionality:--enable-virtiofsd) + ;; s390x) - ;; + ;; esac 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 # for that architecture if [ "$arch" == x86_64 ]; then - qemu_options+=(speed:--enable-avx2) - qemu_options+=(speed:--enable-avx512f) - # According to QEMU's nvdimm documentation: When 'pmem' is 'on' and QEMU is - # built with libpmem support, QEMU will take necessary operations to guarantee - # the persistence of its own writes to the vNVDIMM backend. - qemu_options+=(functionality:--enable-libpmem) + qemu_options+=(speed:--enable-avx2) + qemu_options+=(speed:--enable-avx512f) + # According to QEMU's nvdimm documentation: When 'pmem' is 'on' and QEMU is + # built with libpmem support, QEMU will take necessary operations to guarantee + # the persistence of its own writes to the vNVDIMM backend. + qemu_options+=(functionality:--enable-libpmem) else - qemu_options+=(speed:--disable-avx2) - qemu_options+=(functionality:--disable-libpmem) + qemu_options+=(speed:--disable-avx2) + qemu_options+=(functionality:--disable-libpmem) fi # Enable libc malloc_trim() for memory optimization. qemu_options+=(speed:--enable-malloc-trim) @@ -541,7 +541,7 @@ main() { die "cannot determine qemu version from file $qemu_version_file" if ! gt_eq "${qemu_version}" "6.1.0" ; then - die "Kata requires QEMU >= 6.1.0" + die "Kata requires QEMU >= 6.1.0" fi local gcc_version_major=$(gcc -dumpversion | cut -f1 -d.)