78a6564ed4
virt-manager-1.2.1.tar.bz2 * Bugfix release * Fix connecting to older libvirt versions (Michał Kępień) * Fix connecting to VM console with non-IP hostname (Giuseppe Scrivano) * Fix addhardware/create wizard errors when a nodedev disappears * Fix adding a second cdrom via customize dialog - Dropped tarball and patches virt-manager-1.2.0.tar.bz2 848123e6-fix-memory-stats-for-shutoff-VM.patch ebcb7c06-fix-exception-when-the-address-is-not-an-IP.patch c4d26d16-fix-VM-polling-on-old-libvirt.patch ac2be796-do-not-throw-exception-if-volume-or-pool-dont-exist.patch 88e18c86-fix-sending-net-removed-signal.patch fbdf574c-fix-shortcut-key-for-USB-redir-dev-type.patch 2c1e482b-fix--show-host-summary-error-windows-flooding.patch 4b5c836a-read-start-mode-from-inactive-conf-XML.patch 776c1d97-fix-changing-USB-device-model.patch bbc4f83b-enable-qemu_ga-for-sles-11-sp4-and-newer.patch f8af2e6b-verify-HYPER-V-support-after-customization.patch 9ea3fcd1-add-classes-for-SUSE-distros.patch 23f262ec-fetch-URL-media-from-content-file-for-suse-distros.patch 5618fa4c-add-support-for-detecting-os-variants-of-suse-distros.patch 9b99eff7-add-opensuse-13.x-tests.patch f5a13510-clone-dont-use-separator-when-disk-under-root.patch - Upstream support for suse distros 9ea3fcd1-add-classes-for-SUSE-distros.patch 23f262ec-fetch-URL-media-from-content-file-for-suse-distros.patch 5618fa4c-add-support-for-detecting-os-variants-of-suse-distros.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=237
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.1/virtinst/guest.py
|
|
===================================================================
|
|
--- virt-manager-1.2.1.orig/virtinst/guest.py
|
|
+++ virt-manager-1.2.1/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
|
|
@@ -811,14 +812,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)
|