f71f619bc9
virt-manager-1.2.0.tar.bz2 virtinst-default-xen-to-qcow2-format.patch * OVMF/AAVMF Support (Laszlo Ersek, Giuseppe Scrivano, Cole Robinson) * Improved support for AArch64 qemu/kvm * virt-install: Support –disk type=network parameters * virt-install: Make –disk just work * virt-install: Add –disk sgio= option (Giuseppe Scrivano) * addhardware: default to an existing bus when adding a new disk (Giuseppe Scrivano) * virt-install: Add –input device option * virt-manager: Unify storagebrowser and storage details functionality * virt-manager: allow setting a custom connection row name * virt-install: Support –hostdev scsi passthrough * virt-install: Fill in a bunch of –graphics spice options * Disable spice image compression for new local VMs * virt-manager: big reworking of the migration dialog - Dropped tarball and patches virt-manager-1.1.0.tar.bz2 0b391fe9-Gtk-30.patch 20fe2873-check-for-empty-network-name.patch 24faf867-ignore-error-403-on-directories.patch 65f7017e-createnet-fix.patch activate-default-console.patch ce74cd77-connection-state-tick-updates-lock.patch virtinst-ppc64le.patch virtinst-supported-disk-formats.patch virtinst-support-suse-distros.patch virt-manager-1.1.0.tar.bz2 virtman-default-lxc-uri.patch virtman-stable-os-support.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=226
49 lines
1.9 KiB
Diff
49 lines
1.9 KiB
Diff
Use the correct qemu emulator based on the architecture.
|
|
Index: virt-manager-1.2.0/virtinst/guest.py
|
|
===================================================================
|
|
--- virt-manager-1.2.0.orig/virtinst/guest.py
|
|
+++ virt-manager-1.2.0/virtinst/guest.py
|
|
@@ -19,6 +19,7 @@
|
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
|
# MA 02110-1301 USA.
|
|
|
|
+import os
|
|
import logging
|
|
|
|
import urlgrabber.progress as progress
|
|
@@ -815,14 +816,28 @@ class Guest(XMLBuilder):
|
|
self.emulator = None
|
|
return
|
|
|
|
- if self.emulator:
|
|
+ if self.conn.is_qemu():
|
|
+ if self.os.arch == "s390x":
|
|
+ preferred_emulator = "/usr/bin/qemu-system-s390x"
|
|
+ elif self.os.arch == "ppc64" or self.os.arch == "ppc64le":
|
|
+ preferred_emulator = "/usr/bin/qemu-system-ppc64"
|
|
+ else:
|
|
+ preferred_emulator = "/usr/bin/qemu-system-x86_64"
|
|
+ elif self.conn.is_lxc():
|
|
+ preferred_emulator = "/usr/lib/libvirt/libvirt_lxc"
|
|
+ if not os.path.exists(preferred_emulator):
|
|
+ preferred_emulator = "/usr/lib64/libvirt/libvirt_lxc"
|
|
+ else:
|
|
+ preferred_emulator = "/usr/lib/xen/bin/qemu-system-i386"
|
|
+ if self.emulator and self.emulator == preferred_emulator:
|
|
return
|
|
|
|
- if self.os.is_hvm() and self.type == "xen":
|
|
- if self.conn.caps.host.cpu.arch == "x86_64":
|
|
- self.emulator = "/usr/lib64/xen/bin/qemu-dm"
|
|
- else:
|
|
- self.emulator = "/usr/lib/xen/bin/qemu-dm"
|
|
+ if os.path.exists(preferred_emulator):
|
|
+ self.emulator = preferred_emulator
|
|
+ elif self.os.is_hvm() and self.type == "xen":
|
|
+ self.emulator = "/usr/lib/xen/bin/qemu-dm"
|
|
+ elif not self.emulator:
|
|
+ self.emulator = "/usr/bin/qemu-kvm"
|
|
|
|
def _set_cpu_defaults(self):
|
|
self.cpu.set_topology_defaults(self.vcpus)
|