Merge 3ab4d9513e into 4c378a4b5e

README.md

@@ -61,7 +61,9 @@ processors work just fine (even for macOS Sonoma).
 
 ### Installation Preparation
 
-* Install QEMU and other packages.
+* Install QEMU and other packages. (Note: This step may need to be adapted for your Linux distribution.)
+
+#### Debian/Ubuntu
 
   ```
   sudo apt-get install qemu-system uml-utilities virt-manager git \
@@ -69,7 +71,13 @@ processors work just fine (even for macOS Sonoma).
       tesseract-ocr-eng genisoimage vim net-tools screen -y
   ```
 
-  This step may need to be adapted for your Linux distribution.
+#### Fedora/RHEL
+
+  ```
+  sudo dnf install qemu-system-x86 virt-manager git \
+     wget libguestfs-tools p7zip make dmg2img tesseract-common \
+     tesseract-langpack-eng genisoimage vim net-tools screen -y
+  ```
 
 * Clone this repository on your QEMU system. Files from this repository are
   used in the following steps.
@@ -186,6 +194,14 @@ processors work just fine (even for macOS Sonoma).
 
 - (OPTIONAL) Use this macOS VM disk with libvirt (virt-manager / virsh stuff).
 
+  - Move OVMF code and vars files to `$XDG_CONFIG_HOME/libvirt/qemu/nvram` and rename var store as necessary
+    for your resolution
+    ```
+    cp OVMF_VARS-<your desired resolution>.fd OVMF_VARS.4m.fd
+    cp OVMF_CODE_4M.fd "${XDG_CONFIG_HOME}/libvirt/qemu/nvram"
+    cp OVMF_VARS.4m.fd "${XDG_CONFIG_HOME}/libvirt/qemu/nvram"
+    ```
+
   - Edit `macOS-libvirt-Catalina.xml` file and change the various file paths (search
     for `CHANGEME` strings in that file). The following command should do the
     trick usually.
@@ -202,7 +218,8 @@ processors work just fine (even for macOS Sonoma).
     virsh --connect qemu:///system define macOS.xml
     ```
 
-  - If needed, grant necessary permissions to libvirt-qemu user,
+  - If needed, grant necessary permissions to libvirt-qemu user
+    (ignore spurious "invalid argument near character 3" error if encountered),
 
     ```
     sudo setfacl -m u:libvirt-qemu:rx /home/$USER

macOS-libvirt-Catalina.xml

@@ -43,8 +43,8 @@
   <os>
     <type arch='x86_64' machine='pc-q35-4.2'>hvm</type>
     <!-- We don't need patched OVMF anymore when using latest OpenCore, stock one is okay -->
-    <loader readonly='yes' type='pflash'>/home/CHANGEME/OSX-KVM/OVMF_CODE.fd</loader>
-    <nvram>/home/CHANGEME/OSX-KVM/OVMF_VARS.fd</nvram>
+    <loader readonly='yes' type='pflash'>/home/CHANGEME/.config/libvirt/qemu/nvram/OVMF_CODE_4M.fd</loader>
+    <nvram>/home/CHANGEME/.config/libvirt/qemu/nvram/OVMF_VARS.4m.fd</nvram>
   </os>
   <features>
     <acpi/>
@@ -62,21 +62,21 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='writeback' io='threads'/>
-      <source file='/home/CHANGEME/OSX-KVM/OpenCore/OpenCore.qcow2'/>
+      <source file='/home/CHANGEME/.local/src/OSX-KVM/OpenCore/OpenCore.qcow2'/>
       <target dev='sda' bus='sata'/>
       <boot order='2'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='writeback' io='threads'/>
-      <source file='/home/CHANGEME/OSX-KVM/mac_hdd_ng.img'/>
+      <source file='/home/CHANGEME/.local/src/OSX-KVM/mac_hdd_ng.img'/>
       <target dev='sdb' bus='sata'/>
       <boot order='1'/>
       <address type='drive' controller='0' bus='0' target='0' unit='1'/>
     </disk>
     <disk type="file" device="disk">
       <driver name="qemu" type="raw" cache="writeback"/>
-      <source file="/home/CHANGEME/OSX-KVM/BaseSystem.img"/>
+      <source file="/home/CHANGEME/.local/src/OSX-KVM/BaseSystem.img"/>
       <target dev="sdc" bus="sata"/>
       <boot order="3"/>
       <address type="drive" controller="0" bus="0" target="0" unit="2"/>