From bc47ea3cf4dc176a77a22b3d99f34d9fa838bb45 Mon Sep 17 00:00:00 2001
From: Kowalski Prime <kowalski.7cc@xspacesoft.com>
Date: Sun, 3 May 2020 19:08:20 +0200
Subject: [PATCH] Name with version, copy template, allow nested virtualization

---
 .gitignore            |  1 +
 make.sh               | 15 ++++++++++-----
 tools/template.xml.in | 25 +++++++++++++------------
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 54e8c49..81c9b68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ BaseSystem.img
 BaseSystem.dmg
 BaseSystem.chunklist
 template.xml
+version
\ No newline at end of file
diff --git a/make.sh b/make.sh
index c85da83..6aba5db 100755
--- a/make.sh
+++ b/make.sh
@@ -26,8 +26,12 @@ error() {
 }
 
 generate(){
+    NAME="macOS"
+    if [[ -e version ]]; then
+        NAME="$NAME $(cat version)"
+    fi
     UUID=$( cat /proc/sys/kernel/random/uuid )
-    sed -e "s|BOXESHOME|$BOXES_HOME|g" -e "s|QEMUHOME|$QEMU_HOME|g" -e "s|UUID|$UUID|g" -e "s|MACHINE|$MACHINE|g" -e "s|MACHINE|$MACHINE|g" tools/template.xml.in > $OUT
+    sed -e "s|BOXESHOME|$BOXES_HOME|g" -e "s|MACOSNAME|$NAME|g" -e "s|BOXESHOME|$BOXES_HOME|g" -e "s|QEMUHOME|$QEMU_HOME|g" -e "s|UUID|$UUID|g" -e "s|MACHINE|$MACHINE|g" -e "s|MACHINE|$MACHINE|g" tools/template.xml.in > $OUT
     echo "$OUT has been generated in $VMDIR"
 }
 
@@ -41,11 +45,12 @@ install(){
     cp -Zfu BaseSystem.img $BOXES_HOME
     cp -Zfu ESP.qcow2 $BOXES_HOME
     echo Coping OVMF_CODE.fd in $QEMU_HOME/firmware/
-    cp firmware/OVMF_CODE.fd $QEMU_HOME/firmware/
+    cp -Zfu firmware/OVMF_CODE.fd $QEMU_HOME/firmware/
     echo Coping OVMF_CODE.fd in $QEMU_HOME/nvram/
-    cp firmware/OVMF_VARS-1024x768.fd $QEMU_HOME/nvram/
-    echo Adding template.xml to GNOME Boxes domain
-    virsh -c qemu:///session define $OUT
+    cp -Zfu firmware/OVMF_VARS-1024x768.fd $QEMU_HOME/nvram/
+    echo Copy template.xml to $QEMU_HOME
+    cp -Zfu template.xml $QEMU_HOME/macOS-Simple-KVM.xml
+    virsh -c qemu:///session define $QEMU_HOME/macOS-Simple-KVM.xml
 }
 
 generate
diff --git a/tools/template.xml.in b/tools/template.xml.in
index b2c6a09..df0fd9d 100644
--- a/tools/template.xml.in
+++ b/tools/template.xml.in
@@ -1,7 +1,7 @@
 <domain type="kvm" xmlns:qemu="http://libvirt.org/schemas/domain/qemu/1.0">
   <name>macOS-Simple-KVM</name>
   <uuid>UUID</uuid>
-  <title>macOS</title>
+  <title>MACOSNAME</title>
   <memory unit="KiB">4194304</memory>
   <currentMemory unit="KiB">4194304</currentMemory>
   <vcpu placement="static">4</vcpu>
@@ -34,7 +34,7 @@
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
-      <driver name="qemu" type="qcow2" />
+      <driver name="qemu" type="qcow2" cache="writeback" io="threads" />
       <source file="BOXESHOME/ESP.qcow2" />
       <target dev="sda" bus="sata" />
       <address type="drive" controller="0" bus="0" target="0" unit="0" />
@@ -46,7 +46,7 @@
       <address type="drive" controller="0" bus="0" target="0" unit="1" />
     </disk>
     <disk type="file" device="disk">
-      <driver name="qemu" type="raw" />
+      <driver name="qemu" type="qcow2" cache="writeback" io="threads" />
       <source file="BOXESHOME/macOS.qcow2" />
       <target dev="sdc" bus="sata" />
       <address type="drive" controller="0" bus="0" target="0" unit="2" />
@@ -83,21 +83,22 @@
       <target type="serial" port="0" />
     </console>
     <input type="tablet" bus="usb">
-      <address type="usb" bus="0" port="1"/>
-    </input>   
+      <address type="usb" bus="0" port="1" />
+    </input>
     <input type="keyboard" bus="usb">
       <address type="usb" bus="0" port="2" />
     </input>
-    <graphics type="spice" autoport="yes">
-      <listen type="address" />
+    <graphics type="spice">
+      <listen type="none" />
       <image compression="off" />
+      <gl enable="no" />
     </graphics>
     <sound model="ich9">
       <address type="pci" domain="0x0000" bus="0x00" slot="0x1b" function="0x0" />
     </sound>
     <video>
-      <model type="vga" vram="131072" heads="1" primary="yes"/>
-      <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x0"/>
+      <model type="vga" vram="131072" heads="1" primary="yes" />
+      <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x0" />
     </video>
     <redirdev bus="usb" type="spicevmc">
       <address type="usb" bus="0" port="3" />
@@ -107,13 +108,13 @@
     </redirdev>
     <memballoon model="none" />
   </devices>
-  <seclabel type="dynamic" model="selinux" relabel="yes"/>
+  <seclabel type="dynamic" model="selinux" relabel="yes" />
   <qemu:commandline>
     <qemu:arg value="-cpu" />
-    <qemu:arg value="Penryn,kvm=on,vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,+pcid,+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check" />
+    <qemu:arg value="Penryn,kvm=on,vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,vmx=on,+pcid,+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check" />
     <qemu:arg value="-device" />
     <qemu:arg value="isa-applesmc,osk=ourhardworkbythesewordsguardedpleasedontsteal(c)AppleComputerInc" />
     <qemu:arg value="-smbios" />
     <qemu:arg value="type=2" />
   </qemu:commandline>
-</domain>
+</domain>
\ No newline at end of file