From 9cb021b174d287c53672cde6e9913ba6bdcd997e Mon Sep 17 00:00:00 2001
From: Martin Wimpress <martin@wimpress.org>
Date: Mon, 13 May 2024 16:18:44 +0100
Subject: [PATCH] refactor: move all disk_size configuration to quickget

---
 quickemu | 14 +-------------
 quickget |  6 ++++++
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/quickemu b/quickemu
index b91388e..e3afd80 100755
--- a/quickemu
+++ b/quickemu
@@ -525,10 +525,6 @@ function vm_boot() {
                 usb_controller="xhci"
                 sound_card="ac97"
             fi
-
-            if [ -z "${disk_size}" ]; then
-                disk_size="16G"
-            fi
             ;;
         kolibrios|reactos)
             CPU="-cpu qemu32,kvm=on"
@@ -625,7 +621,6 @@ function vm_boot() {
                     NET_DEVICE="vmxnet3"
                     USB_HOST_PASSTHROUGH_CONTROLLER="usb-ehci";;
             esac
-            disk_size="${disk_size:-128G}"
             ;;
         windows|windows-server)
             if [ "${QEMU_VER_SHORT}" -gt 60 ]; then
@@ -646,17 +641,10 @@ function vm_boot() {
             else
               GUEST_TWEAKS+=" -no-hpet"
             fi
-
-            if [ -z "${disk_size}" ]; then
-                disk_size="64G"
-            fi
             SMM="on"
             ;;
         *) CPU="-cpu host,kvm=on"
            NET_DEVICE="rtl8139"
-           if [ -z "${disk_size}" ]; then
-               disk_size="32G"
-           fi
            echo "WARNING! Unrecognised guest OS: ${guest_os}";;
     esac
 
@@ -1533,7 +1521,7 @@ boot="efi"
 cpu_cores=""
 disk_format="${disk_format:-qcow2}"
 disk_img="${disk_img:-}"
-disk_size=""
+disk_size="${disk_size:-16G}"
 display="${display:-sdl}"
 extra_args="${extra_args:-}"
 fixed_iso=""
diff --git a/quickget b/quickget
index 89a8dba..6c21949 100755
--- a/quickget
+++ b/quickget
@@ -1502,6 +1502,7 @@ EOF
                 echo "ram=\"2048M\"" >> "${CONF_FILE}"
                 ;;
             macos)
+                echo "disk_size=\"128G\"" >> "${CONF_FILE}"
                 echo "macos_release=\"${RELEASE}\"" >> "${CONF_FILE}"
                 # https://github.com/quickemu-project/quickemu/issues/438
                 if [ "${RELEASE}" == "monterey" ]; then
@@ -1514,6 +1515,11 @@ EOF
             # Minimum to install lobster testing is 18GB but 32GB are allocated for headroom
             echo "disk_size=\"32G\"" >> "${CONF_FILE}"
         fi
+
+        if [[ "${OS}" == "windows"* ]]; then
+            echo "disk_size=\"64G\"" >> "${CONF_FILE}"
+        fi
+
         # Enable TPM for Windows 11
         if [ "${OS}" == "windows" ] && [ "${RELEASE}" == 11 ] || [ "${OS}" == "windows-server" ] && [ "${RELEASE}" == "2022" ]; then
             echo "tpm=\"on\"" >> "${CONF_FILE}"