mirror of
				https://github.com/oSoWoSo/DistroHopper.git
				synced 2024-08-14 22:46:53 +00:00 
			
		
		
		
	Ensure only one scanout is present. Ref #222
Run QEMU with '-vga none' to avoid having two scanouts, one for VGA and another for virtio-vga-gl. - Workaround for a GTK assertion failure in gtk_widget_get_realized(). - Allows seamless mouse in macOS when using the qxl-vga device. - Enables sane default resolutions in all support macOS versions.
This commit is contained in:
		
							parent
							
								
									2071816ede
								
							
						
					
					
						commit
						9b5a6a44ac
					
				
					 1 changed files with 12 additions and 7 deletions
				
			
		
							
								
								
									
										19
									
								
								quickemu
									
										
									
									
									
								
							
							
						
						
									
										19
									
								
								quickemu
									
										
									
									
									
								
							|  | @ -234,6 +234,7 @@ function vm_boot() { | ||||||
|   local OSK="" |   local OSK="" | ||||||
|   local SMM="${SMM:-off}" |   local SMM="${SMM:-off}" | ||||||
|   local USB_HOST_PASSTHROUGH_CONTROLLER="qemu-xhci" |   local USB_HOST_PASSTHROUGH_CONTROLLER="qemu-xhci" | ||||||
|  |   local VGA="" | ||||||
|   local VIDEO="" |   local VIDEO="" | ||||||
| 
 | 
 | ||||||
|   KERNEL_NAME=$(uname --kernel-name) |   KERNEL_NAME=$(uname --kernel-name) | ||||||
|  | @ -707,12 +708,9 @@ function vm_boot() { | ||||||
|       *) DISPLAY_DEVICE="virtio-vga";; |       *) DISPLAY_DEVICE="virtio-vga";; | ||||||
|     esac |     esac | ||||||
|   elif [ "${guest_os}" == "macos" ]; then |   elif [ "${guest_os}" == "macos" ]; then | ||||||
|     # Displays in System Preferences can be used to select a resolution if: |     # qxl-vga supports seamless mouse and sane resolutions if only one scanout | ||||||
|     #  - Mojave only offers 4:3 resolutions |     # is used. Which is whay '-vga none' is added to the QEMU command line. | ||||||
|     #  - High Sierra will run at the default 1920x1080 only. |     DISPLAY_DEVICE="qxl-vga" | ||||||
|     # QXL prevents seamless mouse working with a SPICE client |  | ||||||
|     #  - https://github.com/wimpysworld/quickemu/issues/222 |  | ||||||
|     DISPLAY_DEVICE="VGA" |  | ||||||
|   elif [ "${guest_os}" == "windows" ]; then |   elif [ "${guest_os}" == "windows" ]; then | ||||||
|     DISPLAY_DEVICE="qxl-vga" |     DISPLAY_DEVICE="qxl-vga" | ||||||
|   else |   else | ||||||
|  | @ -775,8 +773,15 @@ function vm_boot() { | ||||||
|     VIDEO="${VIDEO},max_outputs=${max_outputs}" |     VIDEO="${VIDEO},max_outputs=${max_outputs}" | ||||||
|   fi |   fi | ||||||
| 
 | 
 | ||||||
|  |   # Run QEMU with '-vga none' to avoid having two scanouts, one for VGA and | ||||||
|  |   # another for virtio-vga-gl. This works around a GTK assertion failure and | ||||||
|  |   # allows seamless mouse in macOS when using the qxl-vga device. | ||||||
|  |   # https://www.collabora.com/news-and-blog/blog/2021/11/26/venus-on-qemu-enabling-new-virtual-vulkan-driver/ | ||||||
|  |   # https://github.com/quickemu-project/quickemu/issues/222 | ||||||
|  |   VGA="-vga none" | ||||||
|  | 
 | ||||||
|   # Add fullscreen options |   # Add fullscreen options | ||||||
|   VIDEO="${VIDEO} ${FULLSCREEN}" |   VIDEO="${VGA} ${VIDEO} ${FULLSCREEN}" | ||||||
| 
 | 
 | ||||||
|   # Set the hostname of the VM |   # Set the hostname of the VM | ||||||
|   local NET="user,hostname=${VMNAME}" |   local NET="user,hostname=${VMNAME}" | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue