projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
postfix: whether or not we touch main.cf is not dependent on membership in the lists...
[mirror/dsa-puppet.git]
/
modules
/
ganeti2
/
files
/
qemu-system-aarch64-wrapper
diff --git
a/modules/ganeti2/files/qemu-system-aarch64-wrapper
b/modules/ganeti2/files/qemu-system-aarch64-wrapper
index
d00d155
..
412d8b3
100755
(executable)
--- a/
modules/ganeti2/files/qemu-system-aarch64-wrapper
+++ b/
modules/ganeti2/files/qemu-system-aarch64-wrapper
@@
-11,7
+11,7
@@
##
# Default to virt machine, forcing a gic version 3 to support more than 8 vcpus
##
# Default to virt machine, forcing a gic version 3 to support more than 8 vcpus
-machine="virt
,gic-version=3
"
+machine="virt"
# We want to always enable KVM. Contrary to what the Ganeti's documentation
# says, enabling kvm_flag is not enough.
# We want to always enable KVM. Contrary to what the Ganeti's documentation
# says, enabling kvm_flag is not enough.
@@
-23,25
+23,24
@@
while [ "$1" ]; do
# Ignore the machine argument (it will be defined below),
# except when querying the list of machines
if [ "$2" = "?" ] ; then
# Ignore the machine argument (it will be defined below),
# except when querying the list of machines
if [ "$2" = "?" ] ; then
- args+=("-M")
- args+=("?")
+ machine="?"
fi
shift
;;
fi
shift
;;
- -
cpu
)
+ -
smp
)
# Check if the CPU is configured to run in 32-bit mode and
# force the gvic to version 2 in that case
args+=("$1")
args+=("$2")
# Check if the CPU is configured to run in 32-bit mode and
# force the gvic to version 2 in that case
args+=("$1")
args+=("$2")
- if
echo "$2" | egrep -q '(^|,)aarch64=off(,|$)'
; then
- machine="virt,gic-version=
2
"
+ if
test "$2" -gt 8
; then
+ machine="virt,gic-version=
3
"
fi
shift
;;
*)
# Replace PCI devices by their bus agnostic variant, and drop
# all the PCI related options
fi
shift
;;
*)
# Replace PCI devices by their bus agnostic variant, and drop
# all the PCI related options
- args+=("$(echo $1 | sed -e 's/virtio-\(\w\+\)-pci/virtio-\1-device/' -e 's/,bus=[^,]\+,addr=[^,]\+//')")
+ args+=("$(echo $1 | sed -e 's/virtio-\(\w\+\)-pci/virtio-\1-device/' -e 's/,bus=[^,]\+
//' -e 's/
,addr=[^,]\+//')")
;;
esac
shift
;;
esac
shift