From cd4a3369e936b755794db5cefb3dbced85884e00 Mon Sep 17 00:00:00 2001
From: jess <jess@alienrobotarmy.com>
Date: Mon, 17 Aug 2020 23:08:57 +0000
Subject: [PATCH 1/2] Added bootmenu to template/docs - otherwise you can get
 to tianocore bios

---
 docs/guide-screen-resolution.md |   1 +
 template.xml                    | 113 ++++++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+)
 create mode 100644 template.xml

diff --git a/docs/guide-screen-resolution.md b/docs/guide-screen-resolution.md
index a4d9d76..0d2aeff 100644
--- a/docs/guide-screen-resolution.md
+++ b/docs/guide-screen-resolution.md
@@ -20,6 +20,7 @@ _(Thanks to [passthroughpo.st](https://passthroughpo.st/new-and-improved-mac-os-
 
 2. Shut down the VM, relaunch it using `basic.sh` script and follow the following steps:
  - Press `Escape` key as soon as the window comes up.
+   - This may require setting `<bootmenu enable='yes'/>` under the `<os>` section of  your domxml in libvirt
  - In the interface that comes up, select `Device Manager`->`OVMF Platform Configuration`->`Change Preferred` and select the correct resolution.
  - Press `F10` to save the changes.
  - Press `Escape` multiple times to come back to main menu, and then select `Continue` on it.
diff --git a/template.xml b/template.xml
new file mode 100644
index 0000000..7c0ee1c
--- /dev/null
+++ b/template.xml
@@ -0,0 +1,113 @@
+<domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
+  <name>osx-ibm</name>
+  <memory unit='KiB'>2097152</memory>
+  <currentMemory unit='KiB'>2097152</currentMemory>
+  <vcpu placement='static'>4</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc-q35-2.11'>hvm</type>
+    <loader readonly='yes' type='pflash'>/home/jess/macOS-Simple-KVM/firmware/OVMF_CODE.fd</loader>
+    <nvram>/home/jess/macOS-Simple-KVM/firmware/OVMF_VARS-1024x768.fd</nvram>
+    <boot dev='hd'/>
+    <bootmenu enable='yes'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <vmport state='off'/>
+  </features>
+  <cpu>
+    <topology sockets='1' cores='4' threads='1'/>
+  </cpu>
+  <clock offset='utc'>
+    <timer name='rtc' tickpolicy='catchup'/>
+    <timer name='pit' tickpolicy='delay'/>
+    <timer name='hpet' present='no'/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <pm>
+    <suspend-to-mem enabled='no'/>
+    <suspend-to-disk enabled='no'/>
+  </pm>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2'/>
+      <source file='/home/jess/macOS-Simple-KVM/ESP.qcow2'/>
+      <target dev='sda' bus='sata'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source file='/srv/public/apps/iso/catalina.img'/>
+      <target dev='sdb' bus='sata'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
+    </disk>
+    <controller type='usb' index='0' model='ich9-ehci1'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x7'/>
+    </controller>
+    <controller type='usb' index='0' model='ich9-uhci1'>
+      <master startport='0'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x0' multifunction='on'/>
+    </controller>
+    <controller type='usb' index='0' model='ich9-uhci2'>
+      <master startport='2'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x1'/>
+    </controller>
+    <controller type='usb' index='0' model='ich9-uhci3'>
+      <master startport='4'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x2'/>
+    </controller>
+    <controller type='sata' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
+    </controller>
+    <interface type='network'>
+      <mac address='52:54:00:92:d4:7b'/>
+      <source network='default'/>
+      <model type='e1000-82545em'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+    </interface>
+    <serial type='pty'>
+      <target type='isa-serial' port='0'>
+        <model name='isa-serial'/>
+      </target>
+    </serial>
+    <console type='pty'>
+      <target type='serial' port='0'/>
+    </console>
+    <input type='mouse' bus='usb'>
+      <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'/>
+      <image compression='off'/>
+    </graphics>
+    <sound model='ich9'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
+    </sound>
+    <video>
+      <model type='qxl' ram='65536' vram='65536' vgamem='16384' 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'/>
+    </redirdev>
+    <redirdev bus='usb' type='spicevmc'>
+      <address type='usb' bus='0' port='4'/>
+    </redirdev>
+    <memballoon model='none'/>
+  </devices>
+  <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='-device'/>
+    <qemu:arg value='isa-applesmc,osk=ourhardworkbythesewordsguardedpleasedontsteal(c)AppleComputerInc'/>
+    <qemu:arg value='-smbios'/>
+    <qemu:arg value='type=2'/>
+  </qemu:commandline>
+</domain>
+

From bcdbf2cf22b049902091857a8e3721042b285774 Mon Sep 17 00:00:00 2001
From: jess <jess@alienrobotarmy.com>
Date: Mon, 17 Aug 2020 23:16:27 +0000
Subject: [PATCH 2/2] Updated docs

---
 docs/guide-screen-resolution.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/guide-screen-resolution.md b/docs/guide-screen-resolution.md
index 0d2aeff..bc1882e 100644
--- a/docs/guide-screen-resolution.md
+++ b/docs/guide-screen-resolution.md
@@ -21,6 +21,7 @@ _(Thanks to [passthroughpo.st](https://passthroughpo.st/new-and-improved-mac-os-
 2. Shut down the VM, relaunch it using `basic.sh` script and follow the following steps:
  - Press `Escape` key as soon as the window comes up.
    - This may require setting `<bootmenu enable='yes'/>` under the `<os>` section of  your domxml in libvirt
+   - You may also need to remove USB keyboard for it to register the `escape` key at boot. Re-add USB keyboard after you've made changes to tianocore
  - In the interface that comes up, select `Device Manager`->`OVMF Platform Configuration`->`Change Preferred` and select the correct resolution.
  - Press `F10` to save the changes.
  - Press `Escape` multiple times to come back to main menu, and then select `Continue` on it.