AIR/quickemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up status messages

Browse Source
This commit is contained in:
Martin Wimpress 2021-10-19 02:17:23 +01:00
parent 91f2abdeab
commit 380451df4c
No known key found for this signature in database
GPG Key ID: 61DF940515E06DA3
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
quickemu
View File

@ -165,7 +165,6 @@ function vm_boot() {
local MOUSE="usb-tablet" local MOUSE="usb-tablet"
local NET_DEVICE="virtio-net" local NET_DEVICE="virtio-net"
local OSK="" local OSK=""
local QEMU_VER=""
local USB_HOST_PASSTHROUGH_CONTROLLER="qemu-xhci" local USB_HOST_PASSTHROUGH_CONTROLLER="qemu-xhci"
local VIDEO="" local VIDEO=""
@ -177,9 +176,9 @@ function vm_boot() {
LSB_DESCRIPTION=$(lsb_release --description --short) LSB_DESCRIPTION=$(lsb_release --description --short)
fi fi
QEMU_VER=$(${QEMU} -version | head -n1 | cut -d' ' -f4 | cut -d'(' -f1) echo "Quickemu ${VERSION} using ${QEMU} v${QEMU_VER_LONG}"
echo "Quickemu ${VERSION} starting ${VM} on ${LSB_DESCRIPTION} ${KERNEL_NODE}" echo " - Host: ${LSB_DESCRIPTION} running ${KERNEL_NAME} ${KERNEL_VER} ${KERNEL_NODE}"
echo " - QEMU: ${QEMU} v${QEMU_VER} on ${KERNEL_NAME} ${KERNEL_VER}" echo " - Guest: Starting ${VM} as ${VMNAME}"
HOST_CPU_CORES=$(nproc --all) HOST_CPU_CORES=$(nproc --all)
HOST_CPU_MODEL=$(lscpu | grep '^Model name:' | cut -d':' -f2 | sed 's/ //g') HOST_CPU_MODEL=$(lscpu | grep '^Model name:' | cut -d':' -f2 | sed 's/ //g')
@ -803,7 +802,6 @@ function vm_boot() {
echo "${QEMU}" "${SHELL_ARGS}" >> "${VMDIR}/${VMNAME}.sh" echo "${QEMU}" "${SHELL_ARGS}" >> "${VMDIR}/${VMNAME}.sh"
${QEMU} "${args[@]}" > "${VMDIR}/${VMNAME}.log" & ${QEMU} "${args[@]}" > "${VMDIR}/${VMNAME}.log" &
echo -e " - Process: On host: killall ${VMNAME}\t(if a forced kill is required)"
# If output is 'none' then SPICE was requested. # If output is 'none' then SPICE was requested.
if [ ${OUTPUT} == "none" ]; then if [ ${OUTPUT} == "none" ]; then
@ -916,9 +914,10 @@ if [ ! -e "${QEMU}" ] && [ ! -e "${QEMU_IMG}" ]; then
exit 1 exit 1
fi fi
QEMU_VER=$(${QEMU} -version | head -n1 | cut -d' ' -f4 | cut -d'(' -f1 | sed 's/\.//g' | cut -c1-2) QEMU_VER_LONG=$(${QEMU} -version | head -n1 | cut -d' ' -f4 | cut -d'(' -f1)
if [ "${QEMU_VER}" -lt 60 ]; then QEMU_VER_SHORT=$(${QEMU} -version | head -n1 | cut -d' ' -f4 | cut -d'(' -f1 | sed 's/\.//g' | cut -c1-2)
echo "ERROR! Qemu 6.0.0 or newer is required, detected $(${QEMU} -version | head -n1 | cut -d' ' -f4 | cut -d'(' -f1)." if [ "${QEMU_VER_SHORT}" -lt 60 ]; then
echo "ERROR! Qemu 6.0.0 or newer is required, detected ${QEMU_VER_LONG}."
exit 1 exit 1
fi fi